Completed
Pull Request — master (#3630)
by Craig
06:21
created
src/lib/Zikula/Core/FilterUtil/CategoryPlugin.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
     /**
56 56
      * Returns the operators the plugin can handle.
57 57
      *
58
-     * @return array Operators
58
+     * @return string[] Operators
59 59
      */
60 60
     public function availableOperators()
61 61
     {
Please login to merge, or discard this 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/lib/Zikula/Core/LinkContainer/LinkContainerCollector.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -31,6 +31,10 @@
 block discarded – undo
31 31
         $this->linkContainers[$linkContainer->getBundleName()] = $linkContainer;
32 32
     }
33 33
 
34
+    /**
35
+     * @param string $containerName
36
+     * @param string $type
37
+     */
34 38
     public function getLinks($containerName, $type = LinkContainerInterface::TYPE_ADMIN)
35 39
     {
36 40
         $links = [];
Please login to merge, or discard this patch.
src/system/ExtensionsModule/ExtensionsModuleInstaller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
      * This function must consider all the released versions of the module!
56 56
      * If the upgrade fails at some point, it returns the last upgraded version.
57 57
      *
58
-     * @param string $oldversion Version number string to upgrade from
58
+     * @param string $oldVersion Version number string to upgrade from
59 59
      *
60 60
      * @return  boolean|string True on success, last valid version string or false if fails
61 61
      */
Please login to merge, or discard this patch.
src/system/RoutesModule/Twig/TwigExtension.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
      * Example:
50 50
      *    {{ route.defaults|zikularoutesmodule_arrayToString }}
51 51
      *
52
-     * @param array $array The input array.
53 52
      *
54 53
      * @return string Output string for display.
55 54
      */
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,13 +106,13 @@
 block discarded – undo
106 106
         $path = htmlspecialchars($route->getPathWithBundlePrefix());
107 107
         $container = $this->container;
108 108
 
109
-        $path = preg_replace_callback('#%(.*?)%#', function ($matches) use ($container) {
109
+        $path = preg_replace_callback('#%(.*?)%#', function($matches) use ($container) {
110 110
             return '<abbr title="' . htmlspecialchars($matches[0]) . '">' . htmlspecialchars($container->getParameter($matches[1])) . '</abbr>';
111 111
         }, $path);
112 112
 
113 113
         $defaults = $route->getDefaults();
114 114
         $requirements = $route->getRequirements();
115
-        $path = preg_replace_callback('#{(.*?)}#', function ($matches) use ($defaults, $requirements) {
115
+        $path = preg_replace_callback('#{(.*?)}#', function($matches) use ($defaults, $requirements) {
116 116
             $title = '';
117 117
             if (isset($defaults[$matches[1]])) {
118 118
                 $title .= $this->__f('Default: %s', ['%s' => htmlspecialchars($defaults[$matches[1]])]);
Please login to merge, or discard this patch.
src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -251,6 +251,9 @@
 block discarded – undo
251 251
         return false;
252 252
     }
253 253
 
254
+    /**
255
+     * @param string $name
256
+     */
254 257
     private function setSystemVar($name, $value = '')
255 258
     {
256 259
         return $this->container->get('zikula_extensions_module.api.variable')->set(VariableApi::CONFIG, $name, $value);
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         $this->setSystemVar('sessionstoretofile', Constant::SESSION_STORAGE_FILE);
56 56
         $this->setSystemVar('sessionsavepath', '');
57 57
         $this->setSystemVar('gc_probability', 100);
58
-        $this->setSystemVar('sessioncsrftokenonetime', 1);  // 1 means use same token for entire session
58
+        $this->setSystemVar('sessioncsrftokenonetime', 1); // 1 means use same token for entire session
59 59
         $this->setSystemVar('sessionrandregenerate', 1);
60 60
         $this->setSystemVar('sessionregenerate', 1);
61 61
         $this->setSystemVar('sessionregeneratefreq', 10);
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
         $this->setSystemVar('useids', 0);
78 78
         $this->setSystemVar('idsmail', 0);
79 79
         $this->setSystemVar('idsrulepath', 'system/SecurityCenterModule/Resources/config/phpids_zikula_default.xml');
80
-        $this->setSystemVar('idssoftblock', 1);                // do not block requests, but warn for debugging
81
-        $this->setSystemVar('idsfilter', 'xml');               // filter type
82
-        $this->setSystemVar('idsimpactthresholdone', 1);       // db logging
83
-        $this->setSystemVar('idsimpactthresholdtwo', 10);      // mail admin
84
-        $this->setSystemVar('idsimpactthresholdthree', 25);    // block request
85
-        $this->setSystemVar('idsimpactthresholdfour', 75);     // kick user, destroy session
86
-        $this->setSystemVar('idsimpactmode', 1);               // per request per default
80
+        $this->setSystemVar('idssoftblock', 1); // do not block requests, but warn for debugging
81
+        $this->setSystemVar('idsfilter', 'xml'); // filter type
82
+        $this->setSystemVar('idsimpactthresholdone', 1); // db logging
83
+        $this->setSystemVar('idsimpactthresholdtwo', 10); // mail admin
84
+        $this->setSystemVar('idsimpactthresholdthree', 25); // block request
85
+        $this->setSystemVar('idsimpactthresholdfour', 75); // kick user, destroy session
86
+        $this->setSystemVar('idsimpactmode', 1); // per request per default
87 87
         $this->setSystemVar('idshtmlfields', ['POST.__wysiwyg']);
88 88
         $this->setSystemVar('idsjsonfields', ['POST.__jsondata']);
89 89
         $this->setSystemVar('idsexceptions', [
Please login to merge, or discard this patch.
src/system/ThemeModule/Engine/Asset/Merger.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 
285 285
     /**
286 286
      * Remove comments, whitespace and spaces from css files
287
-     * @param $contents
287
+     * @param string $contents
288 288
      * @return string
289 289
      */
290 290
     private function minify($contents)
Please login to merge, or discard this 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.
src/system/UsersModule/Collector/AuthenticationMethodCollector.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
     }
92 92
 
93 93
     /**
94
-     * @return array of service aliases
94
+     * @return integer[] of service aliases
95 95
      */
96 96
     public function getKeys()
97 97
     {
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     }
100 100
 
101 101
     /**
102
-     * @return array of active service aliases
102
+     * @return integer[] of active service aliases
103 103
      */
104 104
     public function getActiveKeys()
105 105
     {
Please login to merge, or discard this patch.
src/system/UsersModule/Helper/MailHelper.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -262,6 +262,9 @@
 block discarded – undo
262 262
         return $this->mailerApi->sendMessage($message, null, null, $textBody, $html);
263 263
     }
264 264
 
265
+    /**
266
+     * @param string $notificationType
267
+     */
265 268
     private function generateEmailSubject($notificationType, array $templateArgs = [])
266 269
     {
267 270
         $siteName = $this->variableApi->getSystemVar('sitename');
Please login to merge, or discard this patch.
src/system/ZAuthModule/Helper/FileIOHelper.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,6 +110,9 @@  discard block
 block discarded – undo
110 110
         $this->passwordApi = $passwordApi;
111 111
     }
112 112
 
113
+    /**
114
+     * @param TranslatorInterface $translator
115
+     */
113 116
     public function setTranslator($translator)
114 117
     {
115 118
         $this->translator = $translator;
@@ -273,8 +276,8 @@  discard block
 block discarded – undo
273 276
     /**
274 277
      * Convert errors to string and add current line.
275 278
      * @param $errors
276
-     * @param $type
277
-     * @param $line
279
+     * @param string $type
280
+     * @param integer $line
278 281
      * @return string
279 282
      */
280 283
     private function locateErrors($errors, $type, $line)
Please login to merge, or discard this patch.