@@ -39,6 +39,10 @@ discard block |
||
39 | 39 | array_push($temp,$i); |
40 | 40 | return $temp; |
41 | 41 | } |
42 | + |
|
43 | + /** |
|
44 | + * @param string $_mods |
|
45 | + */ |
|
42 | 46 | public function addModules( $_mods ) { |
43 | 47 | if(!is_array($_mods)) |
44 | 48 | throw new InvalidArgumentException("Parameter must be an array."); |
@@ -64,6 +68,10 @@ discard block |
||
64 | 68 | throw new InvalidArgumentException("Parameter must be a string."); |
65 | 69 | array_push($this->files, $_file); |
66 | 70 | } |
71 | + |
|
72 | + /** |
|
73 | + * @param string $_files |
|
74 | + */ |
|
67 | 75 | public function addFilesRequired( $_files ) { |
68 | 76 | if(!is_array($_files)) |
69 | 77 | throw new InvalidArgumentException("Parameter must be an array."); |
@@ -80,6 +88,11 @@ discard block |
||
80 | 88 | $this->tags["js"] = $this->getJs(); |
81 | 89 | $this->tags["jsVariables"] = $this->getJsVariables(); |
82 | 90 | } |
91 | + |
|
92 | + /** |
|
93 | + * @param string $_function |
|
94 | + * @param string $_extenction |
|
95 | + */ |
|
83 | 96 | protected function getRequire( $_function, $_extenction) { |
84 | 97 | $temp = []; |
85 | 98 | foreach ($this->required as $i) |
@@ -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)) |
|
62 | + public function addFile($_file) { |
|
63 | + if (!is_string($_file)) |
|
64 | 64 | throw new InvalidArgumentException("Parameter must be a string."); |
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 | } |
@@ -29,50 +29,63 @@ discard block |
||
29 | 29 | } |
30 | 30 | public function getJsVariables() { |
31 | 31 | $temp = []; |
32 | - foreach ($this->required as $i) |
|
33 | - if (is_array($i)) |
|
32 | + foreach ($this->required as $i) { |
|
33 | + if (is_array($i)) |
|
34 | 34 | array_push($temp,$i); |
35 | - foreach ($this->modules as $i) |
|
36 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
37 | - foreach ($this->files as $i) |
|
38 | - if (is_array($i)) |
|
35 | + } |
|
36 | + foreach ($this->modules as $i) { |
|
37 | + $temp = array_merge( $temp, $i->getJsVariables() ); |
|
38 | + } |
|
39 | + foreach ($this->files as $i) { |
|
40 | + if (is_array($i)) |
|
39 | 41 | array_push($temp,$i); |
42 | + } |
|
40 | 43 | return $temp; |
41 | 44 | } |
42 | 45 | public function addModules( $_mods ) { |
43 | - if(!is_array($_mods)) |
|
44 | - throw new InvalidArgumentException("Parameter must be an array."); |
|
45 | - foreach ($_mods as $value) |
|
46 | - $this->addModule($value); |
|
46 | + if(!is_array($_mods)) { |
|
47 | + throw new InvalidArgumentException("Parameter must be an array."); |
|
48 | + } |
|
49 | + foreach ($_mods as $value) { |
|
50 | + $this->addModule($value); |
|
51 | + } |
|
47 | 52 | } |
48 | 53 | public function addModule( $_mod ) { |
49 | - if(!is_object($_mod)) |
|
50 | - throw new InvalidArgumentException("Parameter must be a class."); |
|
51 | - if(! is_subclass_of ($_mod, "Module")) |
|
52 | - throw new InvalidArgumentException("Parameter must be a class."); |
|
54 | + if(!is_object($_mod)) { |
|
55 | + throw new InvalidArgumentException("Parameter must be a class."); |
|
56 | + } |
|
57 | + if(! is_subclass_of ($_mod, "Module")) { |
|
58 | + throw new InvalidArgumentException("Parameter must be a class."); |
|
59 | + } |
|
53 | 60 | $this->modules[$_mod->name] = $_mod; |
54 | 61 | $this->modules[$_mod->name]->parameters = &$this->parameters; |
55 | 62 | } |
56 | 63 | public function addFiles( $_files ) { |
57 | - if(!is_array($_files)) |
|
58 | - throw new InvalidArgumentException("Parameter must be an array."); |
|
59 | - foreach ($_files as $value) |
|
60 | - $this->addFile($value); |
|
64 | + if(!is_array($_files)) { |
|
65 | + throw new InvalidArgumentException("Parameter must be an array."); |
|
66 | + } |
|
67 | + foreach ($_files as $value) { |
|
68 | + $this->addFile($value); |
|
69 | + } |
|
61 | 70 | } |
62 | 71 | public function addFile( $_file ) { |
63 | - if(!is_string($_file)) |
|
64 | - throw new InvalidArgumentException("Parameter must be a string."); |
|
72 | + if(!is_string($_file)) { |
|
73 | + throw new InvalidArgumentException("Parameter must be a string."); |
|
74 | + } |
|
65 | 75 | array_push($this->files, $_file); |
66 | 76 | } |
67 | 77 | public function addFilesRequired( $_files ) { |
68 | - if(!is_array($_files)) |
|
69 | - throw new InvalidArgumentException("Parameter must be an array."); |
|
70 | - foreach ($_files as $value) |
|
71 | - $this->addFileRequired($value); |
|
78 | + if(!is_array($_files)) { |
|
79 | + throw new InvalidArgumentException("Parameter must be an array."); |
|
80 | + } |
|
81 | + foreach ($_files as $value) { |
|
82 | + $this->addFileRequired($value); |
|
83 | + } |
|
72 | 84 | } |
73 | 85 | public function addFileRequired( $_file ) { |
74 | - if(!is_string($_file)) |
|
75 | - throw new InvalidArgumentException("Parameter must be a string."); |
|
86 | + if(!is_string($_file)) { |
|
87 | + throw new InvalidArgumentException("Parameter must be a string."); |
|
88 | + } |
|
76 | 89 | array_push($this->required, $_file); |
77 | 90 | } |
78 | 91 | protected function addDipendences() { |
@@ -82,14 +95,17 @@ discard block |
||
82 | 95 | } |
83 | 96 | protected function getRequire( $_function, $_extenction) { |
84 | 97 | $temp = []; |
85 | - foreach ($this->required as $i) |
|
86 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
98 | + foreach ($this->required as $i) { |
|
99 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
87 | 100 | array_push($temp,$i); |
88 | - foreach ($this->modules as $i) |
|
89 | - $temp = array_merge( $temp, $i->$_function() ); |
|
90 | - foreach ($this->files as $i) |
|
91 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
101 | + } |
|
102 | + foreach ($this->modules as $i) { |
|
103 | + $temp = array_merge( $temp, $i->$_function() ); |
|
104 | + } |
|
105 | + foreach ($this->files as $i) { |
|
106 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
92 | 107 | array_push($temp,$i); |
108 | + } |
|
93 | 109 | return $temp; |
94 | 110 | } |
95 | 111 | } |
@@ -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,13 +41,13 @@ 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 | } |
53 | 53 | ?> |