alkemann / h2l

src/Route.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      * @param Closure|null $cb
      * @param array $parameters
      */
-    public function __construct(string $url, ?Closure $cb = null, array $parameters = [])
+    public function __construct(string $url, ? Closure $cb = null, array $parameters = [])
     {
         $this->url = $url;
         $this->callback = $cb;

src/data/Source.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
     public function query($query, array $params = []);
 
-    public function one(string $table, array $conditions, array $options = []):?array;
+    public function one(string $table, array $conditions, array $options = []): ? array;
 
     public function find(string $table, array $conditions, array $options = []);
 

src/data/MongoDB.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
         throw new \Exception("Query method is not implemented for MongDB");
     }
 
-    public function one(string $collection_name, array $conditions, array $options = []): ?array
+    public function one(string $collection_name, array $conditions, array $options = []): ? array
     {
         $collection = $this->collection($collection_name);
         $conditions = $this->idReplaceConditions($conditions);
@@ -129,7 +129,7 @@ 
         return $result->getModifiedCount();
     }
 
-    public function insert(string $collection, array $data, array $options = []): ?ObjectID
+    public function insert(string $collection, array $data, array $options = []): ? ObjectID
     {
         $collection = $this->collection($collection);
         $result = $collection->insertOne($data, $options);

src/data/Mysql.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
         return $result->fetchAll(PDO::FETCH_ASSOC);
     }
 
