Completed
Pull Request — master (#3788)
by Craig
01:31
created
src/system/CategoriesModule/Form/Type/CategoryType.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
                 'mapped' => false,
92 92
                 'required' => false
93 93
             ])
94
-            ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options) {
94
+            ->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) use ($options) {
95 95
                 // ensure all locales have a display name
96 96
                 /** @var CategoryEntity $category */
97 97
                 $category = $event->getData();
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
         $builder->get('name')
110 110
             ->addModelTransformer(new CallbackTransformer(
111 111
                 // remove slash from name before persistence to prevent issues with path
112
-                function ($string) {
112
+                function($string) {
113 113
                     return $string;
114 114
                 },
115
-                function ($string) {
115
+                function($string) {
116 116
                     return str_replace('/', '/', $string);
117 117
                 }
118 118
             ))
Please login to merge, or discard this patch.
src/system/CategoriesModule/Controller/NodeController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
                 $newCategory->setName($category->getName() . 'copy');
55 55
                 $displayNames = [];
56 56
                 foreach ($newCategory->getDisplay_name() as $locale => $displayName) {
57
-                    $displayNames[$locale] = $displayName . ' ' .$this->__('copy');
57
+                    $displayNames[$locale] = $displayName . ' ' . $this->__('copy');
58 58
                 }
59 59
                 $newCategory->setDisplay_name($displayNames);
60 60
                 $action = 'edit';
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,8 @@
 block discarded – undo
70 70
                         $parent = $repo->find($parentId);
71 71
                         $category->setParent($parent);
72 72
                         $category->setRoot($parent->getRoot());
73
-                    } elseif (empty($parentId) && $request->request->has('after')) { // sibling of top-level child
73
+                    } elseif (empty($parentId) && $request->request->has('after')) {
74
+// sibling of top-level child
74 75
                         $sibling = $repo->find($request->request->get('after'));
75 76
                         $category->setParent($sibling->getParent());
76 77
                         $category->setRoot($sibling->getRoot());
Please login to merge, or discard this patch.
src/system/CategoriesModule/Controller/CategoryController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         return [
80 80
             'decorate' => true,
81 81
             'html' => true,
82
-            'childOpen' => function ($node) {
82
+            'childOpen' => function($node) {
83 83
                 $jsTreeData = [];
84 84
                 $jsTreeData['disabled'] = $node['status'] != 'A';
85 85
                 $jsTreeData['type'] = $node['is_leaf'] ? 'leaf' : 'default';
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
                 return '<li ' . $jsTreeData . 'class="jstree-open" id="' . $this->domTreeNodePrefix . $node['id'] . '">';
89 89
             },
90
-            'nodeDecorator' => function ($node) use ($locale) {
90
+            'nodeDecorator' => function($node) use ($locale) {
91 91
                 $displayName = isset($node['display_name'][$locale]) ? $node['display_name'][$locale] : $node['name'];
92 92
                 $title = ' title="' . $this->createTitleAttribute($node, $displayName, $locale) . '"';
93 93
                 $classes = [];
Please login to merge, or discard this patch.
src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
         $config = $this->config;
70 70
         $alias = $config->getAlias();
71 71
         $qb = $config->getQueryBuilder();
72
-        $qb->join($alias.'.categories', $alias.'_cat_plugin')->join(
73
-            $alias.'_cat_plugin.category',
74
-            $alias.'_cat_plugin_category'
72
+        $qb->join($alias . '.categories', $alias . '_cat_plugin')->join(
73
+            $alias . '_cat_plugin.category',
74
+            $alias . '_cat_plugin_category'
75 75
         );
76 76
     }
77 77
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         if (empty($property)) {
86 86
             $this->property = null;
87 87
         } else {
88
-            $this->property = (array) $property;
88
+            $this->property = (array)$property;
89 89
         }
90 90
     }
91 91
 
@@ -131,10 +131,10 @@  discard block
 block discarded – undo
131 131
         $alias = $config->getAlias();
132 132
         $expr = $config->getQueryBuilder()->expr();
133 133
         if ($op == 'sub' || is_numeric($value)) {
134
-            $column = $alias.'_cat_plugin_category.id';
134
+            $column = $alias . '_cat_plugin_category.id';
135 135
             $prop = 'id';
136 136
         } else {
137
-            $column = $alias.'_cat_plugin_category.name';
137
+            $column = $alias . '_cat_plugin_category.name';
138 138
             $prop = 'name';
139 139
         }
140 140
         $con = null;
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         }
159 159
         if (null !== $this->modname && null !== $this->property) {
160 160
             $propertyCon = $expr->in(
161
-                $alias.'_cat_plugin.categoryRegistryId',
161
+                $alias . '_cat_plugin.categoryRegistryId',
162 162
                 $config->toParam($this->getRegistryIds(), 'category', $field)
163 163
             );
164 164
             if (null !== $con) {
Please login to merge, or discard this patch.
src/system/RoutesModule/Form/Handler/Route/EditHandler.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,8 +63,8 @@
 block discarded – undo
63 63
     {
64 64
         $entity = $this->entityRef;
65 65
 
66
-        list($controller, ) = $this->sanitizeHelper->sanitizeController($entity['controller']);
67
-        list($action, ) = $this->sanitizeHelper->sanitizeAction($entity['action']);
66
+        list($controller,) = $this->sanitizeHelper->sanitizeController($entity['controller']);
67
+        list($action,) = $this->sanitizeHelper->sanitizeAction($entity['action']);
68 68
 
69 69
         $entity['controller'] = $controller;
70 70
         $entity['action'] = $action;
Please login to merge, or discard this patch.
src/system/SettingsModule/SettingsModuleInstaller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -142,9 +142,9 @@
 block discarded – undo
142 142
                 $newStargArgs = str_replace(',', '&', $this->getSystemVar('startargs')); // replace comma with `&`
143 143
                 $this->setSystemVar('startargs', $newStargArgs);
144 144
             case '2.9.11':
145
-                $this->setSystemVar('shorturls', (bool) $this->getSystemVar('shorturls'));
146
-                $this->setSystemVar('shorturlsstripentrypoint', (bool) $this->getSystemVar('shorturlsstripentrypoint'));
147
-                $this->setSystemVar('useCompression', (bool) $this->getSystemVar('useCompression'));
145
+                $this->setSystemVar('shorturls', (bool)$this->getSystemVar('shorturls'));
146
+                $this->setSystemVar('shorturlsstripentrypoint', (bool)$this->getSystemVar('shorturlsstripentrypoint'));
147
+                $this->setSystemVar('useCompression', (bool)$this->getSystemVar('useCompression'));
148 148
             case '2.9.12': // ship with Core-1.4.4
149 149
                 // reconfigure TZ settings
150 150
                 $this->setGuestTimeZone();
Please login to merge, or discard this patch.
src/system/ExtensionsModule/Helper/ExtensionDependencyHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
      * @param ExtensionDependencyEntity $dependency
159 159
      * @return bool
160 160
      */
161
-    private function bundleDependencySatisfied(ExtensionDependencyEntity &$dependency)
161
+    private function bundleDependencySatisfied(ExtensionDependencyEntity & $dependency)
162 162
     {
163 163
         if ($dependency->getModname() == "php") {
164 164
             // Do not use PHP_VERSION constant, because it might throw off the semver parser.
Please login to merge, or discard this patch.
src/system/ThemeModule/Engine/Asset/Merger.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
                 }
99 99
             }
100 100
         }
101
-        $cacheName = in_array($type, ['js', 'css']) ? "{$type}Cache" : null;
101
+        $cacheName = in_array($type, ['js', 'css']) ? "{$type}cache" : null;
102 102
         /** @var CacheProvider $cacheService */
103 103
         $cacheService = $this->$cacheName;
104 104
         $key = md5(serialize($assets)) . (int)$this->minify . (int)$this->compress . $this->lifetime . '.' . $type;
Please login to merge, or discard this patch.
RoutesModule/Validator/Constraints/Base/AbstractListEntryValidator.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 
64 64
         if ($constraint->propertyName == 'workflowState' && in_array($value, ['initial', 'deleted'])) {
65 65
             return;
66
-    	}
66
+        }
67 67
 
68 68
         $listEntries = $this->listEntriesHelper->getEntries($constraint->entityName, $constraint->propertyName);
69 69
         $allowedValues = [];
Please login to merge, or discard this patch.