XaBerr / JATE

dist/jate.php

Indentation +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@
 <?php
   if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+	$GLOBALS["JATEPath"] = [];
   $commonLocations = [
-      "bower_components/JATE/dist/"
-    , "vendor/xaberr/jate/dist/"
-    , "../../dist/"
-    , "../dist/"
-    , dirname(__FILE__)."/"
+	  "bower_components/JATE/dist/"
+	, "vendor/xaberr/jate/dist/"
+	, "../../dist/"
+	, "../dist/"
+	, dirname(__FILE__)."/"
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
-      array_push($GLOBALS["JATEPath"], $path);
-      require_once("${path}jate/coreEngine.php");
-      $jSuccess = true;
-      break;
-    }
+	if(file_exists("${path}jate/coreEngine.php")) {
+	  array_push($GLOBALS["JATEPath"], $path);
+	  require_once("${path}jate/coreEngine.php");
+	  $jSuccess = true;
+	  break;
+	}
   if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
+	throw new Exception("JATE can't find coreEngine.php.");
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
+  if (!isset($GLOBALS["JATEPath"]))
     $GLOBALS["JATEPath"] = [];
   $commonLocations = [
       "bower_components/JATE/dist/"
@@ -10,12 +10,12 @@ 
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+    if (file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
+  if (!$jSuccess)
     throw new Exception("JATE can't find coreEngine.php.");
 ?>

Braces +10 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+  if(!isset($GLOBALS["JATEPath"])) {
+      $GLOBALS["JATEPath"] = [];
+  }
   $commonLocations = [
       "bower_components/JATE/dist/"
     , "vendor/xaberr/jate/dist/"
@@ -9,13 +10,15 @@ 
     , dirname(__FILE__)."/"
   ];
   $jSuccess = false;
-  foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+  foreach ($commonLocations as $path) {
+      if(file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
+  }
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
-?>
+  if( !$jSuccess ) {
+      throw new Exception("JATE can't find coreEngine.php.");
+  }
+  ?>

tests/jate/modules/Module/ModuleTest.php

Indentation +51 added lines, -51 removed lines

@@ -2,60 +2,60 @@
   declare( strict_types = 1 );
   // backward compatibility
   if (!class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+	class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
   }
   use PHPUnit\Framework\TestCase;
 
   final class ModuleTest extends TestCase {
-    public function testAddFile() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFile(123);
-    }
-    public function testAddFileRequired() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFileRequired(123);
-    }
-    public function testAddFiles() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFiles("/file.php");
-    }
-    public function testAddFilesRequired() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addFilesRequired("/file.php");
-    }
-    public function testAddModuleClass() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModule(123);
-    }
-    public function testAddModuleNoModule() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModule((object)[1,2,3]);
-    }
-    public function testAddModules() {
-      $this->expectException(InvalidArgumentException::class);
-      $module = new Module();
-      $module->addModules("Module");
-    }
-    public function testGetCss() {
-      $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["1.css","3.css"], $module->getCss());
-    }
-    public function testGetJs() {
-      $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["2.js","4.js"], $module->getJs());
-    }
-    public function testGetJsVariables() {
-      $module = new Module();
-      $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]);
-      $this->assertEquals([["variable","2"]], $module->getJsVariables());
-    }
+	public function testAddFile() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFile(123);
+	}
+	public function testAddFileRequired() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFileRequired(123);
+	}
+	public function testAddFiles() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFiles("/file.php");
+	}
+	public function testAddFilesRequired() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addFilesRequired("/file.php");
+	}
+	public function testAddModuleClass() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModule(123);
+	}
+	public function testAddModuleNoModule() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModule((object)[1,2,3]);
+	}
+	public function testAddModules() {
+	  $this->expectException(InvalidArgumentException::class);
+	  $module = new Module();
+	  $module->addModules("Module");
+	}
+	public function testGetCss() {
+	  $module = new Module();
+	  $module->addFiles(["1.css","2.js","3.css","4.js"]);
+	  $this->assertEquals(["1.css","3.css"], $module->getCss());
+	}
+	public function testGetJs() {
+	  $module = new Module();
+	  $module->addFiles(["1.css","2.js","3.css","4.js"]);
+	  $this->assertEquals(["2.js","4.js"], $module->getJs());
+	}
+	public function testGetJsVariables() {
+	  $module = new Module();
+	  $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]);
+	  $this->assertEquals([["variable","2"]], $module->getJsVariables());
+	}
   }
 ?>

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-  declare( strict_types = 1 );
+  declare(strict_types = 1);
   // backward compatibility
   if (!class_exists('\PHPUnit\Framework\TestCase')) {
     class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
@@ -35,7 +35,7 @@ 
     public function testAddModuleNoModule() {
       $this->expectException(InvalidArgumentException::class);
       $module = new Module();
-      $module->addModule((object)[1,2,3]);
+      $module->addModule((object) [1, 2, 3]);
     }
     public function testAddModules() {
       $this->expectException(InvalidArgumentException::class);
@@ -44,18 +44,18 @@ 
     }
     public function testGetCss() {
       $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["1.css","3.css"], $module->getCss());
+      $module->addFiles(["1.css", "2.js", "3.css", "4.js"]);
+      $this->assertEquals(["1.css", "3.css"], $module->getCss());
     }
     public function testGetJs() {
       $module = new Module();
-      $module->addFiles(["1.css","2.js","3.css","4.js"]);
-      $this->assertEquals(["2.js","4.js"], $module->getJs());
+      $module->addFiles(["1.css", "2.js", "3.css", "4.js"]);
+      $this->assertEquals(["2.js", "4.js"], $module->getJs());
     }
     public function testGetJsVariables() {
       $module = new Module();
-      $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]);
-      $this->assertEquals([["variable","2"]], $module->getJsVariables());
+      $module->addFiles(["1.css", ["variable", "2"], "3.css", "4.js"]);
+      $this->assertEquals([["variable", "2"]], $module->getJsVariables());
     }
   }
 ?>