-    public function one(string $table, array $conditions, array $options = []): ?array
+    public function one(string $table, array $conditions, array $options = []): ? array
     {
         $result = $this->find($table, $conditions, $options);
         $result = iterator_to_array($result);
@@ -123,7 +123,7 @@ 
         if (empty($conditions)) {
             return "";
         }
-        $fun = function ($o, $v) {
+        $fun = function($o, $v) {
             return "{$o}{$v} = :c_{$v}";
         };
         $where = array_reduce(array_keys($conditions), $fun, "");
@@ -170,13 +170,13 @@ 
 
     private function data(array $data): string
     {
-        $fun = function ($o, $v) {
+        $fun = function($o, $v) {
             return "{$o}{$v} = :d_{$v}";
         };
         return array_reduce(array_keys($data), $fun, "");
     }
 
-    public function insert(string $table, array $data, array $options = []): ?int
+    public function insert(string $table, array $data, array $options = []): ? int
     {
         $keys = implode(', ', array_keys($data));
         $data_phs = ':d_' . implode(', :d_', array_keys($data));

src/Router.php

Spacing +3 added lines, -3 removed lines

@@ -62,12 +62,12 @@ 
         }
 
         // TODO cache of valid static routes, maybe with a try, catch, finally?
-        return new Route($url, function (Request $request) {
+        return new Route($url, function(Request $request) {
             return response\Page::fromRequest($request);
         });
     }
 
-    private static function matchDynamicRoute(string $url, string $method = Request::GET): ?Route
+    private static function matchDynamicRoute(string $url, string $method = Request::GET): ? Route
     {
         foreach (static::$routes[$method] as $route => $cb) {
             if ($route[0] !== substr($route, -1) || $route[0] !== static::$DELIMITER) {
@@ -80,7 +80,7 @@ 
 
             $parameters = array_filter(
                 $matches,
-                function ($v) {
+                function($v) {
                     return !is_int($v);
                 },
                 ARRAY_FILTER_USE_KEY

src/internals/debug/adapters/Html.php

Indentation +7 added lines, -7 removed lines

@@ -109,13 +109,13 @@ 
             case 'string' : $length = strlen($var); $var = '\'' . htmlentities($var) . '\''; break;
             case 'NULL' : return '<span class="empty">NULL</span>'; break;
         }
-		$ret = '<span class="value ' . $type .'">' . $var . '</span> ';
+        $ret = '<span class="value ' . $type .'">' . $var . '</span> ';
 
-		if ($type == 'string') {
-			$ret .= '<span class="type">string[' . $length . ']</span>';
-		} else {
-			$ret .= '<span class="type">' . $type . '</span>';
-		}
+        if ($type == 'string') {
+            $ret .= '<span class="type">string[' . $length . ']</span>';
+        } else {
+            $ret .= '<span class="type">' . $type . '</span>';
+        }
         return $ret;
     }
 
@@ -123,7 +123,7 @@ 
     {
         extract($location);
         $ret = "line: <span>$line</span> &nbsp;".
-               "file: <span>$file</span> &nbsp;";
+                "file: <span>$file</span> &nbsp;";
         $ret .= isset($class) ? "class: <span>$class</span> &nbsp;" :'';
         $ret .= isset($function) && $function != 'include' ? "function: <span>$function</span> &nbsp;" :'';
         return $ret;

Spacing +8 added lines, -8 removed lines

@@ -52,11 +52,11 @@ 
             $debug->current_depth--;
             return $ret . '<li><span class="empty"> -- Blacklisted Object Avoided -- </span></li></ul>';
         }
-        if (isset($debug->object_references[$hash]))  {
+        if (isset($debug->object_references[$hash])) {
             $debug->current_depth--;
             return $ret . '<li><span class="empty"> -- Object Recursion Avoided -- </span></li></ul>';
         }
-        if (in_array('object', $debug->options['avoid']))  {
+        if (in_array('object', $debug->options['avoid'])) {
             $debug->current_depth--;
             return $ret . '<li><span class="empty"> -- Object Type Avoided -- </span></li></ul>';
         }
@@ -76,7 +76,7 @@ 
         }
         $debug->current_depth--;
         if ($props == '') return $ret .= '<li><span class="empty"> -- No properties -- </span></li></ul>';
-        else  $ret .=  $props;
+        else  $ret .= $props;
         $ret .= '</ul>';
         return  $ret;
     }
@@ -109,7 +109,7 @@ 
             case 'string' : $length = strlen($var); $var = '\'' . htmlentities($var) . '\''; break;
             case 'NULL' : return '<span class="empty">NULL</span>'; break;
         }
-		$ret = '<span class="value ' . $type .'">' . $var . '</span> ';
+		$ret = '<span class="value ' . $type . '">' . $var . '</span> ';
 
 		if ($type == 'string') {
 			$ret .= '<span class="type">string[' . $length . ']</span>';
@@ -122,14 +122,14 @@ 
     public static function locationString(array $location) : string
     {
         extract($location);
-        $ret = "line: <span>$line</span> &nbsp;".
+        $ret = "line: <span>$line</span> &nbsp;" .
                "file: <span>$file</span> &nbsp;";
-        $ret .= isset($class) ? "class: <span>$class</span> &nbsp;" :'';
-        $ret .= isset($function) && $function != 'include' ? "function: <span>$function</span> &nbsp;" :'';
+        $ret .= isset($class) ? "class: <span>$class</span> &nbsp;" : '';
+        $ret .= isset($function) && $function != 'include' ? "function: <span>$function</span> &nbsp;" : '';
         return $ret;
     }
 
-    public static function top(array $outputs, ?string $key = null) : void
+    public static function top(array $outputs, ? string $key = null) : void
     {
             if (empty($outputs)) return;
             echo '<div id="debugger">';

src/internals/debug/Debug.php

Indentation +82 added lines, -82 removed lines

@@ -27,11 +27,11 @@ 
     public $options;
     public $output = array('<style type="text/css">@import url("/css/debug.css");</style>');
 
-	/**
-	 * Get the singleton instance
-	 *
-	 * @return alkemann\hl\debug\util\Debug
-	 */
+    /**
+     * Get the singleton instance
+     *
+     * @return alkemann\hl\debug\util\Debug
+     */
     public static function get_instance() : Debug
     {
         if (!static::$__instance) {
@@ -41,12 +41,12 @@ 
         return static::$__instance;
     }
 
-	/**
-	 * Dump
-	 *
-	 * @param mixed $var
-	 * @param array $options
-	 */
+    /**
+     * Dump
+     *
+     * @param mixed $var
+     * @param array $options
+     */
     public function dump($var, $options = array()) : void
     {
         $options += self::$defaults + array('split' => false, 'trace' => false);
@@ -62,76 +62,76 @@ 
         if ($options['split'] && is_array($var)) {
             $this->current_depth = 0;
             foreach ($var as $one) {
-				$dump = array_merge($dump, array($this->dump_it($one), ' - '));
-			}
-			$dump = array_slice($dump, 0, -1);
+                $dump = array_merge($dump, array($this->dump_it($one), ' - '));
+            }
+            $dump = array_slice($dump, 0, -1);
         } else
             $dump[] = $this->dump_it($var);
 
         switch ($mode) {
-			default :
-				$locString = \alkemann\h2l\internals\debug\adapters\Html::locationString($location);
-				$this->output[] = '<div class="debug-dump"><div class="debug-location">' . $locString . '</div>'.
-					'<div class="debug-content"> ' . implode("<br>\n", $dump) . '</div></div>';
-				break;
-		}
-		if ($options['echo']) {
-			$this->__out();
-		}
+            default :
+                $locString = \alkemann\h2l\internals\debug\adapters\Html::locationString($location);
+                $this->output[] = '<div class="debug-dump"><div class="debug-location">' . $locString . '</div>'.
+                    '<div class="debug-content"> ' . implode("<br>\n", $dump) . '</div></div>';
+                break;
+        }
+        if ($options['echo']) {
+            $this->__out();
+        }
     }
 
-	/**
-	 * Return output dump as array
-	 *
-	 * @param string $key
-	 * @return array
-	 */
-	public function array_out($key = null) : array
+    /**
+     * Return output dump as array
+     *
+     * @param string $key
+     * @return array
+     */
+    public function array_out($key = null) : array
     {
-		if (count($this->output) < 2 || ($key && !isset($this->output[$key]))) {
-			return [];
-		}
-		if ($key) {
-			return $this->output[$key];
-		}
-		array_shift($this->output);
-		return $this->output;
-	}
+        if (count($this->output) < 2 || ($key && !isset($this->output[$key]))) {
+            return [];
+        }
+        if ($key) {
+            return $this->output[$key];
+        }
+        array_shift($this->output);
+        return $this->output;
+    }
 
-	/**
-	 * Echo out stored debugging
-	 *
-	 * @param int $key
-	 */
-	public function out($key = null) : void
+    /**
+     * Echo out stored debugging
+     *
+     * @param int $key
+     */
+    public function out($key = null) : void
     {
-		if ($this->options['mode'] == 'Html') {
-			\alkemann\h2l\internals\debug\adapters\Html::top($this->output, $key);
-			return;
-		}
-		$this->__out($key);
-	}
+        if ($this->options['mode'] == 'Html') {
+            \alkemann\h2l\internals\debug\adapters\Html::top($this->output, $key);
+            return;
+        }
+        $this->__out($key);
+    }
 
-	private function __out($key = null) : void
+    private function __out($key = null) : void
     {
-		if ($key !== null) {
-			if (!isset($this->output[$key])) {
-				throw new Exception('DEBUG: Not that many outputs in buffer');
-			}
-			echo $this->output[$key];
-			return;
-		}
-		foreach ($this->output as $out) {
-			echo $out;
-		}
-		$this->output = array();
-	}
+        if ($key !== null) {
+            if (!isset($this->output[$key])) {
+                throw new Exception('DEBUG: Not that many outputs in buffer');
+            }
+            echo $this->output[$key];
+            return;
+        }
+        foreach ($this->output as $out) {
+            echo $out;
+        }
+        $this->output = array();
+    }
 
-	/**
-	 * Grab global defines, will start at 'FIRST_APP_CONSTANT', if defined
-	 *
-	 * @return array
-	 */
+    /**
+     * Grab global defines, will start at 'FIRST_APP_CONSTANT', if defined
+     *
+     * @return array
+     */
     public function defines() : array
     {
         $defines = get_defined_constants();
@@ -145,15 +145,15 @@ 
         return $ret;
     }
 
-	/**
-	 * Send a variable to the adapter and return it's formated output
-	 *
-	 * @param mixed $var
-	 * @return string
-	 */
+    /**
+     * Send a variable to the adapter and return it's formated output
+     *
+     * @param mixed $var
+     * @return string
+     */
     public function dump_it($var) : string
     {
-		$adapter = '\alkemann\h2l\internals\debug\adapters\\'. $this->options['mode'];
+        $adapter = '\alkemann\h2l\internals\debug\adapters\\'. $this->options['mode'];
         if (is_array($var))
             return $adapter::dump_array($var, $this);
         elseif (is_object($var))
@@ -162,12 +162,12 @@ 
             return $adapter::dump_other($var);
     }
 
-	/**
-	 * Create an array that describes the location of the debug call
-	 *
-	 * @param string $trace
-	 * @return array
-	 */
+    /**
+     * Create an array that describes the location of the debug call
+     *
+     * @param string $trace
+     * @return array
+     */
     public function location($trace) : array
     {
         $root = substr($_SERVER['DOCUMENT_ROOT'], 0 , strlen(static::$defaults['docroot']) * -1);

Spacing +16 added lines, -16 removed lines

@@ -71,7 +71,7 @@ 
         switch ($mode) {
 			default :
 				$locString = \alkemann\h2l\internals\debug\adapters\Html::locationString($location);
-				$this->output[] = '<div class="debug-dump"><div class="debug-location">' . $locString . '</div>'.
+				$this->output[] = '<div class="debug-dump"><div class="debug-location">' . $locString . '</div>' .
 					'<div class="debug-content"> ' . implode("<br>\n", $dump) . '</div></div>';
 				break;
 		}
@@ -139,8 +139,8 @@ 
         while ($def = array_slice($defines, $offset--, 1)) {
             $key = key($def);
             $value = current($def);
-            if ($key  == 'FIRST_APP_CONSTANT') break;
-            $ret[$key ] = $value;
+            if ($key == 'FIRST_APP_CONSTANT') break;
+            $ret[$key] = $value;
         }
         return $ret;
     }
@@ -153,7 +153,7 @@ 
 	 */
     public function dump_it($var) : string
     {
-		$adapter = '\alkemann\h2l\internals\debug\adapters\\'. $this->options['mode'];
+		$adapter = '\alkemann\h2l\internals\debug\adapters\\' . $this->options['mode'];
         if (is_array($var))
             return $adapter::dump_array($var, $this);
         elseif (is_object($var))
@@ -170,7 +170,7 @@ 
 	 */
     public function location($trace) : array
     {
-        $root = substr($_SERVER['DOCUMENT_ROOT'], 0 , strlen(static::$defaults['docroot']) * -1);
+        $root = substr($_SERVER['DOCUMENT_ROOT'], 0, strlen(static::$defaults['docroot']) * -1);
         $file = implode('/', array_diff(explode('/', $trace[0]['file']), explode('/', $root)));
         $ret = array(
             'file' => $file,
@@ -183,7 +183,7 @@ 
 
     public function trace() : array
     {
-        $root = substr($_SERVER['DOCUMENT_ROOT'], 0 , strlen(static::$defaults['docroot']) * -1);
+        $root = substr($_SERVER['DOCUMENT_ROOT'], 0, strlen(static::$defaults['docroot']) * -1);
         $trace = debug_backtrace();
         array_unshift($trace, array());
         $arr = array();
@@ -194,8 +194,8 @@ 
                 $arr[$k]['file'] = $file;
             }
             if (isset($one['line'])) $arr[$k]['line'] = $one['line'];
-            if (isset($one['class'])) $arr[$k-1]['class'] = $one['class'];
-            if (isset($one['function'])) $arr[$k-1]['function'] = $one['function'];
+            if (isset($one['class'])) $arr[$k - 1]['class'] = $one['class'];
+            if (isset($one['function'])) $arr[$k - 1]['function'] = $one['function'];
         }
         array_shift($arr);
         array_shift($arr);
@@ -209,13 +209,13 @@ 
             $obj = $var;
         } else {
             if (!class_exists($var)) {
-                throw new \Exception('Class ['.$var.'] doesn\'t exist');
+                throw new \Exception('Class [' . $var . '] doesn\'t exist');
             }
             $class = $var;
             try {
                 $obj = new $class();
             } catch (\Exception $e) {
-                throw new \Exception('Debug::api could not instantiate ['.$var.'], send it an object.');
+                throw new \Exception('Debug::api could not instantiate [' . $var . '], send it an object.');
             }
         }
         $reflection = new \ReflectionObject($obj);
@@ -234,7 +234,7 @@ 
                     if (is_object($value)) {
                         $value = get_class($value);
                     } elseif (is_array($value)) {
-                        $value = 'array['.count($value).']';
+                        $value = 'array[' . count($value) . ']';
                     }
 
                     $properties[$access][$property] = compact('value', 'type');
@@ -263,12 +263,12 @@ 
                     }*/
                     $method_name = $refMethod->getName();
 
-                    $string = $access .' function '.$method_name.'(';
+                    $string = $access . ' function ' . $method_name . '(';
                     $paramString = '';
                     foreach ($params as $p) {
-                        $paramString .= '$'.$p.', ';
+                        $paramString .= '$' . $p . ', ';
                     }
-                    $paramString  = substr($paramString,0,-2);
+                    $paramString = substr($paramString, 0, -2);
                     $string .= $paramString;
                     $string .= ')';
 
@@ -288,7 +288,7 @@ 
                             $info = implode(' ', $paramArr);
                             $tags['param'][$name] = compact('type', 'info');
                         } else {
-                            $tags[$tagArr[0]] = isset($tagArr[1])?$tagArr[1]:'';
+                            $tags[$tagArr[0]] = isset($tagArr[1]) ? $tagArr[1] : '';
                         }
                     }
 
@@ -297,7 +297,7 @@ 
                 }
         }
 
