@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | interface ConnectionAdapterInterface { |
3 | - public function __construct( $_srv, $_db, $_usr, $_pass); |
|
4 | - public function query( $_query ); |
|
5 | - public function queryFetch( $_query ); |
|
6 | - public function queryArray( $_query ); |
|
7 | - public function queryInsert( $_query ); |
|
3 | + public function __construct($_srv, $_db, $_usr, $_pass); |
|
4 | + public function query($_query); |
|
5 | + public function queryFetch($_query); |
|
6 | + public function queryArray($_query); |
|
7 | + public function queryInsert($_query); |
|
8 | 8 | } |
9 | 9 | ?> |
@@ -2,36 +2,36 @@ |
||
2 | 2 | jRequire("ConnectionInterface.php"); |
3 | 3 | class ConnectionMysqliAdapter implements ConnectionAdapterInterface { |
4 | 4 | public $connection; |
5 | - public function __construct( $_srv, $_db, $_usr, $_pass ) { |
|
6 | - $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db ); |
|
5 | + public function __construct($_srv, $_db, $_usr, $_pass) { |
|
6 | + $this->connection = new mysqli($_srv, $_usr, $_pass, $_db); |
|
7 | 7 | } |
8 | - public function query( $_query ) { |
|
8 | + public function query($_query) { |
|
9 | 9 | $this->stdQuery($_query); |
10 | 10 | return true; |
11 | 11 | } |
12 | - public function queryInsert( $_query ) { |
|
12 | + public function queryInsert($_query) { |
|
13 | 13 | $this->stdQuery($_query); |
14 | 14 | return $this->connection->insert_id; |
15 | 15 | } |
16 | - public function queryFetch( $_query ) { |
|
16 | + public function queryFetch($_query) { |
|
17 | 17 | $result = $this->stdQuery($_query); |
18 | 18 | $rows = []; |
19 | - while($row = $result->fetch_assoc()) |
|
19 | + while ($row = $result->fetch_assoc()) |
|
20 | 20 | $rows[] = $row; |
21 | 21 | return $rows; |
22 | 22 | } |
23 | - public function queryArray( $_query ) { |
|
23 | + public function queryArray($_query) { |
|
24 | 24 | $result = $this->stdQuery($_query); |
25 | 25 | $rows = []; |
26 | - while($row = $result->fetch_array()) |
|
26 | + while ($row = $result->fetch_array()) |
|
27 | 27 | $rows[] = $row; |
28 | 28 | return $rows; |
29 | 29 | } |
30 | - protected function stdQuery( $_query ) { |
|
30 | + protected function stdQuery($_query) { |
|
31 | 31 | $database = $this->connection; |
32 | 32 | $error = "Error query [$_query]"; |
33 | 33 | $result = $database->query($_query); |
34 | - if(!$result) { |
|
34 | + if (!$result) { |
|
35 | 35 | echo "$_query<br>"; |
36 | 36 | echo "Something wrong: $error"; |
37 | 37 | var_dump($database->error); |
@@ -2,32 +2,32 @@ |
||
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 | $connection = "mysql:host=$_srv;dbname=$_db"; |
7 | - $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] ); |
|
7 | + $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]); |
|
8 | 8 | } |
9 | - public function query( $_query ) { |
|
9 | + public function query($_query) { |
|
10 | 10 | $this->stdQuery($_query); |
11 | 11 | return true; |
12 | 12 | } |
13 | - public function queryInsert( $_query ) { |
|
13 | + public function queryInsert($_query) { |
|
14 | 14 | $this->stdQuery($_query); |
15 | 15 | return $this->connection->lastInsertId(); |
16 | 16 | } |
17 | - public function queryFetch( $_query ) { |
|
17 | + public function queryFetch($_query) { |
|
18 | 18 | $temp = $this->stdQuery($_query); |
19 | 19 | return $temp->fetchAll(PDO::FETCH_ASSOC); |
20 | 20 | } |
21 | - public function queryArray( $_query ) { |
|
21 | + public function queryArray($_query) { |
|
22 | 22 | $temp = $this->stdQuery($_query); |
23 | 23 | return $temp->fetchAll(PDO::FETCH_COLUMN, 0); |
24 | 24 | } |
25 | - protected function stdQuery( $_query ) { |
|
25 | + protected function stdQuery($_query) { |
|
26 | 26 | $database = $this->connection; |
27 | 27 | $error = "Error query [$_query]"; |
28 | 28 | $query = $database->prepare($_query); |
29 | 29 | $result = $query->execute(); |
30 | - if(!$result) { |
|
30 | + if (!$result) { |
|
31 | 31 | echo "$_query<br>"; |
32 | 32 | echo "Something wrong: $error"; |
33 | 33 | var_dump($query->errorInfo()); |
@@ -10,9 +10,9 @@ discard block |
||
10 | 10 | public $parameters; |
11 | 11 | public function __construct() { |
12 | 12 | $this->name = get_class($this); |
13 | - $this->modules = []; |
|
13 | + $this->modules = []; |
|
14 | 14 | $this->files = []; |
15 | - $this->required = []; |
|
15 | + $this->required = []; |
|
16 | 16 | $this->data = []; |
17 | 17 | $this->tags = []; |
18 | 18 | $this->connection = null; |
@@ -22,56 +22,56 @@ discard block |
||
22 | 22 | // abstract public function init(); |
23 | 23 | // abstract public function draw(); |
24 | 24 | public function getCss() { |
25 | - return $this->getRequire("getCss",".css"); |
|
25 | + return $this->getRequire("getCss", ".css"); |
|
26 | 26 | } |
27 | 27 | public function getJs() { |
28 | - return $this->getRequire("getJs",".js"); |
|
28 | + return $this->getRequire("getJs", ".js"); |
|
29 | 29 | } |
30 | 30 | public function getJsVariables() { |
31 | 31 | $temp = []; |
32 | 32 | foreach ($this->required as $i) |
33 | 33 | if (is_array($i)) |
34 | - array_push($temp,$i); |
|
34 | + array_push($temp, $i); |
|
35 | 35 | foreach ($this->modules as $i) |
36 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
36 | + $temp = array_merge($temp, $i->getJsVariables()); |
|
37 | 37 | foreach ($this->files as $i) |
38 | 38 | if (is_array($i)) |
39 | - array_push($temp,$i); |
|
39 | + array_push($temp, $i); |
|
40 | 40 | return $temp; |
41 | 41 | } |
42 | - public function addModules( $_mods ) { |
|
43 | - if(!is_array($_mods)) |
|
42 | + public function addModules($_mods) { |
|
43 | + if (!is_array($_mods)) |
|
44 | 44 | throw new InvalidArgumentException("Parameter must be an array."); |
45 | 45 | foreach ($_mods as $value) |
46 | 46 | $this->addModule($value); |
47 | 47 | } |
48 | - public function addModule( $_mod ) { |
|
49 | - if(!is_object($_mod)) |
|
48 | + public function addModule($_mod) { |
|
49 | + if (!is_object($_mod)) |
|
50 | 50 | throw new InvalidArgumentException("Parameter must be a class."); |
51 | - if(! is_subclass_of ($_mod, "Module")) |
|
51 | + if (!is_subclass_of($_mod, "Module")) |
|
52 | 52 | throw new InvalidArgumentException("Parameter must be a class."); |
53 | 53 | $this->modules[$_mod->name] = $_mod; |
54 | 54 | $this->modules[$_mod->name]->parameters = &$this->parameters; |
55 | 55 | } |
56 | - public function addFiles( $_files ) { |
|
57 | - if(!is_array($_files)) |
|
56 | + public function addFiles($_files) { |
|
57 | + if (!is_array($_files)) |
|
58 | 58 | throw new InvalidArgumentException("Parameter must be an array."); |
59 | 59 | foreach ($_files as $value) |
60 | 60 | $this->addFile($value); |
61 | 61 | } |
62 | - public function addFile( $_file ) { |
|
63 | - if(!(is_string($_file) || is_array($_file))) |
|
62 | + public function addFile($_file) { |
|
63 | + if (!(is_string($_file) || is_array($_file))) |
|
64 | 64 | throw new InvalidArgumentException("Parameter must be a string or an array."); |
65 | 65 | array_push($this->files, $_file); |
66 | 66 | } |
67 | - public function addFilesRequired( $_files ) { |
|
68 | - if(!is_array($_files)) |
|
67 | + public function addFilesRequired($_files) { |
|
68 | + if (!is_array($_files)) |
|
69 | 69 | throw new InvalidArgumentException("Parameter must be an array."); |
70 | 70 | foreach ($_files as $value) |
71 | 71 | $this->addFileRequired($value); |
72 | 72 | } |
73 | - public function addFileRequired( $_file ) { |
|
74 | - if(!is_string($_file)) |
|
73 | + public function addFileRequired($_file) { |
|
74 | + if (!is_string($_file)) |
|
75 | 75 | throw new InvalidArgumentException("Parameter must be a string."); |
76 | 76 | array_push($this->required, $_file); |
77 | 77 | } |
@@ -80,16 +80,16 @@ discard block |
||
80 | 80 | $this->tags["js"] = $this->getJs(); |
81 | 81 | $this->tags["jsVariables"] = $this->getJsVariables(); |
82 | 82 | } |
83 | - protected function getRequire( $_function, $_extenction) { |
|
83 | + protected function getRequire($_function, $_extenction) { |
|
84 | 84 | $temp = []; |
85 | 85 | foreach ($this->required as $i) |
86 | 86 | if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
87 | - array_push($temp,$i); |
|
87 | + array_push($temp, $i); |
|
88 | 88 | foreach ($this->modules as $i) |
89 | - $temp = array_merge( $temp, $i->$_function() ); |
|
89 | + $temp = array_merge($temp, $i->$_function()); |
|
90 | 90 | foreach ($this->files as $i) |
91 | 91 | if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
92 | - array_push($temp,$i); |
|
92 | + array_push($temp, $i); |
|
93 | 93 | return $temp; |
94 | 94 | } |
95 | 95 | } |
@@ -8,27 +8,27 @@ |
||
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 | $this->connection["$_name"] = $_connection; |
13 | 13 | $this->currentConnection = $_connection; |
14 | 14 | |
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 | } |
19 | - public function setConnection( $_name ) { |
|
19 | + public function setConnection($_name) { |
|
20 | 20 | $this->currentConnection = $this->connection["$_name"]; |
21 | 21 | } |
22 | - public function query( $_query ) { |
|
22 | + public function query($_query) { |
|
23 | 23 | return $this->currentConnection->database->query($_query); |
24 | 24 | } |
25 | - public function queryInsert( $_query ) { |
|
25 | + public function queryInsert($_query) { |
|
26 | 26 | return $this->currentConnection->database->queryInsert($_query); |
27 | 27 | } |
28 | - public function queryFetch( $_query ) { |
|
28 | + public function queryFetch($_query) { |
|
29 | 29 | return $this->currentConnection->database->queryFetch($_query); |
30 | 30 | } |
31 | - public function queryArray( $_query ) { |
|
31 | + public function queryArray($_query) { |
|
32 | 32 | return $this->currentConnection->database->queryArray($_query); |
33 | 33 | } |
34 | 34 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | - declare( strict_types = 1 ); |
|
2 | + declare(strict_types = 1); |
|
3 | 3 | |
4 | 4 | use PHPUnit\Framework\TestCase; |
5 | 5 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function testAddModuleNoModule() { |
33 | 33 | $this->expectException(InvalidArgumentException::class); |
34 | 34 | $module = new Module(); |
35 | - $module->addModule((object)[1,2,3]); |
|
35 | + $module->addModule((object) [1, 2, 3]); |
|
36 | 36 | } |
37 | 37 | public function testAddModules() { |
38 | 38 | $this->expectException(InvalidArgumentException::class); |
@@ -41,18 +41,18 @@ discard block |
||
41 | 41 | } |
42 | 42 | public function testGetCss() { |
43 | 43 | $module = new Module(); |
44 | - $module->addFiles(["1.css","2.js","3.css","4.js"]); |
|
45 | - $this->assertEquals(["1.css","3.css"], $module->getCss()); |
|
44 | + $module->addFiles(["1.css", "2.js", "3.css", "4.js"]); |
|
45 | + $this->assertEquals(["1.css", "3.css"], $module->getCss()); |
|
46 | 46 | } |
47 | 47 | public function testGetJs() { |
48 | 48 | $module = new Module(); |
49 | - $module->addFiles(["1.css","2.js","3.css","4.js"]); |
|
50 | - $this->assertEquals(["2.js","4.js"], $module->getJs()); |
|
49 | + $module->addFiles(["1.css", "2.js", "3.css", "4.js"]); |
|
50 | + $this->assertEquals(["2.js", "4.js"], $module->getJs()); |
|
51 | 51 | } |
52 | 52 | public function testGetJsVariables() { |
53 | 53 | $module = new Module(); |
54 | - $module->addFiles(["1.css",["variable","2"],"3.css","4.js"]); |
|
55 | - $this->assertEquals([["variable","2"]], $module->getJsVariables()); |
|
54 | + $module->addFiles(["1.css", ["variable", "2"], "3.css", "4.js"]); |
|
55 | + $this->assertEquals([["variable", "2"]], $module->getJsVariables()); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | ?> |