Completed
Pull Request — master (#4511)
by Axel
06:01
created
src/system/SecurityCenterModule/Controller/IdsLogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
         $hasFilters = 0 < count($where);
88 88
 
89 89
         // number of items to show
90
-        $pageSize = (int)$this->getVar('pagesize', 25);
90
+        $pageSize = (int) $this->getVar('pagesize', 25);
91 91
 
92 92
         // get data
93 93
         $paginator = $repository->getIntrusions($where, $sorting, $page, $pageSize);
Please login to merge, or discard this patch.
src/system/SearchModule/Entity/Repository/SearchStatRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
         $query = $qb->getQuery();
41 41
 
42
-        return (int)$query->getSingleScalarResult();
42
+        return (int) $query->getSingleScalarResult();
43 43
     }
44 44
 
45 45
     public function getStats(array $filters = [], array $sorting = [], int $page = 1, int $pageSize = 25): PaginatorInterface
Please login to merge, or discard this patch.
src/system/RoutesModule/Entity/Repository/Base/AbstractRouteRepository.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
     
119 119
         $qb = $this->getEntityManager()->createQueryBuilder();
120 120
         $qb->update($this->mainEntityClass, 'tbl')
121
-           ->set('tbl.createdBy', $newUserId)
122
-           ->where('tbl.createdBy = :creator')
123
-           ->setParameter('creator', $userId);
121
+            ->set('tbl.createdBy', $newUserId)
122
+            ->where('tbl.createdBy = :creator')
123
+            ->setParameter('creator', $userId);
124 124
         $query = $qb->getQuery();
125 125
         $query->execute();
126 126
     
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
     
152 152
         $qb = $this->getEntityManager()->createQueryBuilder();
153 153
         $qb->update($this->mainEntityClass, 'tbl')
154
-           ->set('tbl.updatedBy', $newUserId)
155
-           ->where('tbl.updatedBy = :editor')
156
-           ->setParameter('editor', $userId);
154
+            ->set('tbl.updatedBy', $newUserId)
155
+            ->where('tbl.updatedBy = :editor')
156
+            ->setParameter('editor', $userId);
157 157
         $query = $qb->getQuery();
158 158
         $query->execute();
159 159
     
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
     
184 184
         $qb = $this->getEntityManager()->createQueryBuilder();
185 185
         $qb->delete($this->mainEntityClass, 'tbl')
186
-           ->where('tbl.createdBy = :creator')
187
-           ->setParameter('creator', $userId);
186
+            ->where('tbl.createdBy = :creator')
187
+            ->setParameter('creator', $userId);
188 188
         $query = $qb->getQuery();
189 189
         $query->execute();
190 190
     
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
     
215 215
         $qb = $this->getEntityManager()->createQueryBuilder();
216 216
         $qb->delete($this->mainEntityClass, 'tbl')
217
-           ->where('tbl.updatedBy = :editor')
218
-           ->setParameter('editor', $userId);
217
+            ->where('tbl.updatedBy = :editor')
218
+            ->setParameter('editor', $userId);
219 219
         $query = $qb->getQuery();
220 220
         $query->execute();