-        return compact('properties', 'constants' ,'methods');
+        return compact('properties', 'constants', 'methods');
     }
 
 }

src/internals/functions.php

Indentation +11 added lines, -11 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
-  * Global convenience methods
-  */
+ * Global convenience methods
+ */
 
 use alkemann\h2l\internals\debug\Debug;
 
@@ -58,12 +58,12 @@ 
         $split = false;
         $args = $args[0];
     }
-	$echo = true;
+    $echo = true;
     @ob_end_clean();
     $debug->dump($args, compact('trace', 'split', 'echo'));
-	if (!empty($debug->output)) {
-		dout();
-	}
+    if (!empty($debug->output)) {
+        dout();
+    }
     die('<div style="margin-top: 25px;font-size: 10px;color: #500;">-Debug die-</div>');
 }
 
@@ -185,10 +185,10 @@ 
 function dout($key = null, $incStyle = true)
 {
     $debug = Debug::get_instance();
-	if ($key && $incStyle) {
-		$debug->out(0);
-	}
-	$debug->out($key);
+    if ($key && $incStyle) {
+        $debug->out(0);
+    }
+    $debug->out($key);
 }
 
 /**
@@ -202,5 +202,5 @@ 
 function daout($key = null)
 {
     $debug = Debug::get_instance();
-	return $debug->array_out($key);
+    return $debug->array_out($key);
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     @ob_end_clean();
     $debug_trace = $debug->trace();
     foreach ($debug_trace as $t) {
-        @$traced[] = (empty($t['class'])?$t['file']:$t['class']).'::'.$t['function'].'::'.$t['line'];
+        @$traced[] = (empty($t['class']) ? $t['file'] : $t['class']) . '::' . $t['function'] . '::' . $t['line'];
     }
     $args[] = $traced;
     $debug->dump($args, compact('trace', 'split'));
@@ -77,7 +77,7 @@ 
     @ob_end_clean();
     $debug_trace = $debug->trace();
     foreach ($debug_trace as $t) {
-        @$traced[] = (empty($t['class'])?$t['file']:$t['class']).'::'.$t['function'].'::'.$t['line'];
+        @$traced[] = (empty($t['class']) ? $t['file'] : $t['class']) . '::' . $t['function'] . '::' . $t['line'];
     }
     $args[] = $traced;
     $debug->dump($args, compact('trace', 'split', 'echo'));

src/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     if (Environment::get('debug')) {
         header("Content-type: text/html");
         echo '<h1 style="color:red;">' . $message . '</h1>';
-        echo '<h3>' . $file. ' :: ' . $line . '</h3>';
+        echo '<h3>' . $file . ' :: ' . $line . '</h3>';
         d($meta);
         die();
     } else {