Completed
Pull Request — master (#3525)
by Craig
08:24
created
src/system/BlocksModule/Helper/InstallerHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
             $blockClassName = preg_match('/.*Block$/', $blockClassName) ? $blockClassName : $blockClassName . 'Block';
83 83
         } catch (\Exception $e) {
84 84
             $moduleBundle = null;
85
-            $blockClassName = '\\' . ucwords($moduleName).'\\'.'Block\\'.ucwords($blockEntity->getBkey());
85
+            $blockClassName = '\\' . ucwords($moduleName) . '\\' . 'Block\\' . ucwords($blockEntity->getBkey());
86 86
             $blockClassName = preg_match('/.*Block$/', $blockClassName) ? $blockClassName : $blockClassName . 'Block';
87 87
             $blockClassNameOld = '\\' . ucwords($moduleName) . '_' . 'Block_' . ucwords($blockEntity->getBkey());
88 88
             $blockClassName = class_exists($blockClassName) ? $blockClassName : $blockClassNameOld;
Please login to merge, or discard this patch.
src/system/RoutesModule/Translation/ZikulaPatternGenerationStrategy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
                 || (self::STRATEGY_PREFIX_EXCEPT_DEFAULT === $this->strategy && $this->defaultLocale !== $locale)) {
105 105
                 $i18nPattern = '/' . $locale . $i18nPattern;
106 106
                 if (null !== $route->getOption('i18n_prefix')) {
107
-                    $i18nPattern = $route->getOption('i18n_prefix').$i18nPattern;
107
+                    $i18nPattern = $route->getOption('i18n_prefix') . $i18nPattern;
108 108
                 }
109 109
             }
110 110
 
