zewadesign / framework

Zewa/App.php

Doc Comments +9 added lines, -1 removed lines

@@ -170,6 +170,9 @@ 
         $this->class = '\\App\\Modules\\' . $this->module . '\\Controllers\\' . ucfirst($this->controller);
     }
 
+    /**
+     * @param string $service
+     */
     public static function getService($service, $new = false, $options = [])
     {
         if ($new === false) {
@@ -180,6 +183,9 @@ 
         }
     }
 
+    /**
+     * @param string $service
+     */
     public static function setService($service, $class)
     {
         self::$services->$service = $class;
@@ -329,7 +335,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
      */
 
@@ -344,6 +349,9 @@ 
 
     }
 
+    /**
+     * @param string $event
+     */
     public function callEvent($event, $method = false, $arguments = [])
     {
         if (isset(self::$events[$event])) {

Spacing +3 added lines, -3 removed lines

@@ -174,7 +174,7 @@ 
     {
         if ($new === false) {
             return self::$services->$service;
-        } elseif ($new === true || empty ( self::$services->$service )) {
+        } elseif ($new === true || empty (self::$services->$service)) {
             self::$services->$service = call_user_func_array(self::$services->$service, $options);
             return self::$services->$service;
         }
@@ -192,7 +192,7 @@ 
     public function getConfiguration($config = null)
     {
         if ($config !== null) {
-            if (! empty ( $this->configuration->$config )) {
+            if (!empty ($this->configuration->$config)) {
                 return $this->configuration->$config;
             }
 
@@ -212,7 +212,7 @@ 
      */
     public function setConfiguration($config = null, $configObject = null)
     {
-        if ($config !== null && $configObject !== null && !empty( $configObject )) {
+        if ($config !== null && $configObject !== null && !empty($configObject)) {
             $this->configuration->$config = $configObject;
             return true;
         } elseif ($config === null && $configObject === null) {

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'])

Spacing +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
     private function isURIClean($uri, $uriChunks)
     {
         if (!preg_match("/^[a-z0-9:_\/\.\[\]-]+$/i", $uri)
-            || array_filter($uriChunks, function ($uriChunk) {
+            || array_filter($uriChunks, function($uriChunk) {
                 if (strpos($uriChunk, '__') !== false) {
                     return true;
                 }
@@ -211,7 +211,7 @@ 
 
         $normalizedURI = ltrim(preg_replace('/\?.*/', '', $normalizedURI), '/');
 
-        if (! empty ( $this->configuration->routes )) {
+        if (!empty ($this->configuration->routes)) {
             $normalizedURI = $this->discoverRoute($normalizedURI);
         }
         
@@ -230,9 +230,9 @@ 
 
                 $uri = $reroute;
 
-                if (! empty ( $params )) {
+                if (!empty ($params)) {
                     $pat = '/(\$\d+)/';
-                    $uri = preg_replace_callback($pat, function () use (&$params) {
+                    $uri = preg_replace_callback($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 +4 added lines, -4 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)) {
@@ -78,7 +78,7 @@ 
 
         if ($interface !== 'file') {
             try {
-                $database = new Database();//App::getService('database')->fetchConnection();
+                $database = new Database(); //App::getService('database')->fetchConnection();
                 $this->dbh = $database->fetchConnection('default');
 
                 session_set_save_handler(
@@ -165,7 +165,7 @@ 
     public function destroy($sessionId)
     {
         $success = false;
-        $query = "DELETE FROM ". $this->tableName
+        $query = "DELETE FROM " . $this->tableName
             . " WHERE id = ?";
 
         $success = $this->dbh->prepare($query)
@@ -181,7 +181,7 @@ 
     public function gc()
     {
 
-        $query = "DELETE FROM ". $this->tableName
+        $query = "DELETE FROM " . $this->tableName
             . " WHERE session_expire < ?";
 
         return $this->dbh->prepare($query)

Zewa/View.php

Doc Comments +4 added lines, -2 removed lines

@@ -89,8 +89,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
      */
@@ -185,6 +183,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();

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;

Zewa/Request.php

Indentation +10 added lines, -10 removed lines

@@ -327,13 +327,13 @@ 
             $data = $new;
         } else {
             $data = trim($data);
- //            if (function_exists('iconv') && function_exists('mb_detect_encoding')) {
- //                $current_encoding = mb_detect_encoding($data);
- //
- //                if ($current_encoding != 'UTF-8' && $current_encoding != 'UTF-16') {
- //                    $data = iconv($current_encoding, 'UTF-8', $data);
- //                }
- //            }
+    //            if (function_exists('iconv') && function_exists('mb_detect_encoding')) {
+    //                $current_encoding = mb_detect_encoding($data);
+    //
+    //                if ($current_encoding != 'UTF-8' && $current_encoding != 'UTF-16') {
+    //                    $data = iconv($current_encoding, 'UTF-8', $data);
+    //                }
+    //            }
             //Global XXS?
             //we need to review this.
             if (function_exists('iconv') && function_exists('mb_detect_encoding')) {
@@ -343,10 +343,10 @@ 
                     $data = iconv($current_encoding, 'UTF-8', $data);
                 }
             }
- //            Global XXS?
+    //            Global XXS?
             // This is not sanitary.  FILTER_SANITIZE_STRING doesn't do much.
 
- //            $data = filter_var($data, FILTER_SANITIZE_STRING);
+    //            $data = filter_var($data, FILTER_SANITIZE_STRING);
 
             if (is_numeric($data)) {
                 if ((intval($data) === (int)trim($data, '-')) && strlen((string)(int)$data) === strlen($data)) {
@@ -355,7 +355,7 @@ 
                     $data = (float) $data;
                 }
             } else {
- //                $data = $this->purifier->purify($data);
+    //                $data = $this->purifier->purify($data);
             }
         }
 

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) {
@@ -350,9 +350,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);
@@ -370,12 +370,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
@@ -386,7 +386,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/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/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.');