dist/jate/modules/Connection/Adapters/ConnectionPostgresqlAdapter.php

Braces +6 added lines, -4 removed lines

@@ -17,16 +17,18 @@
       public function queryFetch( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
+        while($row = pg_fetch_assoc($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }
       public function queryArray( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
+        while($row = pg_fetch_array($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }

Indentation +46 added lines, -46 removed lines

@@ -1,51 +1,51 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
-            or die('Could not connect: '.pg_last_error());
-        } catch( Exception $error ) {
-          Debug::log($error->getMessage());
-          exit();
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->stdQuery("SELECT lastval()");
-      }
-      public function queryFetch( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      public function queryArray( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $result = pg_query($database, $_query);
-        if(!$result) {
-          Debug::logStack([
-            "query" => $_query,
-            "error" => pg_last_error()
-          ]);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
+			or die('Could not connect: '.pg_last_error());
+		} catch( Exception $error ) {
+		  Debug::log($error->getMessage());
+		  exit();
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->stdQuery("SELECT lastval()");
+	  }
+	  public function queryFetch( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_assoc($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  public function queryArray( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_array($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$result = pg_query($database, $_query);
+		if(!$result) {
+		  Debug::logStack([
+			"query" => $_query,
+			"error" => pg_last_error()
+		  ]);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

Spacing +10 added lines, -10 removed lines

@@ -2,43 +2,43 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
             or die('Could not connect: '.pg_last_error());
-        } catch( Exception $error ) {
+        } catch (Exception $error) {
           Debug::log($error->getMessage());
           exit();
         }
       }
-      public function query( $_query ) {
+      public function query($_query) {
         $this->stdQuery($_query);
         return true;
       }
-      public function queryInsert( $_query ) {
+      public function queryInsert($_query) {
         $this->stdQuery($_query);
         return $this->stdQuery("SELECT lastval()");
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
+        while ($row = pg_fetch_assoc($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
+        while ($row = pg_fetch_array($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $result = pg_query($database, $_query);
-        if(!$result) {
+        if (!$result) {
           Debug::logStack([
             "query" => $_query,
             "error" => pg_last_error()

dist/jate/coreEngine.php

Spacing +8 added lines, -8 removed lines

@@ -4,14 +4,14 @@
 
   //JATE SUFF
   require_once      (end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
-  requireComponent  ("functions/folder.php");
-  requireComponent  ("modules/JConfig/JConfig.php");
-  requireComponents ("functions");
-  requireModules    ("modules");
+  requireComponent("functions/folder.php");
+  requireComponent("modules/JConfig/JConfig.php");
+  requireComponents("functions");
+  requireModules("modules");
 
   //USER STUFF
-  requireComponent  ("config.php",false);
-  requireModules    ("modules",false);
-  requireComponents ("bundles/models",false);
-  requireComponents ("bundles/controllers",false);
+  requireComponent("config.php", false);
+  requireModules("modules", false);
+  requireComponents("bundles/models", false);
+  requireComponents("bundles/controllers", false);
 ?>

dist/jate/modules/JConfig/JConfig.php

Indentation +51 added lines, -51 removed lines

@@ -1,55 +1,55 @@
 <?php
   class JConfig {
-    public $connection;
-    public $all;
-    public $DEBUG;
-    public $pages;
-    public $server;
-    public function __construct() {
-      $this->connection["enable"]    = false;
-      $this->connection["user"]      = "";
-      $this->connection["password"] = "";
-      $this->connection["database"] = "";
-      $this->connection["server"]    = "";
-      $this->all    = "";
-      $this->DEBUG  = 0;
-      $this->pages  = [];
-      $this->server  = [];
-      $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
-      $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
-      $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
-      $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
-    }
-    public function import( $_path, $_type = "misc" ) {
-      $data = file_get_contents($_path);
-      $data = json_decode($data);
-      if($data === NULL)
-        Debug::log("Error processing [$_path]");
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
-    }
-    protected function overlayConnection( $_data ) {
-      $this->connection = $this->obj2array($_data);
-    }
-    protected function overlayMisc( $_data ) {
-      $this->importObject($_data);
-    }
-    protected function obj2array ( &$_instance ) {
-      $clone  = (array) $_instance;
-      $return  = [];
-      $return['___SOURCE_KEYS_'] = $clone;
-      while ( list ($key, $value) = each ($clone) ) {
-        $temp    = explode ("\0", $key);
-        $newkey  = $temp[count($temp)-1];
-        $return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
-      }
-      return $return;
-    }
-    protected function importObject( $_object ) {
-      foreach (get_object_vars($_object) as $key => $value)
-        $this->$key = $value;
-    }
+	public $connection;
+	public $all;
+	public $DEBUG;
+	public $pages;
+	public $server;
+	public function __construct() {
+	  $this->connection["enable"]    = false;
+	  $this->connection["user"]      = "";
+	  $this->connection["password"] = "";
+	  $this->connection["database"] = "";
+	  $this->connection["server"]    = "";
+	  $this->all    = "";
+	  $this->DEBUG  = 0;
+	  $this->pages  = [];
+	  $this->server  = [];
+	  $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
+	  $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
+	  $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
+	  $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
+	}
+	public function import( $_path, $_type = "misc" ) {
+	  $data = file_get_contents($_path);
+	  $data = json_decode($data);
+	  if($data === NULL)
+		Debug::log("Error processing [$_path]");
+	  if( $_type == "connection" )
+		$this->overlayConnection($data);
+	  else
+		$this->overlayMisc($data);
+	}
+	protected function overlayConnection( $_data ) {
+	  $this->connection = $this->obj2array($_data);
+	}
+	protected function overlayMisc( $_data ) {
+	  $this->importObject($_data);
+	}
+	protected function obj2array ( &$_instance ) {
+	  $clone  = (array) $_instance;
+	  $return  = [];
+	  $return['___SOURCE_KEYS_'] = $clone;
+	  while ( list ($key, $value) = each ($clone) ) {
+		$temp    = explode ("\0", $key);
+		$newkey  = $temp[count($temp)-1];
+		$return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
+	  }
+	  return $return;
+	}
+	protected function importObject( $_object ) {
+	  foreach (get_object_vars($_object) as $key => $value)
+		$this->$key = $value;
+	}
   }
 ?>

Spacing +13 added lines, -13 removed lines

@@ -14,40 +14,40 @@
       $this->all    = "";
       $this->DEBUG  = 0;
       $this->pages  = [];
-      $this->server  = [];
+      $this->server = [];
       $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
       $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
       $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
       $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
     }
-    public function import( $_path, $_type = "misc" ) {
+    public function import($_path, $_type = "misc") {
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
+      if ($data === NULL)
         Debug::log("Error processing [$_path]");
-      if( $_type == "connection" )
+      if ($_type == "connection")
         $this->overlayConnection($data);
       else
         $this->overlayMisc($data);
     }
-    protected function overlayConnection( $_data ) {
+    protected function overlayConnection($_data) {
       $this->connection = $this->obj2array($_data);
     }
-    protected function overlayMisc( $_data ) {
+    protected function overlayMisc($_data) {
       $this->importObject($_data);
     }
-    protected function obj2array ( &$_instance ) {
-      $clone  = (array) $_instance;
-      $return  = [];
+    protected function obj2array(&$_instance) {
+      $clone = (array) $_instance;
+      $return = [];
       $return['___SOURCE_KEYS_'] = $clone;
-      while ( list ($key, $value) = each ($clone) ) {
-        $temp    = explode ("\0", $key);
-        $newkey  = $temp[count($temp)-1];
+      while (list ($key, $value) = each($clone)) {
+        $temp    = explode("\0", $key);
+        $newkey  = $temp[count($temp) - 1];
         $return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
       }
       return $return;
     }
-    protected function importObject( $_object ) {
+    protected function importObject($_object) {
       foreach (get_object_vars($_object) as $key => $value)
         $this->$key = $value;
     }

Braces +11 added lines, -8 removed lines

@@ -23,12 +23,14 @@ 
     public function import( $_path, $_type = "misc" ) {
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
-        Debug::log("Error processing [$_path]");
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
+      if($data === NULL) {
+              Debug::log("Error processing [$_path]");
+      }
+      if( $_type == "connection" ) {
+              $this->overlayConnection($data);
+      } else {
+              $this->overlayMisc($data);
+      }
     }
     protected function overlayConnection( $_data ) {
       $this->connection = $this->obj2array($_data);
@@ -48,8 +50,9 @@ 
       return $return;
     }
     protected function importObject( $_object ) {
-      foreach (get_object_vars($_object) as $key => $value)
-        $this->$key = $value;
+      foreach (get_object_vars($_object) as $key => $value) {
+              $this->$key = $value;
+      }
     }
   }
 ?>

dist/jate/modules/Query/Query.php

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
   jRequire("../Module/Module.php");
   class Query extends Module {
-    public $connection;
-    public $currentConnection;
-    public function __construct() {
-      parent::__construct();
-      $this->connection = [];
-      $this->currentConnection = null;
-    }
-    public function addConnection( $_name, $_connection ) {
-      Debug::push();
-      $this->connection["$_name"] = $_connection;
-      $this->currentConnection = $_connection;
-      foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
-          $module->addConnection($_name, $_connection);
-      Debug::pop();
-    }
-    public function setConnection( $_name ) {
-      $this->currentConnection = $this->connection["$_name"];
-    }
-    public function query( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->query($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryInsert( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryInsert($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryFetch( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryFetch($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryArray( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryArray($_query);
-      Debug::pop();
-      return $temp;
-    }
+	public $connection;
+	public $currentConnection;
+	public function __construct() {
+	  parent::__construct();
+	  $this->connection = [];
+	  $this->currentConnection = null;
+	}
+	public function addConnection( $_name, $_connection ) {
+	  Debug::push();
+	  $this->connection["$_name"] = $_connection;
+	  $this->currentConnection = $_connection;
+	  foreach ($this->modules as &$module)
+		if(isset($module->currentConnection))
+		  $module->addConnection($_name, $_connection);
+	  Debug::pop();
+	}
+	public function setConnection( $_name ) {
+	  $this->currentConnection = $this->connection["$_name"];
+	}
+	public function query( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->query($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryInsert( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryInsert($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryFetch( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryFetch($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryArray( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryArray($_query);
+	  Debug::pop();
+	  return $temp;
+	}
   }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -8,37 +8,37 @@
       $this->connection = [];
       $this->currentConnection = null;
     }
-    public function addConnection( $_name, $_connection ) {
+    public function addConnection($_name, $_connection) {
       Debug::push();
       $this->connection["$_name"] = $_connection;
       $this->currentConnection = $_connection;
       foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
+        if (isset($module->currentConnection))
           $module->addConnection($_name, $_connection);
       Debug::pop();
     }
-    public function setConnection( $_name ) {
+    public function setConnection($_name) {
       $this->currentConnection = $this->connection["$_name"];
     }
-    public function query( $_query ) {
+    public function query($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->query($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryInsert( $_query ) {
+    public function queryInsert($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryInsert($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryFetch( $_query ) {
+    public function queryFetch($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryFetch($_query);
       Debug::pop();
       return $temp;
     }
-    public function queryArray( $_query ) {
+    public function queryArray($_query) {
       Debug::push();
       $temp = $this->currentConnection->database->queryArray($_query);
       Debug::pop();

Braces +3 added lines, -2 removed lines

@@ -12,9 +12,10 @@
       Debug::push();
       $this->connection["$_name"] = $_connection;
       $this->currentConnection = $_connection;
-      foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
+      foreach ($this->modules as &$module) {
+              if(isset($module->currentConnection))
           $module->addConnection($_name, $_connection);
+      }
       Debug::pop();
     }
     public function setConnection( $_name ) {

dist/jate/modules/Connection/Adapters/ConnectionPdoAdapter.php

Indentation +42 added lines, -42 removed lines

@@ -1,47 +1,47 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $connection = "mysql:host=$_srv;dbname=$_db";
-          $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-        } catch( Exception $error ) {
-          Debug::log($error->getMessage());
-          exit();
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->connection->lastInsertId();
-      }
-      public function queryFetch( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_ASSOC);
-      }
-      public function queryArray( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $query = $database->prepare($_query);
-        $result = $query->execute();
-        if(!$result) {
-          Debug::logStack([
-            "query" => $_query,
-            "error" => [
-              $query->errorInfo(),
-              $database->errorInfo()
-            ]
-          ]);
-          exit();
-        }
-        return $query;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $connection = "mysql:host=$_srv;dbname=$_db";
+		  $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
+		} catch( Exception $error ) {
+		  Debug::log($error->getMessage());
+		  exit();
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->connection->lastInsertId();
+	  }
+	  public function queryFetch( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_ASSOC);
+	  }
+	  public function queryArray( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$query = $database->prepare($_query);
+		$result = $query->execute();
+		if(!$result) {
+		  Debug::logStack([
+			"query" => $_query,
+			"error" => [
+			  $query->errorInfo(),
+			  $database->errorInfo()
+			]
+		  ]);
+		  exit();
+		}
+		return $query;
+	  }
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -2,36 +2,36 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $connection = "mysql:host=$_srv;dbname=$_db";
-          $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-        } catch( Exception $error ) {
+          $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]);
+        } catch (Exception $error) {
           Debug::log($error->getMessage());
           exit();
         }
       }
-      public function query( $_query ) {
+      public function query($_query) {
         $this->stdQuery($_query);
         return true;
       }
-      public function queryInsert( $_query ) {
+      public function queryInsert($_query) {
         $this->stdQuery($_query);
         return $this->connection->lastInsertId();
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $temp = $this->stdQuery($_query);
         return $temp->fetchAll(PDO::FETCH_ASSOC);
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $temp = $this->stdQuery($_query);
         return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result) {
+        if (!$result) {
           Debug::logStack([
             "query" => $_query,
             "error" => [

dist/jate/modules/Debug/Debug.php

Indentation +49 added lines, -49 removed lines

@@ -1,54 +1,54 @@
 <?php
   // requireComponent("../functions/array.php");
   class Debug {
-    public static $stack;
-    private static $initialized = false;
-    private function __construct() {}
-    private static function initialize() {
-      if (self::$initialized)
-        return;
-      self::$stack = [];
-      self::$initialized = true;
-    }
-    private static function out( $_object ) {
-      if(is_object($_object)) {
-        echo "isObject";
-      } else if(is_array($_object)) {
-        arrayDump($_object, "Debug");
-      } else {
-        echo $_object;
-      }
-    }
-    public static function log( $_object ) {
-      self::out(["error" => $_object]);
-    }
-    public static function logln( $_object ) {
-      self::log($_object);
-      self::out("<br>");
-    }
-    public static function logStack( $_object ) {
-      self::out([
-        "position" => self::$stack,
-        "error" => $_object
-      ]);
-      self::out("<br>");
-    }
-    public static function push() {
-      $debugInfo = debug_backtrace();
-      $debugInfo = [
-        "file" => $debugInfo[1]["file"],
-        "line" => $debugInfo[1]["line"],
-        "function" => $debugInfo[1]["function"],
-        "class" => $debugInfo[1]["class"]
-      ];
-      self::$stack[] = $debugInfo;
-    }
-    public static function pop() {
-      if(count(self::$stack)>0)
-        array_shift(self::$stack);
-    }
-    public static function emptyStack() {
-      self::$stack = [];
-    }
+	public static $stack;
+	private static $initialized = false;
+	private function __construct() {}
+	private static function initialize() {
+	  if (self::$initialized)
+		return;
+	  self::$stack = [];
+	  self::$initialized = true;
+	}
+	private static function out( $_object ) {
+	  if(is_object($_object)) {
+		echo "isObject";
+	  } else if(is_array($_object)) {
+		arrayDump($_object, "Debug");
+	  } else {
+		echo $_object;
+	  }
+	}
+	public static function log( $_object ) {
+	  self::out(["error" => $_object]);
+	}
+	public static function logln( $_object ) {
+	  self::log($_object);
+	  self::out("<br>");
+	}
+	public static function logStack( $_object ) {
+	  self::out([
+		"position" => self::$stack,
+		"error" => $_object
+	  ]);
+	  self::out("<br>");
+	}
+	public static function push() {
+	  $debugInfo = debug_backtrace();
+	  $debugInfo = [
+		"file" => $debugInfo[1]["file"],
+		"line" => $debugInfo[1]["line"],
+		"function" => $debugInfo[1]["function"],
+		"class" => $debugInfo[1]["class"]
+	  ];
+	  self::$stack[] = $debugInfo;
+	}
+	public static function pop() {
+	  if(count(self::$stack)>0)
+		array_shift(self::$stack);
+	}
+	public static function emptyStack() {
+	  self::$stack = [];
+	}
   }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -10,23 +10,23 @@ 
       self::$stack = [];
       self::$initialized = true;
     }
-    private static function out( $_object ) {
-      if(is_object($_object)) {
+    private static function out($_object) {
+      if (is_object($_object)) {
         echo "isObject";
-      } else if(is_array($_object)) {
+      } else if (is_array($_object)) {
         arrayDump($_object, "Debug");
       } else {
         echo $_object;
       }
     }
-    public static function log( $_object ) {
+    public static function log($_object) {
       self::out(["error" => $_object]);
     }
-    public static function logln( $_object ) {
+    public static function logln($_object) {
       self::log($_object);
       self::out("<br>");
     }
-    public static function logStack( $_object ) {
+    public static function logStack($_object) {
       self::out([
         "position" => self::$stack,
         "error" => $_object
@@ -44,7 +44,7 @@ 
       self::$stack[] = $debugInfo;
     }
     public static function pop() {
-      if(count(self::$stack)>0)
+      if (count(self::$stack) > 0)
         array_shift(self::$stack);
     }
     public static function emptyStack() {

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
     private static $initialized = false;
     private function __construct() {}
     private static function initialize() {
-      if (self::$initialized)
-        return;
+      if (self::$initialized) {
+              return;
+      }
       self::$stack = [];
       self::$initialized = true;
     }
@@ -44,8 +45,9 @@ 
       self::$stack[] = $debugInfo;
     }
     public static function pop() {
-      if(count(self::$stack)>0)
-        array_shift(self::$stack);
+      if(count(self::$stack)>0) {
+              array_shift(self::$stack);
+      }
     }
     public static function emptyStack() {
       self::$stack = [];