@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | - declare( strict_types = 1 ); |
|
2 | + declare(strict_types = 1); |
|
3 | 3 | // backward compatibility |
4 | 4 | if (!class_exists('\PHPUnit\Framework\TestCase')) { |
5 | 5 | class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase'); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function testAddModuleNoModule() { |
36 | 36 | $this->expectException(InvalidArgumentException::class); |
37 | 37 | $module = new Module(); |
38 | - $module->addModule((object)[1,2,3]); |
|
38 | + $module->addModule((object) [1, 2, 3]); |
|
39 | 39 | } |
40 | 40 | public function testAddModules() { |
41 | 41 | $this->expectException(InvalidArgumentException::class); |
@@ -44,18 +44,18 @@ discard block |
||
44 | 44 | } |
45 | 45 | public function testGetCss() { |
46 | 46 | $module = new Module(); |
47 | - $module->addFiles(["1.css","2.js","3.css","4.js"]); |
|
48 | - $this->assertEquals(["1.css","3.css"], $module->getCss()); |
|
47 | + $module->addFiles(["1.css", "2.js", "3.css", "4.js"]); |
|
48 | + $this->assertEquals(["1.css", "3.css"], $module->getCss()); |
|
49 | 49 | } |
50 | 50 | public function testGetJs() { |
51 | 51 | $module = new Module(); |
52 | - $module->addFiles(["1.css","2.js","3.css","4.js"]); |
|
53 | - $this->assertEquals(["2.js","4.js"], $module->getJs()); |
|
52 | + $module->addFiles(["1.css", "2.js", "3.css", "4.js"]); |
|
53 | + $this->assertEquals(["2.js", "4.js"], $module->getJs()); |
|
54 | 54 | } |
55 | 55 | public function testGetJsVariables() { |
56 | 56 | $module = new Module(); |
57 | - $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]); |
|
58 | - $this->assertEquals([["variable","2"]], $module->getJsVariables()); |
|
57 | + $module->addFiles(["1.css", ["variable", "2"], "3.css", "4.js"]); |
|
58 | + $this->assertEquals([["variable", "2"]], $module->getJsVariables()); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | ?> |
@@ -4,14 +4,14 @@ |
||
4 | 4 | |
5 | 5 | //JATE SUFF |
6 | 6 | require_once (end($GLOBALS["JATEPath"])."jate/functions/requirer.php"); |
7 | - requireComponent ("functions/folder.php"); |
|
8 | - requireComponent ("modules/JConfig/JConfig.php"); |
|
9 | - requireComponents ("functions"); |
|
10 | - requireModules ("modules"); |
|
7 | + requireComponent("functions/folder.php"); |
|
8 | + requireComponent("modules/JConfig/JConfig.php"); |
|
9 | + requireComponents("functions"); |
|
10 | + requireModules("modules"); |
|
11 | 11 | |
12 | 12 | //USER STUFF |
13 | - requireComponent ("config.php",false); |
|
14 | - requireModules ("modules",false); |
|
15 | - requireComponents ("bundles/models",false); |
|
16 | - requireComponents ("bundles/controllers",false); |
|
13 | + requireComponent("config.php", false); |
|
14 | + requireModules("modules", false); |
|
15 | + requireComponents("bundles/models", false); |
|
16 | + requireComponents("bundles/controllers", false); |
|
17 | 17 | ?> |
@@ -14,40 +14,40 @@ |
||
14 | 14 | $this->all = ""; |
15 | 15 | $this->DEBUG = 0; |
16 | 16 | $this->pages = []; |
17 | - $this->server = []; |
|
17 | + $this->server = []; |
|
18 | 18 | $this->server["HTTP_HOST"] = $_SERVER["HTTP_HOST"]; |
19 | 19 | $this->server["REQUEST_URI"] = $_SERVER["REQUEST_URI"]; |
20 | 20 | $this->server["PHP_SELF"] = $_SERVER["PHP_SELF"]; |
21 | 21 | $this->server["RELATIVE"] = str_replace("/index.php", "", $_SERVER["PHP_SELF"]); |
22 | 22 | } |
23 | - public function import( $_path, $_type = "misc" ) { |
|
23 | + public function import($_path, $_type = "misc") { |
|
24 | 24 | $data = file_get_contents($_path); |
25 | 25 | $data = json_decode($data); |
26 | - if($data === NULL) |
|
26 | + if ($data === NULL) |
|
27 | 27 | Debug::log("Error processing [$_path]"); |
28 | - if( $_type == "connection" ) |
|
28 | + if ($_type == "connection") |
|
29 | 29 | $this->overlayConnection($data); |
30 | 30 | else |
31 | 31 | $this->overlayMisc($data); |
32 | 32 | } |
33 | - protected function overlayConnection( $_data ) { |
|
33 | + protected function overlayConnection($_data) { |
|
34 | 34 | $this->connection = $this->obj2array($_data); |
35 | 35 | } |
36 | - protected function overlayMisc( $_data ) { |
|
36 | + protected function overlayMisc($_data) { |
|
37 | 37 | $this->importObject($_data); |
38 | 38 | } |
39 | - protected function obj2array ( &$_instance ) { |
|
40 | - $clone = (array) $_instance; |
|
41 | - $return = []; |
|
39 | + protected function obj2array(&$_instance) { |
|
40 | + $clone = (array) $_instance; |
|
41 | + $return = []; |
|
42 | 42 | $return['___SOURCE_KEYS_'] = $clone; |
43 | - while ( list ($key, $value) = each ($clone) ) { |
|
44 | - $temp = explode ("\0", $key); |
|
45 | - $newkey = $temp[count($temp)-1]; |
|
43 | + while (list ($key, $value) = each($clone)) { |
|
44 | + $temp = explode("\0", $key); |
|
45 | + $newkey = $temp[count($temp) - 1]; |
|
46 | 46 | $return[$newkey] = &$return['___SOURCE_KEYS_'][$key]; |
47 | 47 | } |
48 | 48 | return $return; |
49 | 49 | } |
50 | - protected function importObject( $_object ) { |
|
50 | + protected function importObject($_object) { |
|
51 | 51 | foreach (get_object_vars($_object) as $key => $value) |
52 | 52 | $this->$key = $value; |
53 | 53 | } |
@@ -8,37 +8,37 @@ |
||
8 | 8 | $this->connection = []; |
9 | 9 | $this->currentConnection = null; |
10 | 10 | } |
11 | - public function addConnection( $_name, $_connection ) { |
|
11 | + public function addConnection($_name, $_connection) { |
|
12 | 12 | Debug::push(); |
13 | 13 | $this->connection["$_name"] = $_connection; |
14 | 14 | $this->currentConnection = $_connection; |
15 | 15 | foreach ($this->modules as &$module) |
16 | - if(isset($module->currentConnection)) |
|
16 | + if (isset($module->currentConnection)) |
|
17 | 17 | $module->addConnection($_name, $_connection); |
18 | 18 | Debug::pop(); |
19 | 19 | } |
20 | - public function setConnection( $_name ) { |
|
20 | + public function setConnection($_name) { |
|
21 | 21 | $this->currentConnection = $this->connection["$_name"]; |
22 | 22 | } |
23 | - public function query( $_query ) { |
|
23 | + public function query($_query) { |
|
24 | 24 | Debug::push(); |
25 | 25 | $temp = $this->currentConnection->database->query($_query); |
26 | 26 | Debug::pop(); |
27 | 27 | return $temp; |
28 | 28 | } |
29 | - public function queryInsert( $_query ) { |
|
29 | + public function queryInsert($_query) { |
|
30 | 30 | Debug::push(); |
31 | 31 | $temp = $this->currentConnection->database->queryInsert($_query); |
32 | 32 | Debug::pop(); |
33 | 33 | return $temp; |
34 | 34 | } |
35 | - public function queryFetch( $_query ) { |
|
35 | + public function queryFetch($_query) { |
|
36 | 36 | Debug::push(); |
37 | 37 | $temp = $this->currentConnection->database->queryFetch($_query); |
38 | 38 | Debug::pop(); |
39 | 39 | return $temp; |
40 | 40 | } |
41 | - public function queryArray( $_query ) { |
|
41 | + public function queryArray($_query) { |
|
42 | 42 | Debug::push(); |
43 | 43 | $temp = $this->currentConnection->database->queryArray($_query); |
44 | 44 | Debug::pop(); |
@@ -2,36 +2,36 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionPdoAdapter implements ConnectionAdapterInterface { |
4 | 4 | public $connection; |
5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
5 | + public function __construct($_srv, $_db, $_usr, $_pass) { |
|
6 | 6 | try { |
7 | 7 | $connection = "mysql:host=$_srv;dbname=$_db"; |
8 | - $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] ); |
|
9 | - } catch( Exception $error ) { |
|
8 | + $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]); |
|
9 | + } catch (Exception $error) { |
|
10 | 10 | Debug::log($error->getMessage()); |
11 | 11 | exit(); |
12 | 12 | } |
13 | 13 | } |
14 | - public function query( $_query ) { |
|
14 | + public function query($_query) { |
|
15 | 15 | $this->stdQuery($_query); |
16 | 16 | return true; |
17 | 17 | } |
18 | - public function queryInsert( $_query ) { |
|
18 | + public function queryInsert($_query) { |
|
19 | 19 | $this->stdQuery($_query); |
20 | 20 | return $this->connection->lastInsertId(); |
21 | 21 | } |
22 | - public function queryFetch( $_query ) { |
|
22 | + public function queryFetch($_query) { |
|
23 | 23 | $temp = $this->stdQuery($_query); |
24 | 24 | return $temp->fetchAll(PDO::FETCH_ASSOC); |
25 | 25 | } |
26 | - public function queryArray( $_query ) { |
|
26 | + public function queryArray($_query) { |
|
27 | 27 | $temp = $this->stdQuery($_query); |
28 | 28 | return $temp->fetchAll(PDO::FETCH_COLUMN, 0); |
29 | 29 | } |
30 | - protected function stdQuery( $_query ) { |
|
30 | + protected function stdQuery($_query) { |
|
31 | 31 | $database = $this->connection; |
32 | 32 | $query = $database->prepare($_query); |
33 | 33 | $result = $query->execute(); |
34 | - if(!$result) { |
|
34 | + if (!$result) { |
|
35 | 35 | Debug::logStack([ |
36 | 36 | "query" => $_query, |
37 | 37 | "error" => [ |
@@ -2,43 +2,43 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface { |
4 | 4 | public $connection; |
5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
5 | + public function __construct($_srv, $_db, $_usr, $_pass) { |
|
6 | 6 | try { |
7 | 7 | $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass") |
8 | 8 | or die('Could not connect: '.pg_last_error()); |
9 | - } catch( Exception $error ) { |
|
9 | + } catch (Exception $error) { |
|
10 | 10 | Debug::log($error->getMessage()); |
11 | 11 | exit(); |
12 | 12 | } |
13 | 13 | } |
14 | - public function query( $_query ) { |
|
14 | + public function query($_query) { |
|
15 | 15 | $this->stdQuery($_query); |
16 | 16 | return true; |
17 | 17 | } |
18 | - public function queryInsert( $_query ) { |
|
18 | + public function queryInsert($_query) { |
|
19 | 19 | $this->stdQuery($_query); |
20 | 20 | return $this->stdQuery("SELECT lastval()"); |
21 | 21 | } |
22 | - public function queryFetch( $_query ) { |
|
22 | + public function queryFetch($_query) { |
|
23 | 23 | $result = $this->stdQuery($_query); |
24 | 24 | $rows = []; |
25 | - while($row = pg_fetch_assoc($result)) |
|
25 | + while ($row = pg_fetch_assoc($result)) |
|
26 | 26 | $rows[] = $row; |
27 | 27 | pg_free_result($result); |
28 | 28 | return $rows; |
29 | 29 | } |
30 | - public function queryArray( $_query ) { |
|
30 | + public function queryArray($_query) { |
|
31 | 31 | $result = $this->stdQuery($_query); |
32 | 32 | $rows = []; |
33 | - while($row = pg_fetch_array($result)) |
|
33 | + while ($row = pg_fetch_array($result)) |
|
34 | 34 | $rows[] = $row; |
35 | 35 | pg_free_result($result); |
36 | 36 | return $rows; |
37 | 37 | } |
38 | - protected function stdQuery( $_query ) { |
|
38 | + protected function stdQuery($_query) { |
|
39 | 39 | $database = $this->connection; |
40 | 40 | $result = pg_query($database, $_query); |
41 | - if(!$result) { |
|
41 | + if (!$result) { |
|
42 | 42 | Debug::logStack([ |
43 | 43 | "query" => $_query, |
44 | 44 | "error" => pg_last_error() |
@@ -2,40 +2,40 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionMysqliAdapter implements ConnectionAdapterInterface { |
4 | 4 | public $connection; |
5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
5 | + public function __construct($_srv, $_db, $_usr, $_pass) { |
|
6 | 6 | try { |
7 | - $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db ); |
|
8 | - } catch( Exception $error ) { |
|
7 | + $this->connection = new mysqli($_srv, $_usr, $_pass, $_db); |
|
8 | + } catch (Exception $error) { |
|
9 | 9 | Debug::log($error->getMessage()); |
10 | 10 | exit(); |
11 | 11 | } |
12 | 12 | } |
13 | - public function query( $_query ) { |
|
13 | + public function query($_query) { |
|
14 | 14 | $this->stdQuery($_query); |
15 | 15 | return true; |
16 | 16 | } |
17 | - public function queryInsert( $_query ) { |
|
17 | + public function queryInsert($_query) { |
|
18 | 18 | $this->stdQuery($_query); |
19 | 19 | return $this->connection->insert_id; |
20 | 20 | } |
21 | - public function queryFetch( $_query ) { |
|
21 | + public function queryFetch($_query) { |
|
22 | 22 | $result = $this->stdQuery($_query); |
23 | 23 | $rows = []; |
24 | - while($row = $result->fetch_assoc()) |
|
24 | + while ($row = $result->fetch_assoc()) |
|
25 | 25 | $rows[] = $row; |
26 | 26 | return $rows; |
27 | 27 | } |
28 | - public function queryArray( $_query ) { |
|
28 | + public function queryArray($_query) { |
|
29 | 29 | $result = $this->stdQuery($_query); |
30 | 30 | $rows = []; |
31 | - while($row = $result->fetch_array()) |
|
31 | + while ($row = $result->fetch_array()) |
|
32 | 32 | $rows[] = $row; |
33 | 33 | return $rows; |
34 | 34 | } |
35 | - protected function stdQuery( $_query ) { |
|
35 | + protected function stdQuery($_query) { |
|
36 | 36 | $database = $this->connection; |
37 | 37 | $result = $database->query($_query); |
38 | - if(!$result) { |
|
38 | + if (!$result) { |
|
39 | 39 | Debug::logStack([ |
40 | 40 | "query" => $_query, |
41 | 41 | "error" => $database->error |
@@ -10,23 +10,23 @@ discard block |
||
10 | 10 | self::$stack = []; |
11 | 11 | self::$initialized = true; |
12 | 12 | } |
13 | - private static function out( $_object ) { |
|
14 | - if(is_object($_object)) { |
|
13 | + private static function out($_object) { |
|
14 | + if (is_object($_object)) { |
|
15 | 15 | echo "isObject"; |
16 | - } else if(is_array($_object)) { |
|
16 | + } else if (is_array($_object)) { |
|
17 | 17 | arrayDump($_object, "Debug"); |
18 | 18 | } else { |
19 | 19 | echo $_object; |
20 | 20 | } |
21 | 21 | } |
22 | - public static function log( $_object ) { |
|
22 | + public static function log($_object) { |
|
23 | 23 | self::out(["error" => $_object]); |
24 | 24 | } |
25 | - public static function logln( $_object ) { |
|
25 | + public static function logln($_object) { |
|
26 | 26 | self::log($_object); |
27 | 27 | self::out("<br>"); |
28 | 28 | } |
29 | - public static function logStack( $_object ) { |
|
29 | + public static function logStack($_object) { |
|
30 | 30 | self::out([ |
31 | 31 | "position" => self::$stack, |
32 | 32 | "error" => $_object |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | self::$stack[] = $debugInfo; |
45 | 45 | } |
46 | 46 | public static function pop() { |
47 | - if(count(self::$stack)>0) |
|
47 | + if (count(self::$stack) > 0) |
|
48 | 48 | array_shift(self::$stack); |
49 | 49 | } |
50 | 50 | public static function emptyStack() { |