221 221
     
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
     {
308 308
         if (0 < count($exclusions)) {
309 309
             $qb->andWhere('tbl.id NOT IN (:excludedIdentifiers)')
310
-               ->setParameter('excludedIdentifiers', $exclusions);
310
+                ->setParameter('excludedIdentifiers', $exclusions);
311 311
         }
312 312
     
313 313
         return $qb;
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
     
417 417
         $qb = $this->getEntityManager()->createQueryBuilder();
418 418
         $qb->select($selection)
419
-           ->from($this->mainEntityClass, 'tbl');
419
+            ->from($this->mainEntityClass, 'tbl');
420 420
     
421 421
         if (true === $useJoins) {
422 422
             $this->addJoinsToFrom($qb);
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
     {
453 453
         $qb = $this->getCountQuery();
454 454
         $qb->andWhere('tbl.' . $fieldName . ' = :' . $fieldName)
455
-           ->setParameter($fieldName, $fieldValue);
455
+            ->setParameter($fieldName, $fieldValue);
456 456
     
457 457
         if ($excludeId > 0) {
458 458
             $qb = $this->addExclusion($qb, [$excludeId]);
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
     
493 493
         $qb = $this->getEntityManager()->createQueryBuilder();
494 494
         $qb->select($selection)
495
-           ->from($this->mainEntityClass, 'tbl');
495
+            ->from($this->mainEntityClass, 'tbl');
496 496
     
497 497
         if (true === $useJoins) {
498 498
             $this->addJoinsToFrom($qb);
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
         if ('RAND()' === $orderBy) {
516 516
             // random selection
517 517
             $qb->addSelect('MOD(tbl.id, ' . random_int(2, 15) . ') AS HIDDEN randomIdentifiers')
518
-               ->orderBy('randomIdentifiers');
518
+                ->orderBy('randomIdentifiers');
519 519
     
520 520
             return $qb;
521 521
         }
@@ -534,12 +534,12 @@  discard block
 block discarded – undo
534 534
         }
535 535
         if (false !== strpos($orderBy, 'tbl.createdBy')) {
536 536
             $qb->addSelect('tblCreator')
537
-               ->leftJoin('tbl.createdBy', 'tblCreator');
537
+                ->leftJoin('tbl.createdBy', 'tblCreator');
538 538
             $orderBy = str_replace('tbl.createdBy', 'tblCreator.uname', $orderBy);
539 539
         }
540 540
         if (false !== strpos($orderBy, 'tbl.updatedBy')) {
541 541
             $qb->addSelect('tblUpdater')
542
-               ->leftJoin('tbl.updatedBy', 'tblUpdater');
542
+                ->leftJoin('tbl.updatedBy', 'tblUpdater');
543 543
             $orderBy = str_replace('tbl.updatedBy', 'tblUpdater.uname', $orderBy);
544 544
         }
545 545
         $qb->add('orderBy', $orderBy);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
     
443 443
         $query = $qb->getQuery();
444 444
     
445
-        return (int)$query->getSingleScalarResult();
445
+        return (int) $query->getSingleScalarResult();
446 446
     }
447 447
 
448 448
     /**
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
     
461 461
         $query = $qb->getQuery();
462 462
     
463
-        $count = (int)$query->getSingleScalarResult();
463
+        $count = (int) $query->getSingleScalarResult();
464 464
     
465 465
         return 1 > $count;
466 466
     }
Please login to merge, or discard this patch.
src/system/RoutesModule/Helper/Base/AbstractCollectionFilterHelper.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -164,17 +164,17 @@  discard block
 block discarded – undo
164 164
                 $v = (string)$v;
165 165
                 if ('workflowState' === $k && 0 === strpos($v, '!')) {
166 166
                     $qb->andWhere('tbl.' . $k . ' != :' . $k)
167
-                       ->setParameter($k, substr($v, 1));
167
+                        ->setParameter($k, substr($v, 1));
168 168
                 } elseif (0 === strpos($v, '%')) {
169 169
                     $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
170
-                       ->setParameter($k, '%' . substr($v, 1) . '%');
170
+                        ->setParameter($k, '%' . substr($v, 1) . '%');
171 171
                 } elseif (in_array($k, ['schemes', 'methods'], true)) {
172 172
                     // multi list filter
173 173
                     $qb->andWhere('tbl.' . $k . ' LIKE :' . $k)
174
-                       ->setParameter($k, '%' . $v . '%');
174
+                        ->setParameter($k, '%' . $v . '%');
175 175
                 } else {
176 176
                     $qb->andWhere('tbl.' . $k . ' = :' . $k)
177
-                       ->setParameter($k, $v);
177
+                        ->setParameter($k, $v);
178 178
                 }
179 179
             }
180 180
         }
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             // per default we show approved routes only
208 208
             $onlineStates = ['approved'];
209 209
             $qb->andWhere('tbl.workflowState IN (:onlineStates)')
210
-               ->setParameter('onlineStates', $onlineStates);
210
+                ->setParameter('onlineStates', $onlineStates);
211 211
         }
212 212
     
213 213
         return $qb;
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
         }
275 275
     
276 276
         $qb->andWhere('tbl.createdBy = :userId')
277
-           ->setParameter('userId', $userId);
277
+            ->setParameter('userId', $userId);
278 278
     
279 279
         return $qb;
280 280
     }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         $this->requestStack = $requestStack;
56 56
         $this->permissionHelper = $permissionHelper;
57 57
         $this->currentUserApi = $currentUserApi;
58
-        $this->showOnlyOwnEntries = (bool)$variableApi->get('ZikulaRoutesModule', 'showOnlyOwnEntries');
58
+        $this->showOnlyOwnEntries = (bool) $variableApi->get('ZikulaRoutesModule', 'showOnlyOwnEntries');
59 59
     }
60 60
     
61 61
     /**
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
     
162 162
             // field filter
163 163
             if ((!is_numeric($v) && '' !== $v) || (is_numeric($v) && 0 < $v)) {
164
-                $v = (string)$v;
164
+                $v = (string) $v;
165 165
                 if ('workflowState' === $k && 0 === strpos($v, '!')) {
166 166
                     $qb->andWhere('tbl.' . $k . ' != :' . $k)
167 167
                        ->setParameter($k, substr($v, 1));
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
             return $qb;
193 193
         }
194 194
     
195
-        $showOnlyOwnEntries = (bool)$request->query->getInt('own', (int) $this->showOnlyOwnEntries);
195
+        $showOnlyOwnEntries = (bool) $request->query->getInt('own', (int) $this->showOnlyOwnEntries);
196 196
         if ($showOnlyOwnEntries) {
197 197
             $qb = $this->addCreatorFilter($qb);
198 198
         }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
     {
269 269
         if (null === $userId) {
270 270
             $userId = $this->currentUserApi->isLoggedIn()
271
-                ? (int)$this->currentUserApi->get('uid')
271
+                ? (int) $this->currentUserApi->get('uid')
272 272
                 : UsersConstant::USER_ID_ANONYMOUS
273 273
             ;
274 274
         }
Please login to merge, or discard this patch.
src/system/UsersModule/Controller/AccessController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,8 @@
 block discarded – undo
122 122
                 $form = $this->createForm(DefaultLoginType::class, ['uid' => $uid]);
123 123
                 $loginFormEvent = new LoginFormPostCreatedEvent($form);
124 124
                 $eventDispatcher->dispatch($loginFormEvent);
125
-                if ($form->count() > 3) { // count > 3 means that the LoginFormPostCreatedEvent event added some form children
125
+                if ($form->count() > 3) {
126
+// count > 3 means that the LoginFormPostCreatedEvent event added some form children
126 127
                     $form->handleRequest($request);
127 128
                     if ($form->isSubmitted() && $form->isValid()) {
128 129
                         $uid = $form->get('uid')->getData();
Please login to merge, or discard this patch.
src/system/BlocksModule/Twig/Extension/BlocksExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
     public function getTests()
71 71
     {
72 72
         return [
73
-            new TwigTest('pendingContentCollectible', function ($obj) { return $obj instanceof PendingContentCollectible; }),
73
+            new TwigTest('pendingContentCollectible', function($obj) { return $obj instanceof PendingContentCollectible; }),
74 74
         ];
75 75
     }
76 76
 
Please login to merge, or discard this patch.
src/system/RoutesModule/Twig/TwigExtension.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         );
97 97
 
98 98
         $container = $this->container;
99
-        $path = preg_replace_callback('#%(.*?)%#', static function ($matches) use ($container) {
99
+        $path = preg_replace_callback('#%(.*?)%#', static function($matches) use ($container) {
100 100
             return '<abbr title="' . htmlspecialchars($matches[0]) . '">'
101 101
                 . htmlspecialchars($container->getParameter($matches[1]))
102 102
                 . '</abbr>'
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
         $defaults = $route->getDefaults();
107 107
         $requirements = $route->getRequirements();
108
-        $path = preg_replace_callback('#{(.*?)}#', function ($matches) use ($defaults, $requirements) {
108
+        $path = preg_replace_callback('#{(.*?)}#', function($matches) use ($defaults, $requirements) {
109 109
             $title = '';
110 110
             if (isset($defaults[$matches[1]])) {
111 111
                 $title .= $this->trans('Default: %value%', ['%value%' => htmlspecialchars($defaults[$matches[1]])]);
Please login to merge, or discard this patch.
src/system/ThemeModule/Tests/Engine/AssetBagTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
         $bag->add(['C' => 2]);
139 139
         $bag->add(['A' => 5]);
140 140
         $bag->add(['A' => 7]);
141
-        $this->assertEquals(3, $bag->allWithWeight()['A']);  // asset listed at lowest weight submitted
141
+        $this->assertEquals(3, $bag->allWithWeight()['A']); // asset listed at lowest weight submitted
142 142
         $expected = [
143 143
             'B' => 1,
144 144
             'C' => 2,
Please login to merge, or discard this patch.
ZAuthModule/AuthenticationMethod/AbstractNativeAuthenticationMethod.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,8 @@
 block discarded – undo
111 111
             return $mapping->getUid();
112 112
         } elseif ($passwordEncoder->isPasswordValid($mapping->getPass(), $data['pass'], null)) {
113 113
             // new way
114
-            if ($passwordEncoder->needsRehash($mapping->getPass())) { // check to update hash to newer algo
114
+            if ($passwordEncoder->needsRehash($mapping->getPass())) {
115
+// check to update hash to newer algo
115 116
                 $this->updatePassword($mapping, $data['pass']);
116 117
             }
117 118
 
Please login to merge, or discard this patch.