Completed
Push — develop ( ec9d31...ec79db )
by John
03:42
created
Alpha/Model/Person.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                                     'state' => 'Account state',
115 115
                                     'URL' => 'Your site address',
116 116
                                     'rights' => 'Rights Group Membership',
117
-                                    'actions' => 'Actions', );
117
+                                    'actions' => 'Actions',);
118 118
 
119 119
     /**
120 120
      * The name of the database table for the class.
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $this->password->isPassword(true);
179 179
         $this->state = new Enum(array(
180 180
                                     'Active',
181
-                                    'Disabled', ));
181
+                                    'Disabled',));
182 182
         $this->state->setValue('Active');
183 183
         $this->URL = new String();
184 184
         $this->URL->setRule(Validator::OPTIONAL_HTTP_URL);
Please login to merge, or discard this patch.
Alpha/Model/Type/Sequence.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
             $this->set('sequence', 0);
175 175
         }
176 176
 
177
-        $this->set('sequence', $this->get('sequence') + 1);
177
+        $this->set('sequence', $this->get('sequence')+1);
178 178
         $this->save();
179 179
     }
180 180
 
Please login to merge, or discard this patch.
Alpha/Util/Http/Request.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
             $URI = mb_substr($this->URI, 0, mb_strpos($this->URI, '?'));
629 629
 
630 630
             // let's take this opportunity to pass query string params to $this->params
631
-            $queryString = mb_substr($this->URI, (mb_strpos($this->URI, '?') + 1));
631
+            $queryString = mb_substr($this->URI, (mb_strpos($this->URI, '?')+1));
632 632
             $this->queryString = $queryString;
633 633
             parse_str($queryString, $this->params);
634 634
         } else {
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
             $name = $paramNames[$i];
643 643
 
644 644
             if (!isset($this->params[trim($name, '{}')])) {
645
-                if (isset($paramValues[$i]) && substr($name, 0, 1) == '{' && substr($name, strlen($name) - 1, 1) == '}') {
645
+                if (isset($paramValues[$i]) && substr($name, 0, 1) == '{' && substr($name, strlen($name)-1, 1) == '}') {
646 646
                     $this->params[trim($name, '{}')] = $paramValues[$i];
647 647
                 }
648 648
                 if (!isset($paramValues[$i]) && isset($defaultParams[trim($name, '{}')])) {
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
      * @param string $key     The key to search for
301 301
      * @param mixed  $default If key is not found, return this instead
302 302
      *
303
-     * @return mixed
303
+     * @return string
304 304
      *
305 305
      * @since 2.0
306 306
      */
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
      * @param string $key     The key to search for
392 392
      * @param mixed  $default If key is not found, return this instead
393 393
      *
394
-     * @return mixed
394
+     * @return string
395 395
      *
396 396
      * @since 2.0
397 397
      */
