View GitHub Repository core

Schedule Inspection
Subscribe
Completed
Pull Request — master (#4514)
by Axel
06:35
created
Status
Category
Toggle Patches
src/Zikula/CoreInstallerBundle/Stage/Install/CompleteStage.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -94,11 +94,11 @@
 
 block discarded – undo
94 94 
     <title>${subject}</title>
95 95 
 </head>
96 96 
 <body>
97 
-<h1>Hi ${uName}!</h1>
97 
+<h1>Hi ${uname}!</h1>
98 98 
 <p>Zikula has been successfully installed at <a href="${url}">${url}</a>. If you have further questions,
99 99 
 visit <a href="https://ziku.la">ziku.la</a></p>
100 100 
 </body>
101 
-EOF;
101 
+eof;
102 102 
         $email = (new Email())
103 103 
             ->from($adminUser->getEmail())
104 104 
             ->to($adminUser->getEmail())
Please login to merge, or discard this patch.
src/system/ZAuthModule/Command/ZikulaZauthEditCommand.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -90,7 +90,7 @@
 
 block discarded – undo
90 90
91 91 
 <info>php %command.full_name% fabien</info>
92 92
93 
-EOT
93 
+eot
94 94 
             );
95 95 
     }
96 96
Please login to merge, or discard this patch.
src/system/SecurityCenterModule/Entity/Repository/IntrusionRepository.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -75,7 +75,7 @@  discard block
 
 block discarded – undo
75 75 
                 $qb->from('ZikulaUsersModule:UserEntity', 'u');
76 76 
                 $qb->andWhere($qb->expr()->eq('tbl.user', 'u.uid'));
77 77 
                 $qb->andWhere($qb->expr()->eq('tbl.user', ':uid'))
78 
-                   ->setParameter('uid', $uid);
78 
+                    ->setParameter('uid', $uid);
79 79 
             }
80 80 
         }
81 81 
 
@@ -84,7 +84,7 @@  discard block
 
 block discarded – undo
84 84 
             $i = 1;
85 85 
             foreach ($filters as $w_key => $w_value) {
86 86 
                 $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i))
87 
-                   ->setParameter($i, $w_value);
87 
+                    ->setParameter($i, $w_value);
88 88 
                 $i++;
89 89 
             }
90 90 
         }
 
@@ -107,12 +107,12 @@  discard block
 
 block discarded – undo
107 107
108 108 
         if ('uid' === $fieldName) {
109 109 
             $qb->select('DISTINCT(u.uname)')
110 
-               ->from('ZikulaUsersModule:UserEntity', 'u')
111 
-               ->where($qb->expr()->eq('tbl.user', 'u.uid'))
112 
-               ->addOrderBy('u.uname', 'ASC');
110 
+                ->from('ZikulaUsersModule:UserEntity', 'u')
111 
+                ->where($qb->expr()->eq('tbl.user', 'u.uid'))
112 
+                ->addOrderBy('u.uname', 'ASC');
113 113 
         } else {
114 114 
             $qb->select('DISTINCT(tbl.' . $fieldName . ')')
115 
-               ->addOrderBy('tbl.' . $fieldName, 'ASC');
115 
+                ->addOrderBy('tbl.' . $fieldName, 'ASC');
116 116 
         }
117 117
118 118 
         return $qb->getQuery()->getResult();
Please login to merge, or discard this patch.
src/system/GroupsModule/Entity/Repository/GroupRepository.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -45,12 +45,12 @@  discard block
 
 block discarded – undo
45 45
46 46 
         if (null !== $groupType) {
47 47 
             $qb->where('g.gtype = :gtype')
48 
-               ->setParameter('gtype', $groupType);
48 
+                ->setParameter('gtype', $groupType);
49 49 
         }
50 50
51 51 
         if (null !== $excludedState) {
52 52 
             $qb->andWhere('g.state != :state')
53 
-               ->setParameter('state', $excludedState);
53 
+                ->setParameter('state', $excludedState);
54 54 
         }
55 55
56 56 
         $query = $qb->getQuery();
 
@@ -139,7 +139,7 @@  discard block
 
 block discarded – undo
139 139 
         // already another group by that name.
140 140 
         if (is_numeric($excludedGroupId) && $excludedGroupId > 0) {
141 141 
             $qb->andWhere($qb->expr()->neq('g.gid', ':ggid'))
142 
-               ->setParameter('ggid', $excludedGroupId);
142 
+                ->setParameter('ggid', $excludedGroupId);
143 143 
         }
144 144
145 145 
         $query = $qb->getQuery();
Please login to merge, or discard this patch.
src/system/RoutesModule/Entity/Repository/Base/AbstractRouteRepository.php 1 patch
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.
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.