zewadesign / framework

Zewa/Router.php

Doc Comments +18 added lines, -1 removed lines

@@ -122,6 +122,9 @@ 
     }
 
 
+    /**
+     * @param string $uri
+     */
     private function isURIClean($uri, $uriChunks)
     {
         if (!preg_match("/^[a-z0-9:_\/\.\[\]-]+$/i", $uri)
@@ -138,6 +141,10 @@ 
     }
 
     //@TODO add Security class.
+
+    /**
+     * @param string $data
+     */
     private function normalize($data)
     {
         if (is_numeric($data)) {
@@ -218,6 +225,9 @@ 
         return $normalizedURI;
     }
 
+    /**
+     * @param string $uri
+     */
     private function discoverRoute($uri)
     {
         $routes = $this->configuration->routes;
@@ -249,6 +259,7 @@ 
      * Normalize the $_SERVER vars for formatting the URI.
      *
      * @access public
+     * @param string $uri
      * @return string formatted/u/r/l
      */
     private function uri($uri)
@@ -307,6 +318,9 @@ 
         return array_merge($return, array_values($uriChunks));
     }
 
+    /**
+     * @param string $url
+     */
     private function addQueryString($url, $key, $value)
     {
         $url = preg_replace('/(.*)(\?|&)' . $key . '=[^&]+?(&)(.*)/i', '$1$2$4', $url . '&');
@@ -318,6 +332,9 @@ 
         }
     }
 
+    /**
+     * @param string $url
+     */
     private function removeQueryString($url, $key)
     {
         $url = preg_replace('/(.*)(\?|&)' . $key . '=[^&]+?(&)(.*)/i', '$1$2$4', $url . '&');
@@ -392,7 +409,7 @@ 
      * Set optional status header, and redirect to provided URL
      *
      * @access public
-     * @return bool
+     * @return false|null
      */
     public function redirect($url = '/', $status = null)
     {

Indentation +3 added lines, -3 removed lines

@@ -335,10 +335,10 @@ 
     {
         if (trim($_SERVER['REQUEST_URI']) === '/') {
             $url = $this->baseURL()
-                   . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
+                    . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
         } else {
             $url = $this->baseURL($this->uri)
-                   . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
+                    . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
         }
 
         if (!empty($params)) {
@@ -362,7 +362,7 @@ 
         if (is_null($this->baseURL)) {
             $self = $_SERVER['PHP_SELF'];
             $server = $_SERVER['HTTP_HOST']
-                      . rtrim(str_replace(strstr($self, 'index.php'), '', $self), '/');
+                        . rtrim(str_replace(strstr($self, 'index.php'), '', $self), '/');
 
             if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
                 || !empty($_SERVER['HTTP_X_FORWARDED_PROTO'])

Switch Indentation +23 added lines, -23 removed lines

@@ -410,29 +410,29 @@
         // push a status to the browser if necessary
         if ((int)$status > 0) {
             switch ($status) {
-            case '301':
-                $msg = '301 Moved Permanently';
-                break;
-            case '307':
-                $msg = '307 Temporary Redirect';
-                break;
-                // Using these below (except 302) would be an intentional misuse of the 'system'
-            case '401':
-                $msg = '401 Access Denied';
-                break;
-            case '403':
-                $msg = '403 Request Forbidden';
-                break;
-            case '404':
-                $msg = '404 Not Found';
-                break;
-            case '405':
-                $msg = '405 Method Not Allowed';
-                break;
-            case '302':
-            default:
-                $msg = '302 Found';
-                break; // temp redirect
+                case '301':
+                    $msg = '301 Moved Permanently';
+                    break;
+                case '307':
+                    $msg = '307 Temporary Redirect';
+                    break;
+                    // Using these below (except 302) would be an intentional misuse of the 'system'
+                case '401':
+                    $msg = '401 Access Denied';
+                    break;
+                case '403':
+                    $msg = '403 Request Forbidden';
+                    break;
+                case '404':
+                    $msg = '404 Not Found';
+                    break;
+                case '405':
+                    $msg = '405 Method Not Allowed';
+                    break;
+                case '302':
+                default:
+                    $msg = '302 Found';
+                    break; // temp redirect
             }
             if (isset($msg)) {
                 header('HTTP/1.1 ' . $msg);

Spacing +4 added lines, -4 removed lines

@@ -132,7 +132,7 @@ 
     {
         if (!preg_match("/^[a-z0-9:_\/\.\[\]-]+$/i", $uri)
             || array_filter(
-                $uriChunks, function ($uriChunk) {
+                $uriChunks, function($uriChunk) {
                     if (strpos($uriChunk, '__') !== false) {
                         return true;
                     }
@@ -216,7 +216,7 @@ 
 
         $normalizedURI = ltrim(preg_replace('/\?.*/', '', $normalizedURI), '/');
 
-        if (! empty($this->configuration->routes)) {
+        if (!empty($this->configuration->routes)) {
             $normalizedURI = $this->discoverRoute($normalizedURI);
         }
         
@@ -235,10 +235,10 @@ 
 
                 $uri = $reroute;
 
-                if (! empty($params)) {
+                if (!empty($params)) {
                     $pat = '/(\$\d+)/';
                     $uri = preg_replace_callback(
-                        $pat, function () use (&$params) {
+                        $pat, function() use (&$params) {
                             $first = $params[0];
                             array_shift($params);
                             return $first;

Zewa/SessionHandler.php

Doc Comments +3 added lines

@@ -162,6 +162,9 @@
 
     }
 
+    /**
+     * @param string $sessionId
+     */
     public function destroy($sessionId)
     {
         $success = false;

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
         ini_set('session.cookie_domain', $domain);
 
         if ($session_lifetime != '' && is_integer($session_lifetime)) {
-            ini_set('session.gc_maxlifetime', (int) $session_lifetime);
+            ini_set('session.gc_maxlifetime', (int)$session_lifetime);
         }
 
         if ($gc_probability != '' && is_integer($gc_probability)) {
@@ -77,7 +77,7 @@ 
         if ($interface !== 'file') {
             try {
                 //@TODO: database should be pulling an instance or DI.
-                $database = new Database();//App::getService('database')->fetchConnection();
+                $database = new Database(); //App::getService('database')->fetchConnection();
                 $this->dbh = $database->fetchConnection('default');
 
                 session_set_save_handler(
@@ -163,7 +163,7 @@ 
     public function destroy($sessionId)
     {
         $success = false;
-        $query = "DELETE FROM ". $this->tableName
+        $query = "DELETE FROM " . $this->tableName
             . " WHERE id = ?";
 
         $success = $this->dbh->prepare($query)
@@ -179,7 +179,7 @@ 
     public function gc()
     {
 
-        $query = "DELETE FROM ". $this->tableName
+        $query = "DELETE FROM " . $this->tableName
             . " WHERE session_expire < ?";
 
         return $this->dbh->prepare($query)
@@ -310,7 +310,7 @@ 
                 . ") ENGINE=InnoDB DEFAULT CHARSET=utf8";
 
             $this->dbh->prepare($query)->execute();
-        } catch(\PDOException $e) {
+        } catch (\PDOException $e) {
             print_r($e->getMessage());
         }
         die('test');

Zewa/View.php

Spacing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
         }
 
         foreach ($sheets as $sheet) {
-            $string .= '<link rel="stylesheet" href="' . $sheet .'">' . "\r\n";
+            $string .= '<link rel="stylesheet" href="' . $sheet . '">' . "\r\n";
         }
 
         return $string;

Doc Comments +4 added lines, -2 removed lines

@@ -90,8 +90,6 @@ 
      *
      * @access public
      *
-     * @param string $requestedView relative path for the view
-     * @param string $renderName    array of data to expose to view
      *
      * @throws \Exception when a view can not be found
      */
@@ -181,6 +179,10 @@ 
      * @return string processed content
      */
     //@TODO: come back and clean up this and the way the view receives stuff
+
+    /**
+     * @param string|boolean $file
+     */
     private function process($file)
     {
         ob_start();

Zewa/Request.php

Spacing +6 added lines, -6 removed lines

@@ -168,7 +168,7 @@ 
                 // iterate through all the entries
                 foreach ($this->flashdata as $variable => $data) {
                     // increment counter representing server requests
-                    $this->flashdata[$variable]['inc'] ++;
+                    $this->flashdata[$variable]['inc']++;
 
                     // if we're past the first server request
                     if ($this->flashdata[$variable]['inc'] > 1) {
@@ -342,9 +342,9 @@ 
 
             if (is_numeric($data)) {
                 if ((intval($data) === (int)trim($data, '-')) && strlen((string)(int)$data) === strlen($data)) {
-                    $data = (int) $data;
+                    $data = (int)$data;
                 } elseif ($data === (string)(float)$data) {
-                    $data = (float) $data;
+                    $data = (float)$data;
                 }
             } else {
  //                $data = $this->purifier->purify($data);
@@ -362,12 +362,12 @@ 
             $container = $name . 'Container';
             $container = $this->$container;
 
-            $argument = ! empty($arguments[0]) ? $arguments[0] : false;
+            $argument = !empty($arguments[0]) ? $arguments[0] : false;
 
             if ($argument === false && !empty($container)) {
                 return $container;
             }
-            if (! empty($container[$argument])) {
+            if (!empty($container[$argument])) {
                 if (!is_array($container[$argument])
                     && !is_object($container[$argument])
                     && strlen($container[$argument]) > 0
@@ -378,7 +378,7 @@ 
                 }
             }
 
-            return ! empty($arguments[1]) ? $arguments[1] : false;
+            return !empty($arguments[1]) ? $arguments[1] : false;
         }
 
         throw new Exception\FunctionException('Method ' . $name . ' does not exist.');

Zewa/ServiceManager.php

Spacing +4 added lines, -4 removed lines

@@ -16,15 +16,15 @@ 
      */
     public function __construct()
     {
-        $database = function () {
+        $database = function() {
             return new Database();
         };
 
-        $router = function () {
+        $router = function() {
             return new Router();
         };
 
-        $request = function () {
+        $request = function() {
             return new Request();
         };
 
@@ -35,7 +35,7 @@ 
 
     public function __get($property)
     {
-        if (! empty($this->services[$property])) {
+        if (!empty($this->services[$property])) {
             return $this->services[$property];
         }
         throw new Exception\LookupException('The service: ' . $property . ' hasn\'t been registered.');

Zewa/Database.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function establishConnection($name = 'default')
     {
         if ($this->configuration !== false) {
-            if (! empty($this->configuration->$name)) {
+            if (!empty($this->configuration->$name)) {
                 $dbConfig = $this->configuration->$name;
                 self::$dbh[$name] = new \PDO($dbConfig->dsn, $dbConfig->user, $dbConfig->pass);
                 self::$dbh[$name]->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);

Zewa/App.php

Doc Comments +7 added lines, -1 removed lines

@@ -214,6 +214,9 @@ 
         }
     }
 
+    /**
+     * @param string $service
+     */
     public function setService($service, $class)
     {
         if($this->services === null) {
@@ -225,6 +228,7 @@ 
 
     /**
      * @param mixed string with reference to config
+     * @param string $config
      * @return mixed bool or config values
      */
     public function getConfiguration($config = null)
@@ -342,7 +346,6 @@ 
      * Attach (or remove) multiple callbacks to an event and trigger those callbacks when that event is called.
      *
      * @param string $event    name
-     * @param mixed  $value    the optional value to pass to each callback
      * @param mixed  $callback the method or function to call - FALSE to remove all callbacks for event
      */
 
@@ -356,6 +359,9 @@ 
         }
     }
 
+    /**
+     * @param string $event
+     */
     public function callEvent($event, $method = false, $arguments = [])
     {
         if (isset(self::$events[$event])) {

Spacing +5 added lines, -5 removed lines

@@ -188,7 +188,7 @@ 
 
     private function prepareServices()
     {
-        if(isset($this->files['services'])) {
+        if (isset($this->files['services'])) {
             $services = include $this->files['services'];
             if ($services === false) {
                 $this->services = [];
@@ -202,7 +202,7 @@ 
 
     public function getService($service, $new = false, $options = [])
     {
-        if($this->services === null) {
+        if ($this->services === null) {
             $this->prepareServices();
         }
 
@@ -216,7 +216,7 @@ 
 
     public function setService($service, $class)
     {
-        if($this->services === null) {
+        if ($this->services === null) {
             $this->prepareServices();
         }
 
@@ -230,9 +230,9 @@ 
     public function getConfiguration($config = null)
     {
         if ($config !== null) {
-            if (! empty($this->configuration->$config)) {
+            if (!empty($this->configuration->$config)) {
                 return $this->configuration->$config;
-            } elseif(! empty($this->files{$config}) ) {
+            } elseif (!empty($this->files{$config})) {
 
                 $vars = include $this->files{$config};