Please login to merge, or discard this patch.
src/system/RoutesModule/Helper/Base/AbstractControllerHelper.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
             } else {
146 146
                 // single identifier
147 147
                 if (array_key_exists($idField, $routeParams)) {
148
-                    $id = (int) !empty($routeParams[$idField]) ? $routeParams[$idField] : $defaultValue;
148
+                    $id = (int)!empty($routeParams[$idField]) ? $routeParams[$idField] : $defaultValue;
149 149
                 } elseif ($request->query->has($idField)) {
150 150
                     $id = $request->query->getInt($idField, $defaultValue);
151 151
                 } else {
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
             if (!$id && $idField != 'id' && count($idFields) == 1) {
158 158
                 $defaultValue = isset($args['id']) && is_numeric($args['id']) ? $args['id'] : 0;
159 159
                 if (array_key_exists('id', $routeParams)) {
160
-                    $id = (int) !empty($routeParams['id']) ? $routeParams['id'] : $defaultValue;
160
+                    $id = (int)!empty($routeParams['id']) ? $routeParams['id'] : $defaultValue;
161 161
                 } elseif ($request->query->has('id')) {
162
-                    $id = (int) $request->query->getInt('id', $defaultValue);
162
+                    $id = (int)$request->query->getInt('id', $defaultValue);
163 163
                 } else {
164 164
                     $id = $defaultValue;
165 165
                 }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
      * @param string $context Usage context (allowed values: controllerAction, api, helper, actionHandler, block, contentType, util)
68 68
      * @param array  $args    Additional arguments
69 69
      *
70
-     * @return array List of allowed object types
70
+     * @return string[] List of allowed object types
71 71
      */
72 72
     public function getObjectTypes($context = '', $args = [])
73 73
     {
Please login to merge, or discard this patch.
src/system/RoutesModule/Helper/Base/AbstractSelectionHelper.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
         $slimMode = (bool) $slimMode; 
143 143
     
144 144
         if (!empty($idList)) {
145
-           return $repository->selectByIdList($idList, $useJoins, $slimMode);
145
+            return $repository->selectByIdList($idList, $useJoins, $slimMode);
146 146
         }
147 147
     
148 148
         return $repository->selectWhere($where, $orderBy, $useJoins, $slimMode);
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
     
107 107
         $repository = $this->getRepository($objectType);
108 108
     
109
-        $useJoins = (bool) $useJoins;
110
-        $slimMode = (bool) $slimMode; 
109
+        $useJoins = (bool)$useJoins;
110
+        $slimMode = (bool)$slimMode; 
111 111
     
112 112
         $entity = $repository->selectById($id, $useJoins, $slimMode);
113 113
     
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
         }
134 134
         $repository = $this->getRepository($objectType);
135 135
     
136
-        $useJoins = (bool) $useJoins;
137
-        $slimMode = (bool) $slimMode; 
136
+        $useJoins = (bool)$useJoins;
137
+        $slimMode = (bool)$slimMode; 
138 138
     
139 139
         if (!empty($idList)) {
140 140
            return $repository->selectByIdList($idList, $useJoins, $slimMode);
@@ -163,8 +163,8 @@  discard block
 block discarded – undo
163 163
         }
164 164
         $repository = $this->getRepository($objectType);
165 165
     
166
-        $useJoins = (bool) $useJoins;
167
-        $slimMode = (bool) $slimMode; 
166
+        $useJoins = (bool)$useJoins;
167
+        $slimMode = (bool)$slimMode; 
168 168
     
169 169
         return $repository->selectWherePaginated($where, $orderBy, $currentPage, $resultsPerPage, $useJoins, $slimMode);
170 170
     }
Please login to merge, or discard this patch.
src/system/MenuModule/Block/Form/Type/MenuType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,10 +39,10 @@
 block discarded – undo
39 39
         ;
40 40
         $builder->get('options')
41 41
             ->addModelTransformer(new CallbackTransformer(
42
-                function ($text) {
42
+                function($text) {
43 43
                     return $text;
44 44
                 },
45
-                function ($text) {
45
+                function($text) {
46 46
                     if (empty($text)) {
47 47
                         return '{}';
48 48
                     }
Please login to merge, or discard this patch.
src/system/MenuModule/Controller/NodeController.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,9 +122,9 @@
 block discarded – undo
122 122
         $entityId = str_replace($this->domTreeNodePrefix, '', $node['id']);
123 123
         $menuItemEntity = $repo->find($entityId);
124 124
         $oldParent = $request->request->get('old_parent');
125
-        $oldPosition = (int) $request->request->get('old_position');
125
+        $oldPosition = (int)$request->request->get('old_position');
126 126
         $parent = $request->request->get('parent');
127
-        $position = (int) $request->request->get('position');
127
+        $position = (int)$request->request->get('position');
128 128
         if ($oldParent == $parent) {
129 129
             $diff = $oldPosition - $position; // if $diff is positive, then node moved up
130 130
             $methodName = $diff > 0 ? 'moveUp' : 'moveDown';
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,8 @@
 block discarded – undo
56 56
                         $parent = $repo->find($request->request->get('parent'));
57 57
                         $menuItemEntity->setParent($parent);
58 58
                         $menuItemEntity->setRoot($parent->getRoot());
59
-                    } elseif (empty($parent) && $request->request->has('after')) { // sibling of top-level child
59
+                    } elseif (empty($parent) && $request->request->has('after')) {
60
+// sibling of top-level child
60 61
                         $sibling = $repo->find($request->request->get('after'));
61 62
                         $menuItemEntity->setParent($sibling->getParent());
62 63
                         $menuItemEntity->setRoot($sibling->getRoot());
Please login to merge, or discard this patch.
src/system/CategoriesModule/Entity/Repository/CategoryRepository.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,12 +36,12 @@
 block discarded – undo
36 36
 
37 37
         if ($parentId > 0) {
38 38
             $qb->andWhere('c.parent = :parentid')
39
-               ->setParameter('parentid', $parentId);
39
+                ->setParameter('parentid', $parentId);
40 40
         }
41 41
 
42 42
         if ($excludedId > 0) {
43 43
             $qb->andWhere('c.id != :id')
44
-               ->setParameter('id', $excludedId);
44
+                ->setParameter('id', $excludedId);
45 45
         }
46 46
 
47 47
         $query = $qb->getQuery();
Please login to merge, or discard this patch.
CategoriesModule/Form/DataTransformer/CategoriesCollectionTransformer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         $class = $this->entityCategoryClass;
36 36
 
37 37
         foreach ($value as $regId => $categories) {
38
-            $regId = (int) substr($regId, strpos($regId, '_') + 1);
38
+            $regId = (int)substr($regId, strpos($regId, '_') + 1);
39 39
             $subCollection = new ArrayCollection();
40 40
             if (!is_array($categories) && $categories instanceof CategoryEntity) {
41 41
                 $categories = [$categories];
Please login to merge, or discard this patch.
src/system/UsersModule/Block/OnlineBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
      */
26 26
     public function display(array $properties)
27 27
     {
28
-        if (!$this->hasPermission('Onlineblock::', $properties['bid'].'::', ACCESS_READ)) {
28
+        if (!$this->hasPermission('Onlineblock::', $properties['bid'] . '::', ACCESS_READ)) {
29 29
             return '';
30 30
         }
31 31
 
Please login to merge, or discard this patch.