alphadevx / alpha

Alpha/Controller/ActiveRecordController.php

Doc Comments +4 added lines, -4 removed lines

@@ -161,7 +161,7 @@ 
      * @throws Alpha\Exception\ResourceNotFoundException
      * @throws Alpha\Exception\IllegalArguementException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      */
@@ -348,7 +348,7 @@ 
      * @throws Alpha\Exception\IllegalArguementException
      * @throws Alpha\Exception\SecurityException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      *
@@ -438,7 +438,7 @@ 
      * @throws Alpha\Exception\IllegalArguementException
      * @throws Alpha\Exception\SecurityException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      *
@@ -532,7 +532,7 @@ 
      * @throws Alpha\Exception\IllegalArguementException
      * @throws Alpha\Exception\SecurityException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      */

Spacing +5 added lines, -5 removed lines

@@ -690,7 +690,7 @@ 
         $body = '';
 
         // the index of the last record displayed on this page
-        $last = $this->start + $config->get('app.list.page.amount');
+        $last = $this->start+$config->get('app.list.page.amount');
 
         // ensure that the last index never overruns the total record count
         if ($last > $this->recordCount) {
@@ -710,9 +710,9 @@ 
         if ($this->start > 0) {
             // handle secure URLs
             if ($this->request->getParam('token', null) != null) {
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start - $this->limit).'&limit='.$this->limit).'">&lt;&lt;-Previous</a></li>';
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start-$this->limit).'&limit='.$this->limit).'">&lt;&lt;-Previous</a></li>';
             } else {
-                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start - $this->limit).'/'.$this->limit.'">&lt;&lt;-Previous</a></li>';
+                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start-$this->limit).'/'.$this->limit.'">&lt;&lt;-Previous</a></li>';
             }
         } elseif ($this->recordCount > $this->limit) {
             $body .= '<li class="disabled"><a href="#">&lt;&lt;-Previous</a></li>';
@@ -742,9 +742,9 @@ 
         if ($this->recordCount > $last) {
             // handle secure URLs
             if ($this->request->getParam('token', null) != null) {
-                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start + $this->limit).'&limit='.$this->limit).'">Next-&gt;&gt;</a></li>';
+                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start+$this->limit).'&limit='.$this->limit).'">Next-&gt;&gt;</a></li>';
             } else {
-                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start + $this->limit.'/'.$this->limit).
+                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start+$this->limit.'/'.$this->limit).
                     '">Next-&gt;&gt;</a></li>';
             }
         } elseif ($this->recordCount > $this->limit) {

Alpha/Controller/ArticleController.php

Doc Comments +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
      *
      * @param Alpha\Util\Http\Request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @throws Alpha\Exception\ResourceNotFoundException
      *
@@ -311,7 +311,7 @@ 
      *
      * @param Alpha\Util\Http\Request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      */
@@ -425,7 +425,7 @@ 
      *
      * @param Alpha\Util\Http\Request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      */

Alpha/Controller/CacheController.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
      *
      * @throws Alpha\Exception\IllegalArguementException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      */
@@ -185,7 +185,7 @@ 
      * @throws Alpha\Exception\SecurityException
      * @throws Alpha\Exception\IllegalArguementException
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      */

Alpha/Controller/Controller.php

Doc Comments +3 added lines, -3 removed lines

@@ -999,7 +999,7 @@ 
     /**
      * Method to return an access error for trespassing users.  HTTP response header code will be 403.
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      */
@@ -1179,7 +1179,7 @@ 
     /**
      * Generates the two security fields to prevent remote form processing.
      *
-     * @return array An array containing the two fields
+     * @return string[] An array containing the two fields
      *
      * @since 1.0
      */
@@ -1531,7 +1531,7 @@ 
      *
      * @param Alpha\Util\Http\Request $request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 2.0
      */

Spacing +9 added lines, -9 removed lines

@@ -511,19 +511,19 @@ 
             }
             // found the current job
             if ($this->name == $jobs[$i]) {
-                if (isset($jobs[$i - 1])) {
+                if (isset($jobs[$i-1])) {
                     // set the previous job if it exists
-                    $this->previousJob = $jobs[$i - 1];
+                    $this->previousJob = $jobs[$i-1];
                     self::$logger->debug('Previous job ['.$this->previousJob.']');
                 }
-                if (isset($jobs[$i + 1])) {
+                if (isset($jobs[$i+1])) {
                     // set the next job if it exists
-                    $this->nextJob = $jobs[$i + 1];
+                    $this->nextJob = $jobs[$i+1];
                     self::$logger->debug('Next job ['.$this->nextJob.']');
                 }
             }
             // the last job in the sequence
-            if ($i == ($numOfJobs - 1)) {
+            if ($i == ($numOfJobs-1)) {
                 $this->lastJob = $jobs[$i];
             }
         }
@@ -687,9 +687,9 @@ 
             $this->unitEndTime->getYear()
             );
 
-        self::$logger->debug('<<getUnitDuration ['.$intEndTime - $intStartTime.']');
+        self::$logger->debug('<<getUnitDuration ['.$intEndTime-$intStartTime.']');
 
-        return $intEndTime - $intStartTime;
+        return $intEndTime-$intStartTime;
     }
 
     /**
@@ -1159,7 +1159,7 @@ 
              */
 
             // the server hostname + today's date less 1 hour (i.e. yesterday where time is < 1:00AM)
