Code clean up.

This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions

View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
@@ -39,9 +38,7 @@ use Session;
use View;
/**
* Class MassController
*
* @package FireflyIII\Http\Controllers\Transaction
* Class MassController.
*/
class MassController extends Controller
{
@@ -52,7 +49,6 @@ class MassController extends Controller
{
parent::__construct();
$this->middleware(
function ($request, $next) {
View::share('title', trans('firefly.transactions'));
@@ -95,7 +91,7 @@ class MassController extends Controller
foreach ($ids as $journalId) {
/** @var TransactionJournal $journal */
$journal = $repository->find(intval($journalId));
if (!is_null($journal->id) && intval($journalId) === $journal->id) {
if (null !== $journal->id && intval($journalId) === $journal->id) {
$set->push($journal);
}
}
@@ -106,7 +102,7 @@ class MassController extends Controller
/** @var TransactionJournal $journal */
foreach ($set as $journal) {
$repository->delete($journal);
$count++;
++$count;
}
Preferences::mark();
@@ -116,7 +112,6 @@ class MassController extends Controller
return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
}
/**
* @param Collection $journals
*
@@ -139,7 +134,7 @@ class MassController extends Controller
$filtered = new Collection;
$messages = [];
/**
* @var TransactionJournal $journal
* @var TransactionJournal
*/
foreach ($journals as $journal) {
$sources = $journal->sourceAccountList();
@@ -153,7 +148,7 @@ class MassController extends Controller
$messages[] = trans('firefly.cannot_edit_multiple_dest', ['description' => $journal->description, 'id' => $journal->id]);
continue;
}
if ($journal->transactionType->type === TransactionType::OPENING_BALANCE) {
if (TransactionType::OPENING_BALANCE === $journal->transactionType->type) {
$messages[] = trans('firefly.cannot_edit_opening_balance');
continue;
}
@@ -191,18 +186,18 @@ class MassController extends Controller
$journal->foreign_amount = floatval($transaction->foreign_amount);
$journal->foreign_currency = $transaction->foreignCurrency;
if (!is_null($sources->first())) {
if (null !== $sources->first()) {
$journal->source_account_id = $sources->first()->id;
$journal->source_account_name = $sources->first()->editname;
}
if (!is_null($destinations->first())) {
if (null !== $destinations->first()) {
$journal->destination_account_id = $destinations->first()->id;
$journal->destination_account_name = $destinations->first()->editname;
}
}
);
if ($filtered->count() === 0) {
if (0 === $filtered->count()) {
Session::flash('error', trans('firefly.no_edit_multiple_left'));
}
@@ -265,7 +260,7 @@ class MassController extends Controller
// call repository update function.
$repository->update($journal, $data);
$count++;
++$count;
}
}
}