@@ -56,8 +56,7 @@ |
||
| 56 | 56 | foreach ($combinedNamespaces as $namespace) { |
| 57 | 57 | $bundle = $this->getBundle($locale, $namespace); |
| 58 | 58 | $bundle = $bundle !== null ? $bundle : $this->getBundle($defaultLocale, $namespace); |
| 59 | - $data[$locale][$namespace] = $defaultLocale === $locale ? $this->encodeBundle($bundle) : |
|
| 60 | - $this->encodeMergedBundles($bundle, $this->getBundle($defaultLocale, $namespace)); |
|
| 59 | + $data[$locale][$namespace] = $defaultLocale === $locale ? $this->encodeBundle($bundle) : $this->encodeMergedBundles($bundle, $this->getBundle($defaultLocale, $namespace)); |
|
| 61 | 60 | } |
| 62 | 61 | } |
| 63 | 62 | |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | public function setProperties(array $properties): self |
| 119 | 119 | { |
| 120 | 120 | // check all keys and values are non-empty strings |
| 121 | - assert(call_user_func(function () use ($properties) { |
|
| 121 | + assert(call_user_func(function() use ($properties) { |
|
| 122 | 122 | $result = true; |
| 123 | 123 | foreach ($properties as $key => $value) { |
| 124 | 124 | $result = $result === true && |
@@ -249,7 +249,7 @@ |
||
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
| 252 | - * @param mixed $value |
|
| 252 | + * @param string $value |
|
| 253 | 253 | * |
| 254 | 254 | * @return bool |
| 255 | 255 | */ |
@@ -88,10 +88,10 @@ |
||
| 88 | 88 | |
| 89 | 89 | foreach (scandir($localesDir) as $fileOrDir) { |
| 90 | 90 | if ($fileOrDir !== '.' && $fileOrDir !== '..' && |
| 91 | - is_dir($localeDirFullPath = $localesDir . DIRECTORY_SEPARATOR . $fileOrDir . DIRECTORY_SEPARATOR) |
|
| 91 | + is_dir($localeDirFullPath = $localesDir.DIRECTORY_SEPARATOR.$fileOrDir.DIRECTORY_SEPARATOR) |
|
| 92 | 92 | ) { |
| 93 | 93 | $localeDir = $fileOrDir; |
| 94 | - foreach (glob($localeDirFullPath . $this->getGlobMessagePatterns()) as $messageFile) { |
|
| 94 | + foreach (glob($localeDirFullPath.$this->getGlobMessagePatterns()) as $messageFile) { |
|
| 95 | 95 | $namespace = pathinfo($messageFile, PATHINFO_FILENAME); |
| 96 | 96 | $bundle = $this->loadBundleFromFile($messageFile, $localeDir, $namespace); |
| 97 | 97 | $this->addBundle($bundle); |