spiral / framework

src/Translator/src/Config/TranslatorConfig.php

Spacing +7 added lines, -7 removed lines

@@ -101,11 +101,11 @@ 
      */
     public function getLocaleDirectory(string $locale, ?string $directory = null): string
     {
-        if ($directory !== null) {
-            return \rtrim($directory, '/') . '/' . $locale . '/';
+        if ($directory !== null){
+            return \rtrim($directory, '/').'/'.$locale.'/';
         }
 
-        return \trim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
+        return \trim($this->getLocalesDirectory(), '/').'/'.$locale.'/';
     }
 
     /**
@@ -114,11 +114,11 @@ 
     public function resolveDomain(string $bundle): string
     {
         $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle));
-        $domains = (array) ($this->config['domains'] ?? []);
+        $domains = (array)($this->config['domains'] ?? []);
 
-        foreach ($domains as $domain => $patterns) {
-            foreach ($patterns as $pattern) {
-                if ($this->matcher->matches($bundle, $pattern)) {
+        foreach ($domains as $domain => $patterns){
+            foreach ($patterns as $pattern){
+                if ($this->matcher->matches($bundle, $pattern)){
                     return $domain;
                 }
             }

Braces +8 added lines, -4 removed lines

@@ -101,7 +101,8 @@ 
      */
     public function getLocaleDirectory(string $locale, ?string $directory = null): string
     {
-        if ($directory !== null) {
+        if ($directory !== null)
+        {
             return \rtrim($directory, '/') . '/' . $locale . '/';
         }
 
@@ -116,9 +117,12 @@ 
         $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle));
         $domains = (array) ($this->config['domains'] ?? []);
 
-        foreach ($domains as $domain => $patterns) {
-            foreach ($patterns as $pattern) {
-                if ($this->matcher->matches($bundle, $pattern)) {
+        foreach ($domains as $domain => $patterns)
+        {
+            foreach ($patterns as $pattern)
+            {
+                if ($this->matcher->matches($bundle, $pattern))
+                {
                     return $domain;
                 }
             }

src/Translator/src/Catalogue/CatalogueLoader.php

Spacing +13 added lines, -13 removed lines

@@ -16,15 +16,15 @@ 
 
     public function __construct(
         private readonly TranslatorConfig $config
-    ) {
+    ){
     }
 
     public function hasLocale(string $locale): bool
     {
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
 
-        foreach ($this->getDirectories() as $directory) {
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
+        foreach ($this->getDirectories() as $directory){
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))){
                 return true;
             }
         }
@@ -35,13 +35,13 @@ 
     public function getLocales(): array
     {
         $directories = $this->getDirectories();
-        if ($directories === []) {
+        if ($directories === []){
             return [];
         }
 
         $finder = new Finder();
         $locales = [];
-        foreach ($finder->in($directories)->directories() as $directory) {
+        foreach ($finder->in($directories)->directories() as $directory){
             $locales[] = $directory->getFilename();
         }
 
@@ -53,19 +53,19 @@ 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale)){
             return $catalogue;
         }
 
         $directories = [];
-        foreach ($this->getDirectories() as $directory) {
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
+        foreach ($this->getDirectories() as $directory){
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))){
                 $directories[] = $this->config->getLocaleDirectory($locale, $directory);
             }
         }
 
         $finder = new Finder();
-        foreach ($finder->in($directories)->files() as $file) {
+        foreach ($finder->in($directories)->files() as $file){
             $this->getLogger()->info(
                 \sprintf(
                     "found locale domain file '%s'",
@@ -77,7 +77,7 @@ 
             //Per application agreement domain name must present in filename
             $domain = \strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension())){
                 $this->getLogger()->warning(
                     \sprintf(
                         "unable to load domain file '%s', no loader found",
@@ -107,12 +107,12 @@ 
     private function getDirectories(): array
     {
         $directories = [];
-        if (\is_dir($this->config->getLocalesDirectory())) {
+        if (\is_dir($this->config->getLocalesDirectory())){
             $directories[] = $this->config->getLocalesDirectory();
         }
 
-        foreach ($this->config->getDirectories() as $directory) {
-            if (\is_dir($directory)) {
+        foreach ($this->config->getDirectories() as $directory){
+            if (\is_dir($directory)){
                 $directories[] = $directory;
             }
         }

Braces +24 added lines, -12 removed lines

@@ -23,8 +23,10 @@ 
     {
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
 
-        foreach ($this->getDirectories() as $directory) {
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
+        foreach ($this->getDirectories() as $directory)
+        {
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory)))
+            {
                 return true;
             }
         }
@@ -35,13 +37,15 @@ 
     public function getLocales(): array
     {
         $directories = $this->getDirectories();
-        if ($directories === []) {
+        if ($directories === [])
+        {
             return [];
         }
 
         $finder = new Finder();
         $locales = [];
-        foreach ($finder->in($directories)->directories() as $directory) {
+        foreach ($finder->in($directories)->directories() as $directory)
+        {
             $locales[] = $directory->getFilename();
         }
 
@@ -53,19 +57,23 @@ 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale))
+        {
             return $catalogue;
         }
 
         $directories = [];
-        foreach ($this->getDirectories() as $directory) {
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
+        foreach ($this->getDirectories() as $directory)
+        {
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory)))
+            {
                 $directories[] = $this->config->getLocaleDirectory($locale, $directory);
             }
         }
 
         $finder = new Finder();
-        foreach ($finder->in($directories)->files() as $file) {
+        foreach ($finder->in($directories)->files() as $file)
+        {
             $this->getLogger()->info(
                 \sprintf(
                     "found locale domain file '%s'",
@@ -77,7 +85,8 @@ 
             //Per application agreement domain name must present in filename
             $domain = \strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension()))
+            {
                 $this->getLogger()->warning(
                     \sprintf(
                         "unable to load domain file '%s', no loader found",
@@ -107,12 +116,15 @@ 
     private function getDirectories(): array
     {
         $directories = [];
-        if (\is_dir($this->config->getLocalesDirectory())) {
+        if (\is_dir($this->config->getLocalesDirectory()))
+        {
             $directories[] = $this->config->getLocalesDirectory();
         }
 
-        foreach ($this->config->getDirectories() as $directory) {
-            if (\is_dir($directory)) {
+        foreach ($this->config->getDirectories() as $directory)
+        {
+            if (\is_dir($directory))
+            {
                 $directories[] = $directory;
             }
         }

src/Translator/tests/LoaderTest.php

Spacing +12 added lines, -12 removed lines

@@ -18,7 +18,7 @@ 
     public function testHasLocale(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
         ]));
 
         $this->assertTrue($loader->hasLocale('ru'));
@@ -27,8 +27,8 @@ 
         $this->assertFalse($loader->hasLocale('FR'));
 
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
-            'directories' => [__DIR__ . '/fixtures/additional'],
+            'directory' => __DIR__.'/fixtures/locales/',
+            'directories' => [__DIR__.'/fixtures/additional'],
         ]));
 
         $this->assertTrue($loader->hasLocale('ru'));
@@ -40,7 +40,7 @@ 
     public function testGetLocales(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
         ]));
 
         $compared = $loader->getLocales();
@@ -54,8 +54,8 @@ 
     public function testGetLocalesWithAdditionalDirectories(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
-            'directories' => [__DIR__ . '/fixtures/additional'],
+            'directory' => __DIR__.'/fixtures/locales/',
+            'directories' => [__DIR__.'/fixtures/additional'],
         ]));
 
         $compared = $loader->getLocales();
@@ -69,7 +69,7 @@ 
     public function testLoadCatalogue(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
             'loaders'   => [
                 'php' => PhpFileLoader::class,
                 'po'  => PoFileLoader::class,
@@ -111,8 +111,8 @@ 
     public function testLoadCatalogueWithAdditionalDirectories(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
-            'directories' => [__DIR__ . '/fixtures/additional'],
+            'directory' => __DIR__.'/fixtures/locales/',
+            'directories' => [__DIR__.'/fixtures/additional'],
             'loaders'   => [
                 'php' => PhpFileLoader::class,
                 'po'  => PoFileLoader::class,
@@ -136,8 +136,8 @@ 
     public function testApplicationTranslationShouldOverrideAdditionalTranslations(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
-            'directories' => [__DIR__ . '/fixtures/additional'],
+            'directory' => __DIR__.'/fixtures/locales/',
+            'directories' => [__DIR__.'/fixtures/additional'],
             'loaders'   => [
                 'php' => PhpFileLoader::class,
                 'po'  => PoFileLoader::class,
@@ -154,7 +154,7 @@ 
     public function testLoadCatalogueNoLoader(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
             'loaders'   => [
                 'php' => PhpFileLoader::class,
             ],