Please login to merge, or discard this patch.
Alpha/Util/Extension/Markdown.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         if (isset($codeTypeTag[0])) {
75 75
             $start = mb_strpos($codeTypeTag[0], '[');
76 76
             $end = mb_strpos($codeTypeTag[0], ']');
77
-            $language = mb_substr($codeTypeTag[0], $start + 1, $end - ($start + 1));
77
+            $language = mb_substr($codeTypeTag[0], $start+1, $end-($start+1));
78 78
         } else {
79 79
             // will use php as a defualt language type when none is provided
80 80
             $language = 'php';
@@ -100,11 +100,11 @@  discard block
 block discarded – undo
100 100
     {
101 101
         $config = ConfigProvider::getInstance();
102 102
 
103
-        $whole_match    =  $matches[1];
104
-        $link_text      =  $this->runSpanGamut($matches[2]);
105
-        $url            =  $matches[3] == '' ? $matches[4] : $matches[3];
106
-        $title          =& $matches[7];
107
-        $attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
103
+        $whole_match    = $matches[1];
104
+        $link_text      = $this->runSpanGamut($matches[2]);
105
+        $url            = $matches[3] == '' ? $matches[4] : $matches[3];
106
+        $title          = & $matches[7];
107
+        $attr = $this->doExtraAttributes("a", $dummy = & $matches[8]);
108 108
 
109 109
         $external = false;
110 110
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         $result = "<a href=\"$url\"";
127 127
         if (isset($title)) {
128 128
             $title = $this->encodeAttribute($title);
129
-            $result .=  " title=\"$title\"";
129
+            $result .= " title=\"$title\"";
130 130
         }
131 131
         if ($external) {
132 132
             $result .= " target=\"$url\"";
@@ -205,6 +205,6 @@  discard block
 block discarded – undo
205 205
         $text .= "</tbody>\n";
206 206
         $text .= "</table>";
207 207
         
208
-        return $this->hashBlock($text) . "\n";
208
+        return $this->hashBlock($text)."\n";
209 209
     }
210 210
 }
Please login to merge, or discard this patch.
Alpha/Controller/CacheController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@
 block discarded – undo
207 207
 
208 208
             if (isset($params['clearCache']) && $params['clearCache'] == 'true') {
209 209
                 try {
210
-                    FileUtils::deleteDirectoryContents($this->dataDir, array('.htaccess','html','images','pdf','xls'));
210
+                    FileUtils::deleteDirectoryContents($this->dataDir, array('.htaccess', 'html', 'images', 'pdf', 'xls'));
211 211
 
212 212
                     $this->setStatusMessage(View::displayUpdateMessage('Cache contents deleted successfully.'));
213 213
 
Please login to merge, or discard this patch.
Alpha/Controller/Controller.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -511,19 +511,19 @@  discard block
 block discarded – undo
511 511
             }
512 512
             // found the current job
513 513
             if ($this->name == $jobs[$i]) {
514
-                if (isset($jobs[$i - 1])) {
514
+                if (isset($jobs[$i-1])) {
515 515
                     // set the previous job if it exists
516
-                    $this->previousJob = $jobs[$i - 1];
516
+                    $this->previousJob = $jobs[$i-1];
517 517
                     self::$logger->debug('Previous job ['.$this->previousJob.']');
518 518
                 }
519
-                if (isset($jobs[$i + 1])) {
519
+                if (isset($jobs[$i+1])) {
520 520
                     // set the next job if it exists
521
-                    $this->nextJob = $jobs[$i + 1];
521
+                    $this->nextJob = $jobs[$i+1];
522 522
                     self::$logger->debug('Next job ['.$this->nextJob.']');
523 523
                 }
524 524
             }
525 525
             // the last job in the sequence
526
-            if ($i == ($numOfJobs - 1)) {
526
+            if ($i == ($numOfJobs-1)) {
527 527
                 $this->lastJob = $jobs[$i];
528 528
             }
529 529
         }
@@ -687,9 +687,9 @@  discard block
 block discarded – undo
687 687
             $this->unitEndTime->getYear()
688 688
             );
689 689
 
690
-        self::$logger->debug('<<getUnitDuration ['.$intEndTime - $intStartTime.']');
690
+        self::$logger->debug('<<getUnitDuration ['.$intEndTime-$intStartTime.']');
691 691
 
692
-        return $intEndTime - $intStartTime;
692
+        return $intEndTime-$intStartTime;
693 693
     }
694 694
 
695 695
     /**
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
1159 1159
              */
1160 1160
 
1161 1161
             // the server hostname + today's date less 1 hour (i.e. yesterday where time is < 1:00AM)
1162
-            $var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time() - 3600)))), '+/', '-_'), '=');
1162
+            $var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time()-3600)))), '+/', '-_'), '=');
1163 1163
             // the server's IP plus $var1
1164 1164
             $var2 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($ip.$var1)), '+/', '-_'), '=');
1165 1165
 
