Completed
Push — develop ( d14b6f...21e97e )
by John
02:54
created
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.
Alpha/Controller/PhpinfoController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
6 6
 use Alpha\Util\Config\ConfigProvider;
7 7
 use Alpha\Util\Http\Request;
8 8
 use Alpha\Util\Http\Response;
9
-use Alpha\Util\Http\Session\SessionProviderFactory;
10 9
 use Alpha\View\View;
11 10
 use Alpha\Controller\Front\FrontController;
12 11
 
Please login to merge, or discard this patch.
Alpha/Model/Type/Timestamp.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -629,15 +629,15 @@
 block discarded – undo
629 629
         $unixTS = $this->getUnixValue();
630 630
 
631 631
         if ($now > $unixTS) {
632
-            $difference = $now - $unixTS;
632
+            $difference = $now-$unixTS;
633 633
             $tense = 'ago';
634 634
         } else {
635
-            $difference = $unixTS - $now;
635
+            $difference = $unixTS-$now;
636 636
             $tense = 'from now';
637 637
         }
638 638
 
639
-        for ($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; ++$i) {
640
-            $difference = round($difference / $lengths[$i]);
639
+        for ($i = 0; $difference >= $lengths[$i] && $i < count($lengths)-1; ++$i) {
640
+            $difference = round($difference/$lengths[$i]);
641 641
         }
642 642
 
643 643
         $difference = round($difference);
Please login to merge, or discard this patch.
Alpha/Controller/Controller.php 2 patches
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.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -509,19 +509,19 @@  discard block
 block discarded – undo
509 509
             }
510 510
             // found the current job
511 511
             if ($this->name == $jobs[$i]) {
512
-                if (isset($jobs[$i - 1])) {
512
+                if (isset($jobs[$i-1])) {
513 513
                     // set the previous job if it exists
514
-                    $this->previousJob = $jobs[$i - 1];
514
+                    $this->previousJob = $jobs[$i-1];
515 515
                     self::$logger->debug('Previous job ['.$this->previousJob.']');
516 516
                 }
517
-                if (isset($jobs[$i + 1])) {
517
+                if (isset($jobs[$i+1])) {
518 518
                     // set the next job if it exists
519
-                    $this->nextJob = $jobs[$i + 1];
519
+                    $this->nextJob = $jobs[$i+1];
520 520
                     self::$logger->debug('Next job ['.$this->nextJob.']');
521 521
                 }
522 522
             }
523 523
             // the last job in the sequence
524
-            if ($i == ($numOfJobs - 1)) {
524
+            if ($i == ($numOfJobs-1)) {
525 525
                 $this->lastJob = $jobs[$i];
526 526
             }
527 527
         }
@@ -685,9 +685,9 @@  discard block
 block discarded – undo
685 685
             intval($this->unitEndTime->getYear())
686 686
             );
687 687
 
688
-        self::$logger->debug('<<getUnitDuration ['.$intEndTime - $intStartTime.']');
688
+        self::$logger->debug('<<getUnitDuration ['.$intEndTime-$intStartTime.']');
689 689
 
690
-        return $intEndTime - $intStartTime;
690
+        return $intEndTime-$intStartTime;
691 691
     }
692 692
 
693 693
     /**
@@ -1153,7 +1153,7 @@  discard block
 block discarded – undo
1153 1153
              */
1154 1154
 
1155 1155
             // the server hostname + today's date less 1 hour (i.e. yesterday where time is < 1:00AM)
1156
-            $var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time() - 3600)))), '+/', '-_'), '=');
1156
+            $var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time()-3600)))), '+/', '-_'), '=');
1157 1157
             // the server's IP plus $var1
1158 1158
             $var2 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($ip.$var1)), '+/', '-_'), '=');
1159 1159
 
Please login to merge, or discard this patch.
Alpha/Controller/InstallController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -454,7 +454,7 @@
 block discarded – undo
454 454
      * Custom version of the check rights method that only checks for a session for the config admin username/password,
455 455
      * when the system database is not set-up.
456 456
      *
457
-     * @return bool
457
+     * @return boolean|null
458 458
      *
459 459
      * @since 1.0
460 460
      */
Please login to merge, or discard this patch.
Alpha/Model/ActiveRecordProviderFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
      * A static method that attempts to return a ActiveRecordProviderInterface instance
68 68
      * based on the name of the provider class supplied.
69 69
      *
70
-     * @param $providerName The fully-qualified class name of the provider class.
70
+     * @param string $providerName The fully-qualified class name of the provider class.
71 71
      * @param $BO The (optional) active record instance to pass to the persistance provider for mapping.
72 72
      *
73 73
      * @throws \Alpha\Exception\IllegalArguementException
Please login to merge, or discard this patch.
Alpha/Model/Type/RelationLookup.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -222,6 +222,7 @@  discard block
 block discarded – undo
222 222
      * (non-PHPdoc)
223 223
      *
224 224
      * @see Alpha\Model\ActiveRecord::loadAllByAttribute()
225
+     * @param string $attribute
225 226
      */
226 227
     public function loadAllByAttribute($attribute, $value, $start = 0, $limit = 0, $orderBy = 'OID', $order = 'ASC', $ignoreClassType = false, $constructorArgs = array())
227 228
     {
@@ -312,7 +313,7 @@  discard block
 block discarded – undo
312 313
     /**
313 314
      * Returns an array of the OIDs of the related objects.
314 315
      *
315
-     * @return array
316
+     * @return integer[]
316 317
      *
317 318
      * @since 1.0
318 319
      */
@@ -325,7 +326,7 @@  discard block
 block discarded – undo
325 326
      * Used to set the OIDs of the related objects.  Pass a two-item array of OIDs, the first
326 327
      * one being the left object OID, the second being the right.
327 328
      *
328
-     * @param array $OIDs
329
+     * @param string[] $OIDs
329 330
      *
330 331
      * @since 1.0
331 332
      *
Please login to merge, or discard this patch.
Alpha/Util/Cache/CacheProviderFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
      * A static method that attempts to return a CacheProviderInterface instance
64 64
      * based on the name of the provider class supplied.
65 65
      *
66
-     * @param $providerName The class name of the provider class (fully qualified).
66
+     * @param string $providerName The class name of the provider class (fully qualified).
67 67
      *
68 68
      * @throws \Alpha\Exception\IllegalArguementException
69 69
      *
Please login to merge, or discard this patch.
Alpha/Util/Code/Highlight/HighlightProviderFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
      * A static method that attempts to return a HighlightProviderInterface instance
64 64
      * based on the name of the provider class supplied.
65 65
      *
66
-     * @param $providerName The fully-qualified class name of the provider class, should implement Alpha\Util\Code\Highlight\HighlightProviderInterface
66
+     * @param string $providerName The fully-qualified class name of the provider class, should implement Alpha\Util\Code\Highlight\HighlightProviderInterface
67 67
      *
68 68
      * @throws \Alpha\Exception\IllegalArguementException
69 69
      *
Please login to merge, or discard this patch.