View GitHub Repository framework

Schedule Inspection
Subscribe
Passed
Push — master ( fe8484...90b95a )
by butschster
17:12 queued 18s
created
Status
Category
Toggle Patches
src/Translator/src/Config/TranslatorConfig.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -101,11 +101,11 @@  discard block
 
 block discarded – undo
101 101 
      */
102 102 
     public function getLocaleDirectory(string $locale, ?string $directory = null): string
103 103 
     {
104 
-        if ($directory !== null) {
105 
-            return \rtrim($directory, '/') . '/' . $locale . '/';
104 
+        if ($directory !== null){
105 
+            return \rtrim($directory, '/').'/'.$locale.'/';
106 106 
         }
107 107
108 
-        return \trim($this->getLocalesDirectory(), '/') . '/' . $locale . '/';
108 
+        return \trim($this->getLocalesDirectory(), '/').'/'.$locale.'/';
109 109 
     }
110 110
111 111 
     /**
 
@@ -114,11 +114,11 @@  discard block
 
 block discarded – undo
114 114 
     public function resolveDomain(string $bundle): string
115 115 
     {
116 116 
         $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle));
117 
-        $domains = (array) ($this->config['domains'] ?? []);
117 
+        $domains = (array)($this->config['domains'] ?? []);
118 118
119 
-        foreach ($domains as $domain => $patterns) {
120 
-            foreach ($patterns as $pattern) {
121 
-                if ($this->matcher->matches($bundle, $pattern)) {
119 
+        foreach ($domains as $domain => $patterns){
120 
+            foreach ($patterns as $pattern){
121 
+                if ($this->matcher->matches($bundle, $pattern)){
122 122 
                     return $domain;
123 123 
                 }
124 124 
             }
Please login to merge, or discard this patch.
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -101,7 +101,8 @@  discard block
 
 block discarded – undo
101 101 
      */
102 102 
     public function getLocaleDirectory(string $locale, ?string $directory = null): string
103 103 
     {
104 
-        if ($directory !== null) {
104 
+        if ($directory !== null)
105 
+        {
105 106 
             return \rtrim($directory, '/') . '/' . $locale . '/';
106 107 
         }
107 108 
 
@@ -116,9 +117,12 @@  discard block
 
 block discarded – undo
116 117 
         $bundle = \strtolower(\str_replace(['/', '\\'], '-', $bundle));
117 118 
         $domains = (array) ($this->config['domains'] ?? []);
118 119
119 
-        foreach ($domains as $domain => $patterns) {
120 
-            foreach ($patterns as $pattern) {
121 
-                if ($this->matcher->matches($bundle, $pattern)) {
120 
+        foreach ($domains as $domain => $patterns)
121 
+        {
122 
+            foreach ($patterns as $pattern)
123 
+            {
124 
+                if ($this->matcher->matches($bundle, $pattern))
125 
+                {
122 126 
                     return $domain;
123 127 
                 }
124 128 
             }
Please login to merge, or discard this patch.
src/Translator/src/Catalogue/CatalogueLoader.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -16,15 +16,15 @@  discard block
 
 block discarded – undo
16 16
17 17 
     public function __construct(
18 18 
         private readonly TranslatorConfig $config
19 
-    ) {
19 
+    ){
20 20 
     }
21 21
22 22 
     public function hasLocale(string $locale): bool
23 23 
     {
24 24 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
25 25
26 
-        foreach ($this->getDirectories() as $directory) {
27 
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
26 
+        foreach ($this->getDirectories() as $directory){
27 
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))){
28 28 
                 return true;
29 29 
             }
30 30 
         }
 
@@ -35,13 +35,13 @@  discard block
 
 block discarded – undo
35 35 
     public function getLocales(): array
36 36 
     {
37 37 
         $directories = $this->getDirectories();
38 
-        if ($directories === []) {
38 
+        if ($directories === []){
39 39 
             return [];
40 40 
         }
41 41
42 42 
         $finder = new Finder();
43 43 
         $locales = [];
44 
-        foreach ($finder->in($directories)->directories() as $directory) {
44 
+        foreach ($finder->in($directories)->directories() as $directory){
45 45 
             $locales[] = $directory->getFilename();
46 46 
         }
47 47 
 
@@ -53,19 +53,19 @@  discard block
 
 block discarded – undo
53 53 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
54 54 
         $catalogue = new Catalogue($locale);
55 55
56 
-        if (!$this->hasLocale($locale)) {
56 
+        if (!$this->hasLocale($locale)){
57 57 
             return $catalogue;
58 58 
         }
59 59
60 60 
         $directories = [];
61 
-        foreach ($this->getDirectories() as $directory) {
62 
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
61 
+        foreach ($this->getDirectories() as $directory){
62 
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))){
63 63 
                 $directories[] = $this->config->getLocaleDirectory($locale, $directory);
64 64 
             }
65 65 
         }
66 66
67 67 
         $finder = new Finder();
68 
-        foreach ($finder->in($directories)->files() as $file) {
68 
+        foreach ($finder->in($directories)->files() as $file){
69 69 
             $this->getLogger()->info(
70 70 
                 \sprintf(
71 71 
                     "found locale domain file '%s'",
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
             //Per application agreement domain name must present in filename
78 78 
             $domain = \strstr($file->getFilename(), '.', true);
79 79
80 
-            if (!$this->config->hasLoader($file->getExtension())) {
80 
+            if (!$this->config->hasLoader($file->getExtension())){
81 81 
                 $this->getLogger()->warning(
82 82 
                     \sprintf(
83 83 
                         "unable to load domain file '%s', no loader found",
 
@@ -107,12 +107,12 @@  discard block
 
 block discarded – undo
107 107 
     private function getDirectories(): array
108 108 
     {
109 109 
         $directories = [];
110 
-        if (\is_dir($this->config->getLocalesDirectory())) {
110 
+        if (\is_dir($this->config->getLocalesDirectory())){
111 111 
             $directories[] = $this->config->getLocalesDirectory();
112 112 
         }
113 113
114 
-        foreach ($this->config->getDirectories() as $directory) {
115 
-            if (\is_dir($directory)) {
114 
+        foreach ($this->config->getDirectories() as $directory){
115 
+            if (\is_dir($directory)){
116 116 
                 $directories[] = $directory;
117 117 
             }
118 118 
         }
Please login to merge, or discard this patch.
Braces   +24 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -23,8 +23,10 @@  discard block
 
 block discarded – undo
23 23 
     {
24 24 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
25 25
26 
-        foreach ($this->getDirectories() as $directory) {
27 
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
26 
+        foreach ($this->getDirectories() as $directory)
27 
+        {
28 
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory)))
29 
+            {
28 30 
                 return true;
29 31 
             }
30 32 
         }
 
@@ -35,13 +37,15 @@  discard block
 
 block discarded – undo
35 37 
     public function getLocales(): array
36 38 
     {
37 39 
         $directories = $this->getDirectories();
38 
-        if ($directories === []) {
40 
+        if ($directories === [])
41 
+        {
39 42 
             return [];
40 43 
         }
41 44
42 45 
         $finder = new Finder();
43 46 
         $locales = [];
44 
-        foreach ($finder->in($directories)->directories() as $directory) {
47 
+        foreach ($finder->in($directories)->directories() as $directory)
48 
+        {
45 49 
             $locales[] = $directory->getFilename();
46 50 
         }
47 51 
 
@@ -53,19 +57,23 @@  discard block
 
 block discarded – undo
53 57 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
54 58 
         $catalogue = new Catalogue($locale);
55 59
56 
-        if (!$this->hasLocale($locale)) {
60 
+        if (!$this->hasLocale($locale))
61 
+        {
57 62 
             return $catalogue;
58 63 
         }
59 64
60 65 
         $directories = [];
61 
-        foreach ($this->getDirectories() as $directory) {
62 
-            if (\is_dir($this->config->getLocaleDirectory($locale, $directory))) {
66 
+        foreach ($this->getDirectories() as $directory)
67 
+        {
68 
+            if (\is_dir($this->config->getLocaleDirectory($locale, $directory)))
69 
+            {
63 70 
                 $directories[] = $this->config->getLocaleDirectory($locale, $directory);
64 71 
             }
65 72 
         }
66 73
67 74 
         $finder = new Finder();
68 
-        foreach ($finder->in($directories)->files() as $file) {
75 
+        foreach ($finder->in($directories)->files() as $file)
76 
+        {
69 77 
             $this->getLogger()->info(
70 78 
                 \sprintf(
71 79 
                     "found locale domain file '%s'",
 
@@ -77,7 +85,8 @@  discard block
 
 block discarded – undo
77 85 
             //Per application agreement domain name must present in filename
78 86 
             $domain = \strstr($file->getFilename(), '.', true);
79 87
80 
-            if (!$this->config->hasLoader($file->getExtension())) {
88 
+            if (!$this->config->hasLoader($file->getExtension()))
89 
+            {
81 90 
                 $this->getLogger()->warning(
82 91 
                     \sprintf(
83 92 
                         "unable to load domain file '%s', no loader found",
 
@@ -107,12 +116,15 @@  discard block
 
 block discarded – undo
107 116 
     private function getDirectories(): array
108 117 
     {
109 118 
         $directories = [];
110 
-        if (\is_dir($this->config->getLocalesDirectory())) {
119 
+        if (\is_dir($this->config->getLocalesDirectory()))
120 
+        {
111 121 
             $directories[] = $this->config->getLocalesDirectory();
112 122 
         }
113 123
114 
-        foreach ($this->config->getDirectories() as $directory) {
115 
-            if (\is_dir($directory)) {
124 
+        foreach ($this->config->getDirectories() as $directory)
125 
+        {
126 
+            if (\is_dir($directory))
127 
+            {
116 128 
                 $directories[] = $directory;
117 129 
             }
118 130 
         }
Please login to merge, or discard this patch.
src/Translator/tests/LoaderTest.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -18,7 +18,7 @@  discard block
 
 block discarded – undo
18 18 
     public function testHasLocale(): void
19 19 
     {
20 20 
         $loader = new CatalogueLoader(new TranslatorConfig([
21 
-            'directory' => __DIR__ . '/fixtures/locales/',
21 
+            'directory' => __DIR__.'/fixtures/locales/',
22 22 
         ]));
23 23
24 24 
         $this->assertTrue($loader->hasLocale('ru'));
 
@@ -27,8 +27,8 @@  discard block
 
 block discarded – undo
27 27 
         $this->assertFalse($loader->hasLocale('FR'));
28 28
29 29 
         $loader = new CatalogueLoader(new TranslatorConfig([
30 
-            'directory' => __DIR__ . '/fixtures/locales/',
31 
-            'directories' => [__DIR__ . '/fixtures/additional'],
30 
+            'directory' => __DIR__.'/fixtures/locales/',
31 
+            'directories' => [__DIR__.'/fixtures/additional'],
32 32 
         ]));
33 33
34 34 
         $this->assertTrue($loader->hasLocale('ru'));
 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
     public function testGetLocales(): void
41 41 
     {
42 42 
         $loader = new CatalogueLoader(new TranslatorConfig([
43 
-            'directory' => __DIR__ . '/fixtures/locales/',
43 
+            'directory' => __DIR__.'/fixtures/locales/',
44 44 
         ]));
45 45
46 46 
         $compared = $loader->getLocales();
 
@@ -54,8 +54,8 @@  discard block
 
 block discarded – undo
54 54 
     public function testGetLocalesWithAdditionalDirectories(): void
55 55 
     {
56 56 
         $loader = new CatalogueLoader(new TranslatorConfig([
57 
-            'directory' => __DIR__ . '/fixtures/locales/',
58 
-            'directories' => [__DIR__ . '/fixtures/additional'],
57 
+            'directory' => __DIR__.'/fixtures/locales/',
58 
+            'directories' => [__DIR__.'/fixtures/additional'],
59 59 
         ]));
60 60
61 61 
         $compared = $loader->getLocales();
 
@@ -69,7 +69,7 @@  discard block
 
 block discarded – undo
69 69 
     public function testLoadCatalogue(): void
70 70 
     {
71 71 
         $loader = new CatalogueLoader(new TranslatorConfig([
72 
-            'directory' => __DIR__ . '/fixtures/locales/',
72 
+            'directory' => __DIR__.'/fixtures/locales/',
73 73 
             'loaders'   => [
74 74 
                 'php' => PhpFileLoader::class,
75 75 
                 'po'  => PoFileLoader::class,
 
@@ -111,8 +111,8 @@  discard block
 
 block discarded – undo
111 111 
     public function testLoadCatalogueWithAdditionalDirectories(): void
112 112 
     {
113 113 
         $loader = new CatalogueLoader(new TranslatorConfig([
114 
-            'directory' => __DIR__ . '/fixtures/locales/',
115 
-            'directories' => [__DIR__ . '/fixtures/additional'],
114 
+            'directory' => __DIR__.'/fixtures/locales/',
115 
+            'directories' => [__DIR__.'/fixtures/additional'],
116 116 
             'loaders'   => [
117 117 
                 'php' => PhpFileLoader::class,
118 118 
                 'po'  => PoFileLoader::class,
 
@@ -136,8 +136,8 @@  discard block
 
 block discarded – undo
136 136 
     public function testApplicationTranslationShouldOverrideAdditionalTranslations(): void
137 137 
     {
138 138 
         $loader = new CatalogueLoader(new TranslatorConfig([
139 
-            'directory' => __DIR__ . '/fixtures/locales/',
140 
-            'directories' => [__DIR__ . '/fixtures/additional'],
139 
+            'directory' => __DIR__.'/fixtures/locales/',
140 
+            'directories' => [__DIR__.'/fixtures/additional'],
141 141 
             'loaders'   => [
142 142 
                 'php' => PhpFileLoader::class,
143 143 
                 'po'  => PoFileLoader::class,
 
@@ -154,7 +154,7 @@  discard block
 
 block discarded – undo
154 154 
     public function testLoadCatalogueNoLoader(): void
155 155 
     {
156 156 
         $loader = new CatalogueLoader(new TranslatorConfig([
157 
-            'directory' => __DIR__ . '/fixtures/locales/',
157 
+            'directory' => __DIR__.'/fixtures/locales/',
158 158 
             'loaders'   => [
159 159 
                 'php' => PhpFileLoader::class,
160 160 
             ],
Please login to merge, or discard this patch.