@@ -104,11 +104,11 @@ |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
| 107 | - * Returns an array of directoris to search thru |
|
| 108 | - * |
|
| 109 | - * @param string $environment |
|
| 110 | - * @return array |
|
| 111 | - */ |
|
| 107 | + * Returns an array of directoris to search thru |
|
| 108 | + * |
|
| 109 | + * @param string $environment |
|
| 110 | + * @return array |
|
| 111 | + */ |
|
| 112 | 112 | protected function searchDirs(string $environment): array |
| 113 | 113 | { |
| 114 | 114 | $envs = preg_split( |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | public function load(string $group = '', string $environment = ''): object |
| 73 | 73 | { |
| 74 | 74 | foreach ($this->globFiles($group, $environment) as $file) { |
| 75 | - $grp = explode('.', basename($file), 2)[0]; |
|
| 75 | + $grp = explode('.', basename($file), 2)[0]; |
|
| 76 | 76 | $this->tree->add($grp, $this->reader->readFile($file)); |
| 77 | 77 | } |
| 78 | 78 | return $this; |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | protected function globFiles(string $group, string $environment): array |
| 97 | 97 | { |
| 98 | 98 | $files = []; |
| 99 | - $grp = ($group ?: '*') . '.*'; |
|
| 99 | + $grp = ($group ?: '*').'.*'; |
|
| 100 | 100 | foreach ($this->searchDirs($environment) as $dir) { |
| 101 | - $globs = \glob($dir . \DIRECTORY_SEPARATOR . $grp); |
|
| 101 | + $globs = \glob($dir.\DIRECTORY_SEPARATOR.$grp); |
|
| 102 | 102 | $files = array_merge($files, $globs ?: []); |
| 103 | 103 | } |
| 104 | 104 | return $files; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | protected function searchDirs(string $environment): array |
| 114 | 114 | { |
| 115 | - $envs = preg_split( |
|
| 115 | + $envs = preg_split( |
|
| 116 | 116 | '~/~', |
| 117 | 117 | trim($environment ?: $this->environment, '/'), |
| 118 | 118 | -1, |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | $d = $this->root_dir; |
| 123 | - $dirs = [ $d ]; |
|
| 123 | + $dirs = [$d]; |
|
| 124 | 124 | foreach ($envs as $p) { |
| 125 | - $d .= \DIRECTORY_SEPARATOR . $p; |
|
| 125 | + $d .= \DIRECTORY_SEPARATOR.$p; |
|
| 126 | 126 | $dirs[] = $d; |
| 127 | 127 | } |
| 128 | 128 | return $dirs; |