-            $var1 = base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time() - 3600))));
+            $var1 = base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time()-3600))));
             // the server's IP plus $var1
             $var2 = base64_encode(SecurityUtils::encrypt($ip.$var1));
 
@@ -1505,7 +1505,7 @@ 
      */
     public function doOPTIONS($request)
     {
-        $HTTPMethods = array('HEAD','GET','POST','PUT','PATCH','DELETE','OPTIONS');
+        $HTTPMethods = array('HEAD', 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS');
         $supported = array();
 
         foreach ($HTTPMethods as $HTTPMethod) {

Alpha/Controller/ControllerInterface.php

Doc Comments +5 added lines, -6 removed lines

@@ -62,37 +62,36 @@ 
     /**
      * Handles GET HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
+     * @return \Alpha\Util\Http\Response|null
      */
     public function doGET($params);
 
     /**
      * Handles POST HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
+     * @return \Alpha\Util\Http\Response|null
      */
     public function doPOST($params);
 
     /**
      * Handles PUT HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
+     * @return \Alpha\Util\Http\Response
      */
     public function doPUT($params);
 
     /**
      * Handles PATCH HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
@@ -102,20 +101,20 @@ 
     /**
      * Handles DELETE HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
+     * @return \Alpha\Util\Http\Response
      */
     public function doDELETE($params);
 
     /**
      * Handles OPTIONS HTTP requests.
      *
-     * @param Alpha\Util\Http\Request $request
      *
      * @since Alpha\Util\Http\Response
      * @since 1.0
+     * @return \Alpha\Util\Http\Response
      */
     public function doOPTIONS($params);
 }

Alpha/Controller/DEnumController.php

Doc Comments +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
      *
      * @param Alpha\Util\Http\Request $request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      */
@@ -180,7 +180,7 @@ 
      *
      * @param Alpha\Util\Http\Request $request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @throws Alpha\Exception\SecurityException
      *

Alpha/Controller/ExcelController.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
      *
      * @param Alpha\Util\Http\Request $request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @throws Alpha\Exception\ResourceNotFoundException
      *

Alpha/Controller/FeedController.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
      *
      * @param Alpha\Util\Http\Request $request
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @since 1.0
      *

Alpha/Controller/Front/FrontController.php

Doc Comments +3 added lines, -3 removed lines

@@ -551,7 +551,7 @@ 
      *
      * @throws Alpha\Exception\IllegalArguementException
      *
-     * @return Alpha\Controller\Front\FrontController
+     * @return FrontController
      *
      * @since 2.0
      */
@@ -573,7 +573,7 @@ 
      * @param string $param        The param name (as defined on the route between {} braces)
      * @param mixed  $defaultValue The value to use
      *
-     * @return Alpha\Controller\Front\FrontController
+     * @return FrontController
      *
      * @since 2.0
      */
@@ -637,7 +637,7 @@ 
      *
      * @param Alpha\Util\Http\Request $request The request to process
      *
-     * @return Alpha\Util\Http\Response
+     * @return Response
      *
      * @throws Alpha\Exception\ResourceNotFoundException
      * @throws Alpha\Exception\ResourceNotAllowedException

Indentation +1 added lines, -1 removed lines

@@ -615,7 +615,7 @@
                 }
             }
 
-             // route URIs with params missing (will attempt to layer on defaults later on in Request class)
+                // route URIs with params missing (will attempt to layer on defaults later on in Request class)
             foreach ($this->routes as $route => $callback) {
                 $pattern = '#^'.$route.'$#s';
                 $pattern = preg_replace('#\/\{\S+\}#', '\/?', $pattern);

Spacing +26 added lines, -26 removed lines

@@ -175,145 +175,145 @@ 
             throw new BadRequestException('Request character encoding does not match expected UTF-8');
         }
 