Please login to merge, or discard this patch.
Doc Comments   +11 added lines, -3 removed lines patch added patch discarded remove patch
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
     /**
298 298
      * Get the record for this controller (if any).
299 299
      *
300
-     * @return mixed
300
+     * @return ActiveRecord
301 301
      *
302 302
      * @since 1.0
303 303
      */
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
     /**
633 633
      * Getter for the unit of work MAX duration.
634 634
      *
635
-     * @return int
635
+     * @return Integer
636 636
      *
637 637
      * @since 1.0
638 638
      */
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
     /**
1180 1180
      * Generates the two security fields to prevent remote form processing.
1181 1181
      *
1182
-     * @return array An array containing the two fields
1182
+     * @return string[] An array containing the two fields
1183 1183
      *
1184 1184
      * @since 1.0
1185 1185
      */
@@ -1432,6 +1432,7 @@  discard block
 block discarded – undo
1432 1432
      * @since 2.0
1433 1433
      *
1434 1434
      * @throws \Alpha\Exception\NotImplementedException
1435
+     * @param Request $request
1435 1436
      */
1436 1437
     public function doHEAD($request)
1437 1438
     {
@@ -1444,6 +1445,7 @@  discard block
 block discarded – undo
1444 1445
      * @since 2.0
1445 1446
      *
1446 1447
      * @throws \Alpha\Exception\NotImplementedException
1448
+     * @param Request $request
1447 1449
      */
1448 1450
     public function doGET($request)
1449 1451
     {
@@ -1456,6 +1458,7 @@  discard block
 block discarded – undo
1456 1458
      * @since 2.0
1457 1459
      *
1458 1460
      * @throws \Alpha\Exception\NotImplementedException
1461
+     * @param Request $request
1459 1462
      */
1460 1463
     public function doPOST($request)
1461 1464
     {
@@ -1468,6 +1471,7 @@  discard block
 block discarded – undo
1468 1471
      * @since 2.0
1469 1472
      *
1470 1473
      * @throws \Alpha\Exception\NotImplementedException
1474
+     * @param Request $request
1471 1475
      */
1472 1476
     public function doPUT($request)
1473 1477
     {
@@ -1480,6 +1484,7 @@  discard block
 block discarded – undo
1480 1484
      * @since 2.0
1481 1485
      *
1482 1486
      * @throws \Alpha\Exception\NotImplementedException
1487
+     * @param Request $request
1483 1488
      */
1484 1489
     public function doPATCH($request)
1485 1490
     {
@@ -1492,6 +1497,7 @@  discard block
 block discarded – undo
1492 1497
      * @since 2.0
1493 1498
      *
1494 1499
      * @throws \Alpha\Exception\NotImplementedException
1500
+     * @param Request $request
1495 1501
      */
1496 1502
     public function doDELETE($request)
1497 1503
     {
@@ -1502,6 +1508,7 @@  discard block
 block discarded – undo
1502 1508
      * {@inheritdoc}
1503 1509
      *
1504 1510
      * @since 2.0
1511
+     * @param Request $request
1505 1512
      */
1506 1513
     public function doOPTIONS($request)
1507 1514
     {
@@ -1529,6 +1536,7 @@  discard block
 block discarded – undo
1529 1536
      * {@inheritdoc}
1530 1537
      *
1531 1538
      * @since 2.0.2
1539
+     * @param Request $request
1532 1540
      */
1533 1541
     public function doTRACE($request)
1534 1542
     {
Please login to merge, or discard this patch.
Alpha/Controller/SearchController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
         $config = ConfigProvider::getInstance();
200 200
 
201 201
         // used to track when our pagination range ends
202
-        $end = ($this->startPoint + $config->get('app.list.page.amount'));
202
+        $end = ($this->startPoint+$config->get('app.list.page.amount'));
203 203
 
204 204
         $body = '';
205 205
 
@@ -289,14 +289,14 @@  discard block
 block discarded – undo
289 289
 
290 290
         $body = '';
291 291
 
292
-        $end = ($this->startPoint + $config->get('app.list.page.amount'));
292
+        $end = ($this->startPoint+$config->get('app.list.page.amount'));
293 293
 
294 294
         if ($end > $this->resultCount) {
295 295
             $end = $this->resultCount;
296 296
         }
297 297
 
298 298
         if ($this->resultCount > 0) {
299
-            $body .= '<p align="center">Displaying '.($this->startPoint + 1).' to '.$end.' of <strong>'.$this->resultCount.'</strong>.&nbsp;&nbsp;';
299
+            $body .= '<p align="center">Displaying '.($this->startPoint+1).' to '.$end.' of <strong>'.$this->resultCount.'</strong>.&nbsp;&nbsp;';
300 300
         } else {
301 301
             if (!empty($this->query)) {
302 302
                 $body .= View::displayUpdateMessage('There were no search results for your query.');
@@ -308,9 +308,9 @@  discard block
 block discarded – undo
308 308
         if ($this->startPoint > 0) {
309 309
             // handle secure URLs
310 310
             if (isset($params['tk'])) {
311
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint - $config->get('app.list.page.amount'))).'">&laquo;</a></li>';
311
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint-$config->get('app.list.page.amount'))).'">&laquo;</a></li>';
312 312
             } else {
313
-                $body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint - $config->get('app.list.page.amount')).'">&laquo;</a></li>';
313
+                $body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint-$config->get('app.list.page.amount')).'">&laquo;</a></li>';
314 314
             }
315 315
         } elseif ($this->resultCount > $config->get('app.list.page.amount')) {
316 316
             $body .= '<li class="disabled"><a href="#">&laquo;</a></li>';
@@ -336,9 +336,9 @@  discard block
 block discarded – undo
336 336
         if ($this->resultCount > $end) {
337 337
             // handle secure URLs
338 338
             if (isset($params['tk'])) {
339
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint + $config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
339
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint+$config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
340 340
             } else {
341
-                $body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint + $config->get('app.list.page.amount')).'">&raquo;</a></li>';
341
+                $body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint+$config->get('app.list.page.amount')).'">&raquo;</a></li>';
342 342
             }
343 343
         } elseif ($this->resultCount > $config->get('app.list.page.amount')) {
344 344
             $body .= '<li class="disabled"><a href="#">&raquo;</a></li>';
Please login to merge, or discard this patch.
Alpha/Util/Extension/MarkdownFacade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         foreach ($attachments[0] as $attachmentURL) {
123 123
             $start = mb_strpos($attachmentURL, '/');
124 124
             $end = mb_strrpos($attachmentURL, '"');
125
-            $fileName = mb_substr($attachmentURL, $start + 1, $end - ($start + 1));
125
+            $fileName = mb_substr($attachmentURL, $start+1, $end-($start+1));
126 126
 
127 127
             if (method_exists($this->BO, 'getAttachmentSecureURL')) {
128 128
                 $this->content = str_replace($attachmentURL, 'href="'.$this->BO->getAttachmentSecureURL($fileName).'" rel="nofollow"', $this->content);
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                     $type = 'png';
151 151
                 }
152 152
 
153
-                $img = new Image($path, $image_details[0], $image_details[1], $type, 0.95, false, (boolean) $config->get('cms.images.widget.secure'));
153
+                $img = new Image($path, $image_details[0], $image_details[1], $type, 0.95, false, (boolean)$config->get('cms.images.widget.secure'));
154 154
 
155 155
                 $this->content = str_replace($attachmentURL, $img->renderHTMLLink(), $this->content);
156 156
             } else {
Please login to merge, or discard this patch.
Alpha/Util/Security/SecurityUtils.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
             $iv
73 73
         );
74 74
 
75
-        return $iv . $encryptedData;
75
+        return $iv.$encryptedData;
76 76
     }
77 77
 
78 78
     /**
Please login to merge, or discard this patch.