XaBerr /
JATE
@@ -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 | } |
