kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Requests/RuleFormRequest.php
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\Requests;
@@ -26,10 +25,7 @@ namespace FireflyIII\Http\Requests;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
/**
* Class RuleFormRequest
*
*
* @package FireflyIII\Http\Requests
* Class RuleFormRequest.
*/
class RuleFormRequest extends Request
{
@@ -77,7 +73,7 @@ class RuleFormRequest extends Request
$contextActions = join(',', config('firefly.rule-actions-text'));
$titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title';
if (!is_null($repository->find(intval($this->get('id')))->id)) {
if (null !== $repository->find(intval($this->get('id')))->id) {
$titleRule = 'required|between:1,100|uniqueObjectForUser:rules,title,' . intval($this->get('id'));
}
$rules = [
@@ -91,7 +87,7 @@ class RuleFormRequest extends Request
'rule-action.*' => 'required|in:' . join(',', $validActions),
];
// since Laravel does not support this stuff yet, here's a trick.
for ($i = 0; $i < 10; $i++) {
for ($i = 0; $i < 10; ++$i) {
$rules['rule-action-value.' . $i] = 'required_if:rule-action.' . $i . ',' . $contextActions . '|ruleActionValue';
}