Completed
Push — develop ( 4e3f55...7f2ea0 )
by Patrick
02:10
created
Auth/LDAPCachableObject.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
      *
44 44
      * @param string $fieldName The name of the field to retrieve
45 45
      *
46
-     * @return mixed string the value of the field
46
+     * @return string string the value of the field
47 47
      */
48 48
     protected function getFieldSingleValue($fieldName)
49 49
     {
Please login to merge, or discard this patch.
Auth/User.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -311,7 +311,7 @@
 block discarded – undo
311 311
      *
312 312
      * @param stdClass $data The user's new data
313 313
      *
314
-     * @return boolean true if the user's data was changed, false otherwise
314
+     * @return boolean|null true if the user's data was changed, false otherwise
315 315
      */
316 316
     public function editUser($data)
317 317
     {
Please login to merge, or discard this patch.
AuthProvider.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -253,10 +253,10 @@
 block discarded – undo
253 253
      * Get an array of Auth\PendingUser from a filtered set
254 254
      *
255 255
      * @param Data\Filter|boolean $filter The filter conditions or false to retreive all
256
-     * @param array|boolean $select The user fields to obtain or false to obtain all
257
-     * @param integer|boolean $top The number of users to obtain or false to obtain all
258
-     * @param integer|boolean $skip The number of users to skip or false to skip none
259
-     * @param array|boolean $orderby The field to sort by and the method to sort or false to not sort
256
+     * @param boolean $select The user fields to obtain or false to obtain all
257
+     * @param boolean $top The number of users to obtain or false to obtain all
258
+     * @param boolean $skip The number of users to skip or false to skip none
259
+     * @param boolean $orderby The field to sort by and the method to sort or false to not sort
260 260
      * @param string|boolean $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator
261 261
      *
262 262
      * @return array|boolean An array of Auth\PendingUser objects or false if no pending users were found
Please login to merge, or discard this patch.
Data/FilterClause.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@
 block discarded – undo
176 176
      * Convert the right hand side of the filter clause into an Mongo array
177 177
      *
178 178
      * @param string $op The standard operator
179
-     * @param string $var The second variable in the operator
179
+     * @param string $var2 The second variable in the operator
180 180
      *
181 181
      * @return array An array of mongo operations
182 182
      */
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -140,9 +140,9 @@
 block discarded – undo
140 140
             $case = true;
141 141
         }
142 142
         if($case)
143
-	{
143
+        {
144 144
             if(class_exists('MongoRegex'))
145
-	    {
145
+            {
146 146
                 return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
147 147
             }
148 148
             else
Please login to merge, or discard this patch.
Data/SQLDataSet.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
      * @param string $select The colums to read
151 151
      * @param boolean|string $count The number of rows to read
152 152
      * @param boolean|string $skip The number of rows to skip over
153
-     * @param boolean|array $sort The array to sort by or false to not sort
153
+     * @param boolean $sort The array to sort by or false to not sort
154 154
      *
155 155
      * @return false|array An array of all the returned records
156 156
      */
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -247,7 +247,8 @@  discard block
 block discarded – undo
247 247
         $stmt = $this->pdo->query($sql);
248 248
         if($stmt === false)
249 249
         {
250
-            if (php_sapi_name() !== "cli") {
250
+            if (php_sapi_name() !== "cli")
251
+            {
251 252
               error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
252 253
             }
253 254
             return false;
@@ -296,7 +297,8 @@  discard block
 block discarded – undo
296 297
         $sql = "INSERT INTO $tablename ($cols) VALUES ($set);";
297 298
         if($this->pdo->exec($sql) === false)
298 299
         {
299
-            if (php_sapi_name() !== "cli") {
300
+            if (php_sapi_name() !== "cli")
301
+            {
300 302
                 error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true));
301 303
             }
302 304
             return false;
Please login to merge, or discard this patch.
Http/FlipAdminPage.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -11,6 +11,9 @@
 block discarded – undo
11 11
         $this->setTemplateName('admin.html');
12 12
     }
13 13
 
14
+    /**
15
+     * @param string $adminGroup
16
+     */
14 17
     protected function userIsAdmin($adminGroup)
15 18
     {
16 19
         if($this->user === false || $this->user === null)
Please login to merge, or discard this patch.
Http/Rest/DataTableAPI.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     /**
16 16
      * Create the DataTableAPI for the given DataTable info
17 17
      *
18
-     * @param string $datSetName The name of the DataSet used in the Settings
18
+     * @param string $dataSetName The name of the DataSet used in the Settings
19 19
      * @param string $dataTableName The name of the table in the DataSet
20 20
      * @param string|false $primaryKeyName The table primary key. Must be specified for update/delete capable tables
21 21
      */
Please login to merge, or discard this patch.
Http/Rest/SerializationMiddleware.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -24,6 +24,9 @@
 block discarded – undo
24 24
         }
25 25
     }
26 26
 
27
+    /**
28
+     * @param string $param
29
+     */
27 30
     private function getParamFromArrayIfSet($array, $param, $default = null)
28 31
     {
29 32
         if(isset($array[$param]))
Please login to merge, or discard this patch.
Http/WebPage.php 2 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,6 +78,9 @@  discard block
 block discarded – undo
78 78
         $this->loader->addPath($dir, $namespace);
79 79
     }
80 80
 
81
+    /**
82
+     * @param string $name
83
+     */
81 84
     public function setTemplateName($name)
82 85
     {
83 86
         $this->templateName = $name;
@@ -112,7 +115,6 @@  discard block
 block discarded – undo
112 115
      * Add a JavaScript file from a set of files known to the framework
113 116
      *
114 117
      * @param string $jsFileID the ID of the JS file
115
-     * @param boolean $async Can the JS file be loaded asynchronously?
116 118
      */
117 119
     public function addWellKnownJS($jsFileID)
118 120
     {
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
         $twigSettings = array();
24 24
         if(\file_exists('/var/php_cache/twig'))
25
-    	{	
25
+        {
26 26
         	$twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig');
27 27
         	$twigSettings['cache'] = $twigCache;
28 28
 		    //$twigSettings = array('cache' => $twigCache, 'debug' => true);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
71 71
 
72 72
 	if($this->user === false || $this->user === null)
73
-        {
73
+	{
74 74
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
75 75
             {
76 76
                 $this->addLink('Login', $this->loginUrl);
Please login to merge, or discard this patch.