zewadesign / framework

Zewa/Router.php

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

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

Doc Comments +20 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
      *
      * Safe: a-z, 0-9, :, _, [, ], +
      *
-     * @param $uri
+     * @param string $uri
      * @param $uriChunks
      * @return bool
      */
@@ -152,6 +152,10 @@ 
         if (!preg_match("/^[a-z0-9:_\/\.\[\]-]+$/i", $uri)
             || array_filter(
                 $uriChunks,
+
+                /**
+                 * @param string $uriChunk
+                 */
                 function ($uriChunk) {
                     if (strpos($uriChunk, '__') !== false) {
                         return true;
@@ -166,6 +170,10 @@ 
     }
 
     //@TODO add Security class.
+
+    /**
+     * @param string $data
+     */
     private function normalize($data)
     {
         if (is_numeric($data)) {
@@ -242,6 +250,9 @@ 
         return $normalizedURI;
     }
 
+    /**
+     * @param string $uri
+     */
     private function discoverRoute($uri)
     {
         $routes = $this->routes;
@@ -274,7 +285,7 @@ 
     /**
      * Normalize the $_SERVER vars for formatting the URI.
      *
-     * @param $uri
+     * @param string $uri
      * @access public
      * @return string formatted/u/r/l
      */
@@ -329,6 +340,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 . '&');
@@ -340,6 +354,9 @@ 
         }
     }
 
+    /**
+     * @param string $url
+     */
     private function removeQueryString($url, $key)
     {
         $url = preg_replace('/(.*)(\?|&)' . $key . '=[^&]+?(&)(.*)/i', '$1$2$4', $url . '&');
@@ -411,7 +428,7 @@ 
      * Set optional status header, and redirect to provided URL
      *
      * @access public
-     * @return bool
+     * @return false|null
      */
     public function redirect($url = '/', $status = null)
     {

Zewa/Request.php

Spacing +5 added lines, -5 removed lines

@@ -172,7 +172,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) {
@@ -348,7 +348,7 @@ 
                 //@TODO this will not accept all float values, this validates /against/ syntax
 
                 if (($int === (int)trim($data, '-')) && strlen((string)(int)$data) === strlen($data)) {
-                    $data = (int) $data;
+                    $data = (int)$data;
                 } elseif ($int !== $float && preg_match($re, $data) === 1) {
                     $data = floatval($data);
                 }
@@ -368,12 +368,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
@@ -384,7 +384,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/View.php

Doc Comments +7 added lines

@@ -200,6 +200,9 @@ 
         return false;
     }
 
+    /**
+     * @param string|boolean $layout
+     */
     public function setLayout($layout)
     {
         if ($layout === false) {
@@ -241,6 +244,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 +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 
             $this->view = $return = $this->process($view);
 
-            if (! is_null($this->layout)) {
+            if (!is_null($this->layout)) {
                 $return = $this->process($this->layout);
             }
 
@@ -142,7 +142,7 @@ 
                 $this->view = $this->process($this->view);
             }
 
-            if (! is_null($this->layout)) {
+            if (!is_null($this->layout)) {
                 return $this->process($this->layout);
             } else {
                 return $this->view;
@@ -272,7 +272,7 @@ 
         }
 
         foreach ($this->queuedCSS as $sheet) {
-            $string .= '<link rel="stylesheet" href="' . $sheet .'">' . "\r\n";
+            $string .= '<link rel="stylesheet" href="' . $sheet . '">' . "\r\n";
         }
 
         return $string;

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 namespace Zewa;
 
-use Zewa\Interfaces\ContainerInterface;
-
 /**
  * View management
  *

Zewa/DIContainer.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
         // If there is no constructor, there is no
         // dependencies, which means that our job is done.
-        if (! $constructor) {
+        if (!$constructor) {
             $dependency = new $class;
             if ($share === true) {
                 $this->dependencies[$class] = $dependency;

Zewa/App.php

Doc Comments +3 added lines, -1 removed lines

@@ -172,7 +172,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
      */
 
@@ -186,6 +185,9 @@ 
         }
     }
 
+    /**
+     * @param string $event
+     */
     public function callEvent($event, $method = false, $arguments = [])
     {
         if (isset(self::$events[$event])) {

Zewa/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Zewa;
 
@@ -133,7 +133,7 @@ 
         $result = [];
 
         foreach ($this->collection as $key => $item) {
-            if (! $func($key, $item)) {
+            if (!$func($key, $item)) {
                 $result[$key] = $item;
             }
         }