@@ -77,7 +77,7 @@ |
||
| 77 | 77 | $container = new Container(); |
| 78 | 78 | $container->bind(TranslatorConfig::class, new TranslatorConfig([ |
| 79 | 79 | 'locale' => 'en', |
| 80 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 80 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 81 | 81 | 'loaders' => [ |
| 82 | 82 | 'php' => PhpFileLoader::class, |
| 83 | 83 | 'po' => PoFileLoader::class, |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | $this->container->bind(TranslatorConfig::class, new TranslatorConfig([ |
| 46 | 46 | 'locale' => 'en', |
| 47 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 47 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 48 | 48 | 'loaders' => [ |
| 49 | 49 | 'php' => PhpFileLoader::class, |
| 50 | 50 | 'po' => PoFileLoader::class, |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public function testHasLocale(): void |
| 26 | 26 | { |
| 27 | 27 | $loader = new CatalogueLoader(new TranslatorConfig([ |
| 28 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 28 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 29 | 29 | ])); |
| 30 | 30 | |
| 31 | 31 | $this->assertTrue($loader->hasLocale('ru')); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | public function testGetLocales(): void |
| 36 | 36 | { |
| 37 | 37 | $loader = new CatalogueLoader(new TranslatorConfig([ |
| 38 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 38 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 39 | 39 | ])); |
| 40 | 40 | |
| 41 | 41 | $compared = $loader->getLocales(); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | public function testLoadCatalogue(): void |
| 50 | 50 | { |
| 51 | 51 | $loader = new CatalogueLoader(new TranslatorConfig([ |
| 52 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 52 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 53 | 53 | 'loaders' => [ |
| 54 | 54 | 'php' => PhpFileLoader::class, |
| 55 | 55 | 'po' => PoFileLoader::class, |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | public function testLoadCatalogueNoLoader(): void |
| 90 | 90 | { |
| 91 | 91 | $loader = new CatalogueLoader(new TranslatorConfig([ |
| 92 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 92 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 93 | 93 | 'loaders' => [ |
| 94 | 94 | 'php' => PhpFileLoader::class, |
| 95 | 95 | ], |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $cache->shouldReceive('setLocales')->andReturn(null); |
| 32 | 32 | |
| 33 | 33 | $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([ |
| 34 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 34 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 35 | 35 | 'loaders' => [ |
| 36 | 36 | 'php' => PhpFileLoader::class, |
| 37 | 37 | 'po' => PoFileLoader::class, |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $cache->shouldNotReceive('setLocales')->andReturn(null); |
| 50 | 50 | |
| 51 | 51 | $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([ |
| 52 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 52 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 53 | 53 | 'loaders' => [ |
| 54 | 54 | 'php' => PhpFileLoader::class, |
| 55 | 55 | 'po' => PoFileLoader::class, |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $cache->shouldReceive('getLocales')->andReturn(['en', 'ru']); |
| 67 | 67 | |
| 68 | 68 | $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([ |
| 69 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 69 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 70 | 70 | 'loaders' => [ |
| 71 | 71 | 'php' => PhpFileLoader::class, |
| 72 | 72 | 'po' => PoFileLoader::class, |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | ]); |
| 130 | 130 | |
| 131 | 131 | $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([ |
| 132 | - 'directory' => __DIR__ . '/fixtures/locales/', |
|
| 132 | + 'directory' => __DIR__.'/fixtures/locales/', |
|
| 133 | 133 | 'loaders' => [ |
| 134 | 134 | 'php' => PhpFileLoader::class, |
| 135 | 135 | 'po' => PoFileLoader::class, |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function getMessage(string $field, $value): string |
| 75 | 75 | { |
| 76 | - if (!empty($this->message)) { |
|
| 76 | + if (!empty($this->message)){ |
|
| 77 | 77 | return Translator::interpolate( |
| 78 | 78 | $this->message, |
| 79 | 79 | array_merge([$value, $field], $this->args) |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $name = $this->check; |
| 84 | - if (is_array($name) && isset($name[0], $name[1])) { |
|
| 84 | + if (is_array($name) && isset($name[0], $name[1])){ |
|
| 85 | 85 | $name = sprintf( |
| 86 | 86 | '%s::%s', |
| 87 | 87 | is_object($name[0]) ? get_class($name[0]) : $name, |
| 88 | 88 | $name[1] |
| 89 | 89 | ); |
| 90 | - } elseif (!is_string($name)) { |
|
| 90 | + } elseif (!is_string($name)){ |
|
| 91 | 91 | $name = '~user-defined~'; |
| 92 | 92 | } |
| 93 | 93 | |
@@ -73,7 +73,8 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function getMessage(string $field, $value): string |
| 75 | 75 | { |
| 76 | - if (!empty($this->message)) { |
|
| 76 | + if (!empty($this->message)) |
|
| 77 | + { |
|
| 77 | 78 | return Translator::interpolate( |
| 78 | 79 | $this->message, |
| 79 | 80 | array_merge([$value, $field], $this->args) |
@@ -81,13 +82,16 @@ discard block |
||
| 81 | 82 | } |
| 82 | 83 | |
| 83 | 84 | $name = $this->check; |
| 84 | - if (is_array($name) && isset($name[0], $name[1])) { |
|
| 85 | + if (is_array($name) && isset($name[0], $name[1])) |
|
| 86 | + { |
|
| 85 | 87 | $name = sprintf( |
| 86 | 88 | '%s::%s', |
| 87 | 89 | is_object($name[0]) ? get_class($name[0]) : $name, |
| 88 | 90 | $name[1] |
| 89 | 91 | ); |
| 90 | - } elseif (!is_string($name)) { |
|
| 92 | + } |
|
| 93 | + elseif (!is_string($name)) |
|
| 94 | + { |
|
| 91 | 95 | $name = '~user-defined~'; |
| 92 | 96 | } |
| 93 | 97 | |
@@ -40,11 +40,11 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | public function getConditions(): \Generator |
| 42 | 42 | { |
| 43 | - if (empty($this->conditions)) { |
|
| 43 | + if (empty($this->conditions)){ |
|
| 44 | 44 | return; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - foreach ($this->conditions as $condition) { |
|
| 47 | + foreach ($this->conditions as $condition){ |
|
| 48 | 48 | yield $condition->withOptions($this->conditions->offsetGet($condition)); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -40,11 +40,13 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | public function getConditions(): \Generator |
| 42 | 42 | { |
| 43 | - if (empty($this->conditions)) { |
|
| 43 | + if (empty($this->conditions)) |
|
| 44 | + { |
|
| 44 | 45 | return; |
| 45 | 46 | } |
| 46 | 47 | |
| 47 | - foreach ($this->conditions as $condition) { |
|
| 48 | + foreach ($this->conditions as $condition) |
|
| 49 | + { |
|
| 48 | 50 | yield $condition->withOptions($this->conditions->offsetGet($condition)); |
| 49 | 51 | } |
| 50 | 52 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ValidatorConfig $config, |
| 42 | 42 | ParserInterface $parser = null, |
| 43 | 43 | FactoryInterface $factory = null |
| 44 | - ) { |
|
| 44 | + ){ |
|
| 45 | 45 | $this->config = $config; |
| 46 | 46 | $this->parser = $parser ?? new RuleParser(); |
| 47 | 47 | $this->factory = $factory ?? new Container(); |
@@ -78,14 +78,14 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function getRules($rules): \Generator |
| 80 | 80 | { |
| 81 | - foreach ($this->parser->split($rules) as $id => $rule) { |
|
| 82 | - if (empty($id) || $rule instanceof \Closure) { |
|
| 81 | + foreach ($this->parser->split($rules) as $id => $rule){ |
|
| 82 | + if (empty($id) || $rule instanceof \Closure){ |
|
| 83 | 83 | yield new CallableRule($rule); |
| 84 | 84 | continue; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // fetch from cache |
| 88 | - if (isset($this->rules[$id])) { |
|
| 88 | + if (isset($this->rules[$id])){ |
|
| 89 | 89 | yield $this->rules[$id]; |
| 90 | 90 | continue; |
| 91 | 91 | } |
@@ -126,17 +126,17 @@ discard block |
||
| 126 | 126 | $args = $this->parser->parseArgs($rule); |
| 127 | 127 | $message = $this->parser->parseMessage($rule); |
| 128 | 128 | |
| 129 | - if (!is_array($check)) { |
|
| 129 | + if (!is_array($check)){ |
|
| 130 | 130 | return new CallableRule($check, $args, $message); |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - if (is_string($check[0]) && $this->config->hasChecker($check[0])) { |
|
| 133 | + if (is_string($check[0]) && $this->config->hasChecker($check[0])){ |
|
| 134 | 134 | $check[0] = $this->config->getChecker($check[0])->resolve($this->factory); |
| 135 | 135 | |
| 136 | 136 | return new CheckerRule($check[0], $check[1], $args, $message); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - if (!is_object($check[0])) { |
|
| 139 | + if (!is_object($check[0])){ |
|
| 140 | 140 | $check[0] = (new Autowire($check[0]))->resolve($this->factory); |
| 141 | 141 | } |
| 142 | 142 | |
@@ -151,17 +151,17 @@ discard block |
||
| 151 | 151 | */ |
| 152 | 152 | protected function makeConditions(array $conditions): ?\SplObjectStorage |
| 153 | 153 | { |
| 154 | - if (empty($conditions)) { |
|
| 154 | + if (empty($conditions)){ |
|
| 155 | 155 | return null; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $storage = new \SplObjectStorage(); |
| 159 | - foreach ($conditions as $condition => $options) { |
|
| 159 | + foreach ($conditions as $condition => $options){ |
|
| 160 | 160 | $condition = $this->config->resolveAlias($condition); |
| 161 | 161 | |
| 162 | - if ($this->config->hasCondition($condition)) { |
|
| 162 | + if ($this->config->hasCondition($condition)){ |
|
| 163 | 163 | $autowire = $this->config->getCondition($condition); |
| 164 | - } else { |
|
| 164 | + }else{ |
|
| 165 | 165 | $autowire = new Autowire($condition); |
| 166 | 166 | } |
| 167 | 167 | |
@@ -78,14 +78,17 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function getRules($rules): \Generator |
| 80 | 80 | { |
| 81 | - foreach ($this->parser->split($rules) as $id => $rule) { |
|
| 82 | - if (empty($id) || $rule instanceof \Closure) { |
|
| 81 | + foreach ($this->parser->split($rules) as $id => $rule) |
|
| 82 | + { |
|
| 83 | + if (empty($id) || $rule instanceof \Closure) |
|
| 84 | + { |
|
| 83 | 85 | yield new CallableRule($rule); |
| 84 | 86 | continue; |
| 85 | 87 | } |
| 86 | 88 | |
| 87 | 89 | // fetch from cache |
| 88 | - if (isset($this->rules[$id])) { |
|
| 90 | + if (isset($this->rules[$id])) |
|
| 91 | + { |
|
| 89 | 92 | yield $this->rules[$id]; |
| 90 | 93 | continue; |
| 91 | 94 | } |
@@ -126,17 +129,20 @@ discard block |
||
| 126 | 129 | $args = $this->parser->parseArgs($rule); |
| 127 | 130 | $message = $this->parser->parseMessage($rule); |
| 128 | 131 | |
| 129 | - if (!is_array($check)) { |
|
| 132 | + if (!is_array($check)) |
|
| 133 | + { |
|
| 130 | 134 | return new CallableRule($check, $args, $message); |
| 131 | 135 | } |
| 132 | 136 | |
| 133 | - if (is_string($check[0]) && $this->config->hasChecker($check[0])) { |
|
| 137 | + if (is_string($check[0]) && $this->config->hasChecker($check[0])) |
|
| 138 | + { |
|
| 134 | 139 | $check[0] = $this->config->getChecker($check[0])->resolve($this->factory); |
| 135 | 140 | |
| 136 | 141 | return new CheckerRule($check[0], $check[1], $args, $message); |
| 137 | 142 | } |
| 138 | 143 | |
| 139 | - if (!is_object($check[0])) { |
|
| 144 | + if (!is_object($check[0])) |
|
| 145 | + { |
|
| 140 | 146 | $check[0] = (new Autowire($check[0]))->resolve($this->factory); |
| 141 | 147 | } |
| 142 | 148 | |
@@ -151,17 +157,22 @@ discard block |
||
| 151 | 157 | */ |
| 152 | 158 | protected function makeConditions(array $conditions): ?\SplObjectStorage |
| 153 | 159 | { |
| 154 | - if (empty($conditions)) { |
|
| 160 | + if (empty($conditions)) |
|
| 161 | + { |
|
| 155 | 162 | return null; |
| 156 | 163 | } |
| 157 | 164 | |
| 158 | 165 | $storage = new \SplObjectStorage(); |
| 159 | - foreach ($conditions as $condition => $options) { |
|
| 166 | + foreach ($conditions as $condition => $options) |
|
| 167 | + { |
|
| 160 | 168 | $condition = $this->config->resolveAlias($condition); |
| 161 | 169 | |
| 162 | - if ($this->config->hasCondition($condition)) { |
|
| 170 | + if ($this->config->hasCondition($condition)) |
|
| 171 | + { |
|
| 163 | 172 | $autowire = $this->config->getCondition($condition); |
| 164 | - } else { |
|
| 173 | + } |
|
| 174 | + else |
|
| 175 | + { |
|
| 165 | 176 | $autowire = new Autowire($condition); |
| 166 | 177 | } |
| 167 | 178 | |
@@ -69,11 +69,11 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | public function datetime($value): bool |
| 71 | 71 | { |
| 72 | - if (!is_scalar($value)) { |
|
| 72 | + if (!is_scalar($value)){ |
|
| 73 | 73 | return false; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - if (is_numeric($value)) { |
|
| 76 | + if (is_numeric($value)){ |
|
| 77 | 77 | return true; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -69,11 +69,13 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | public function datetime($value): bool |
| 71 | 71 | { |
| 72 | - if (!is_scalar($value)) { |
|
| 72 | + if (!is_scalar($value)) |
|
| 73 | + { |
|
| 73 | 74 | return false; |
| 74 | 75 | } |
| 75 | 76 | |
| 76 | - if (is_numeric($value)) { |
|
| 77 | + if (is_numeric($value)) |
|
| 78 | + { |
|
| 77 | 79 | return true; |
| 78 | 80 | } |
| 79 | 81 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function size($file, int $size): bool |
| 80 | 80 | { |
| 81 | - if (empty($filename = $this->resolveFilename($file))) { |
|
| 81 | + if (empty($filename = $this->resolveFilename($file))){ |
|
| 82 | 82 | return false; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -96,11 +96,11 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function extension($file, $extensions): bool |
| 98 | 98 | { |
| 99 | - if (!is_array($extensions)) { |
|
| 99 | + if (!is_array($extensions)){ |
|
| 100 | 100 | $extensions = array_slice(func_get_args(), 1); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - if ($file instanceof UploadedFileInterface) { |
|
| 103 | + if ($file instanceof UploadedFileInterface){ |
|
| 104 | 104 | return in_array( |
| 105 | 105 | $this->files->extension($file->getClientFilename()), |
| 106 | 106 | $extensions, |
@@ -78,7 +78,8 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function size($file, int $size): bool |
| 80 | 80 | { |
| 81 | - if (empty($filename = $this->resolveFilename($file))) { |
|
| 81 | + if (empty($filename = $this->resolveFilename($file))) |
|
| 82 | + { |
|
| 82 | 83 | return false; |
| 83 | 84 | } |
| 84 | 85 | |
@@ -96,11 +97,13 @@ discard block |
||
| 96 | 97 | */ |
| 97 | 98 | public function extension($file, $extensions): bool |
| 98 | 99 | { |
| 99 | - if (!is_array($extensions)) { |
|
| 100 | + if (!is_array($extensions)) |
|
| 101 | + { |
|
| 100 | 102 | $extensions = array_slice(func_get_args(), 1); |
| 101 | 103 | } |
| 102 | 104 | |
| 103 | - if ($file instanceof UploadedFileInterface) { |
|
| 105 | + if ($file instanceof UploadedFileInterface) |
|
| 106 | + { |
|
| 104 | 107 | return in_array( |
| 105 | 108 | $this->files->extension($file->getClientFilename()), |
| 106 | 109 | $extensions, |