-        $this->addRoute('/', function ($request) {
+        $this->addRoute('/', function($request) {
             $controller = new IndexController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/a/{title}/{view}', function ($request) {
+        $this->addRoute('/a/{title}/{view}', function($request) {
             $controller = new ArticleController();
 
             return $controller->process($request);
         })->value('title', null)->value('view', 'detailed');
 
-        $this->addRoute('/articles/{start}/{limit}', function ($request) {
+        $this->addRoute('/articles/{start}/{limit}', function($request) {
             $controller = new ArticleController();
 
             return $controller->process($request);
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
 
-        $this->addRoute('/attach/{articleOID}/{filename}', function ($request) {
+        $this->addRoute('/attach/{articleOID}/{filename}', function($request) {
             $controller = new AttachmentController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/cache', function ($request) {
+        $this->addRoute('/cache', function($request) {
             $controller = new CacheController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/denum/{denumOID}', function ($request) {
+        $this->addRoute('/denum/{denumOID}', function($request) {
             $controller = new DEnumController();
 
             return $controller->process($request);
         })->value('denumOID', null);
 
-        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordOID}', function ($request) {
+        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordOID}', function($request) {
             $controller = new ExcelController();
 
             return $controller->process($request);
         })->value('ActiveRecordOID', null);
 
-        $this->addRoute('/feed/{ActiveRecordType}/{type}', function ($request) {
+        $this->addRoute('/feed/{ActiveRecordType}/{type}', function($request) {
             $controller = new FeedController();
 
             return $controller->process($request);
         })->value('type', 'Atom');
 
-        $this->addRoute('/gensecure', function ($request) {
+        $this->addRoute('/gensecure', function($request) {
             $controller = new GenSecureQueryStringController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function ($request) {
+        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function($request) {
             $controller = new ImageController();
 
             return $controller->process($request);
         })->value('var1', null)->value('var2', null);
 
-        $this->addRoute('/listactiverecords', function ($request) {
+        $this->addRoute('/listactiverecords', function($request) {
             $controller = new ListActiveRecordsController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/log/{logPath}', function ($request) {
+        $this->addRoute('/log/{logPath}', function($request) {
             $controller = new LogController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/login', function ($request) {
+        $this->addRoute('/login', function($request) {
             $controller = new LoginController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/logout', function ($request) {
+        $this->addRoute('/logout', function($request) {
             $controller = new LogoutController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/metric', function ($request) {
+        $this->addRoute('/metric', function($request) {
             $controller = new MetricController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/recordselector/12m/{ActiveRecordOID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function ($request) {
+        $this->addRoute('/recordselector/12m/{ActiveRecordOID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function($request) {
             $controller = new RecordSelectorController();
 
             return $controller->process($request);
         })->value('relationType', 'ONE-TO-MANY');
 
-        $this->addRoute('/recordselector/m2m/{ActiveRecordOID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupOIDs}/{relationType}', function ($request) {
+        $this->addRoute('/recordselector/m2m/{ActiveRecordOID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupOIDs}/{relationType}', function($request) {
             $controller = new RecordSelectorController();
 
             return $controller->process($request);
         })->value('relationType', 'MANY-TO-MANY');
 
-        $this->addRoute('/search/{query}/{start}/{limit}', function ($request) {
+        $this->addRoute('/search/{query}/{start}/{limit}', function($request) {
             $controller = new SearchController();
 
             return $controller->process($request);
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
 
-        $this->addRoute('/sequence/{start}/{limit}', function ($request) {
+        $this->addRoute('/sequence/{start}/{limit}', function($request) {
             $controller = new SequenceController();
 
             return $controller->process($request);
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
 
-        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordOID}', function ($request) {
+        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordOID}', function($request) {
             $controller = new TagController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/install', function ($request) {
+        $this->addRoute('/install', function($request) {
             $controller = new InstallController();
 
             return $controller->process($request);
         });
 
-        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordOID}/{view}', function ($request) {
+        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordOID}/{view}', function($request) {
             $controller = new ActiveRecordController();
 
             return $controller->process($request);
         })->value('ActiveRecordOID', null)->value('view', 'detailed');
 
-        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function ($request) {
+        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function($request) {
             $controller = new ActiveRecordController();
 
             return $controller->process($request);
         })->value('start', 0)->value('limit', $config->get('app.list.page.amount'));
 
-        $this->addRoute('/tk/{token}', function ($request) {
+        $this->addRoute('/tk/{token}', function($request) {
             $params = self::getDecodeQueryParams($request->getParam('token'));
 
             if (isset($params['act'])) {
@@ -340,7 +340,7 @@ 
             return new Response(404, 'Resource not found');
         });
 
-        $this->addRoute('/alpha/service', function ($request) {
+        $this->addRoute('/alpha/service', function($request) {
             $controller = new LoginController();
             $controller->setUnitOfWork(array('Alpha\Controller\LoginController', 'Alpha\Controller\ListActiveRecordsController'));
 
@@ -487,7 +487,7 @@ 
      */
     private static function multipleExplode($string, $delimiters = array())
     {
-        $mainDelim = $delimiters[count($delimiters) - 1];
+        $mainDelim = $delimiters[count($delimiters)-1];
 
         array_pop($delimiters);