kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Replace phpstan suggestions

Browse Source
This commit is contained in:
James Cole
2022-10-30 14:44:49 +01:00
parent c032ffd4f9
commit 33f370359c
45 changed files with 99 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/Models/Bill/UpdateRequest.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Bill;
use FireflyIII\Models\Bill;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -75,6 +76,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var Bill $bill */
$bill = $this->route()->parameter('bill');
return [

2
app/Api/V1/Requests/Models/Budget/UpdateRequest.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Budget;
use FireflyIII\Models\Budget;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -80,6 +81,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var Budget $budget */
$budget = $this->route()->parameter('budget');
return [

2
app/Api/V1/Requests/Models/Category/UpdateRequest.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Category;
use FireflyIII\Models\Category;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
@@ -59,6 +60,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var Category $category */
$category = $this->route()->parameter('category');
return [

2
app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\ObjectGroup;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
@@ -58,6 +59,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var ObjectGroup $objectGroup */
$objectGroup = $this->route()->parameter('objectGroup');
return [

2
app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Rules\IsAssetAccountId;
use FireflyIII\Rules\LessThanPiggyTarget;
use FireflyIII\Support\Request\ChecksLogin;
@@ -69,6 +70,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var PiggyBank $piggyBank */
$piggyBank = $this->route()->parameter('piggyBank');
return [

2
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@@ -114,7 +114,7 @@ class UpdateRequest extends FormRequest
}
$return[] = $current;
}
if (empty($return)) {
if (0 === count($return)) {
return null;
}

8
app/Api/V1/Requests/Models/Rule/StoreRequest.php
View File

@@ -172,7 +172,7 @@ class StoreRequest extends FormRequest
$data = $validator->getData();
$triggers = $data['triggers'] ?? [];
// need at least one trigger
if (!is_countable($triggers) || empty($triggers)) {
if (!is_countable($triggers) || 0 === count($triggers)) {
$validator->errors()->add('title', (string) trans('validation.at_least_one_trigger'));
}
}
@@ -187,7 +187,7 @@ class StoreRequest extends FormRequest
$data = $validator->getData();
$actions = $data['actions'] ?? [];
// need at least one trigger
if (!is_countable($actions) || empty($actions)) {
if (!is_countable($actions) || 0 === count($actions)) {
$validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
}
}
@@ -202,7 +202,7 @@ class StoreRequest extends FormRequest
$data = $validator->getData();
$triggers = $data['triggers'] ?? [];
// need at least one trigger
if (!is_countable($triggers) || empty($triggers)) {
if (!is_countable($triggers) || 0 === count($triggers)) {
return;
}
$allInactive = true;
@@ -231,7 +231,7 @@ class StoreRequest extends FormRequest
$data = $validator->getData();
$actions = $data['actions'] ?? [];
// need at least one trigger
if (!is_countable($actions) || empty($actions)) {
if (!is_countable($actions) || 0 === count($actions)) {
return;
}
$allInactive = true;

8
app/Api/V1/Requests/Models/Rule/UpdateRequest.php
View File

@@ -187,7 +187,7 @@ class UpdateRequest extends FormRequest
$data = $validator->getData();
$triggers = $data['triggers'] ?? null;
// need at least one trigger
if (is_array($triggers) && empty($triggers)) {
if (is_array($triggers) && 0 === count($triggers)) {
$validator->errors()->add('title', (string) trans('validation.at_least_one_trigger'));
}
}
@@ -204,7 +204,7 @@ class UpdateRequest extends FormRequest
$allInactive = true;
$inactiveIndex = 0;
// need at least one trigger
if (is_array($triggers) && empty($triggers)) {
if (is_array($triggers) && 0 === count($triggers)) {
return;
}
foreach ($triggers as $index => $trigger) {
@@ -231,7 +231,7 @@ class UpdateRequest extends FormRequest
$data = $validator->getData();
$actions = $data['actions'] ?? null;
// need at least one action
if (is_array($actions) && empty($actions)) {
if (is_array($actions) && 0 === count($actions)) {
$validator->errors()->add('title', (string) trans('validation.at_least_one_action'));
}
}
@@ -248,7 +248,7 @@ class UpdateRequest extends FormRequest
$allInactive = true;
$inactiveIndex = 0;
// need at least one action
if (is_array($actions) && empty($actions)) {
if (is_array($actions) && 0 === count($actions)) {
return;
}

2
app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\RuleGroup;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -62,6 +63,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var RuleGroup $ruleGroup */
$ruleGroup = $this->route()->parameter('ruleGroup');
return [

2
app/Api/V1/Requests/Models/Tag/UpdateRequest.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Tag;
use FireflyIII\Models\Location;
use FireflyIII\Models\Tag;
use FireflyIII\Support\Request\AppendsLocationData;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -66,6 +67,7 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var Tag $tag */
$tag = $this->route()->parameter('tagOrId');
// TODO check if uniqueObjectForUser is obsolete
$rules = [

34
app/Api/V1/Requests/System/UpdateRequest.php
View File

@@ -47,15 +47,12 @@ class UpdateRequest extends FormRequest
public function getAll(): array
{
$name = $this->route()->parameter('dynamicConfigKey');
switch ($name) {
default:
break;
case 'configuration.is_demo_site':
case 'configuration.single_user_mode':
return ['value' => $this->boolean('value')];
case 'configuration.permission_update_check':
case 'configuration.last_update_check':
return ['value' => $this->convertInteger('value')];
if ($name === 'configuration.is_demo_site' || $name === 'configuration.single_user_mode') {
return ['value' => $this->boolean('value')];
}
if ($name === 'configuration.permission_update_check' || $name === 'configuration.last_update_check') {
return ['value' => $this->convertInteger('value')];
}
return ['value' => $this->convertString('value')];
@@ -69,16 +66,15 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
$name = $this->route()->parameter('configName');
switch ($name) {
default:
break;
case 'configuration.is_demo_site':
case 'configuration.single_user_mode':
return ['value' => ['required', new IsBoolean()]];
case 'configuration.permission_update_check':
return ['value' => 'required|numeric|between:-1,1'];
case 'configuration.last_update_check':
return ['value' => 'required|numeric|min:464272080'];
if ($name === 'configuration.is_demo_site' || $name === 'configuration.single_user_mode') {
return ['value' => ['required', new IsBoolean()]];
}
if ($name === 'configuration.permission_update_check') {
return ['value' => 'required|numeric|between:-1,1'];
}
if ($name === 'configuration.last_update_check') {
return ['value' => 'required|numeric|min:464272080'];
}
return ['value' => 'required'];

2
app/Api/V1/Requests/System/UserUpdateRequest.php
View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Requests\System;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use FireflyIII\User;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
@@ -75,6 +76,7 @@ class UserUpdateRequest extends FormRequest
*/
public function rules(): array
{
/** @var User $user */
$user = $this->route()->parameter('user');
return [