spiral / framework

src/Translator/src/Indexer.php

Spacing +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function registerMessage(string $domain, string $string, bool $resolveDomain = true): void
     {
-        if ($resolveDomain) {
+        if ($resolveDomain){
             $domain = $this->config->resolveDomain($domain);
         }
 
@@ -82,9 +82,9 @@ 
      */
     public function indexClasses(ClassesInterface $locator): void
     {
-        foreach ($locator->getClasses(TranslatorTrait::class) as $class) {
+        foreach ($locator->getClasses(TranslatorTrait::class) as $class){
             $strings = $this->fetchMessages($class, true);
-            foreach ($strings as $string) {
+            foreach ($strings as $string){
                 $this->registerMessage($class->getName(), $string);
             }
         }
@@ -118,8 +118,8 @@ 
      */
     private function registerInvocations(array $invocations): void
     {
-        foreach ($invocations as $invocation) {
-            if ($invocation->getArgument(0)->getType() != ReflectionArgument::STRING) {
+        foreach ($invocations as $invocation){
+            if ($invocation->getArgument(0)->getType() != ReflectionArgument::STRING){
                 //We can only index invocations with constant string arguments
                 continue;
             }
@@ -142,20 +142,20 @@ 
     {
         $target = $reflection->getDefaultProperties() + $reflection->getConstants();
 
-        foreach ($reflection->getProperties() as $property) {
-            if (is_string($property->getDocComment()) && strpos($property->getDocComment(), '@do-not-index')) {
+        foreach ($reflection->getProperties() as $property){
+            if (is_string($property->getDocComment()) && strpos($property->getDocComment(), '@do-not-index')){
                 unset($target[$property->getName()]);
             }
         }
 
         $strings = [];
         array_walk_recursive($target, function ($value) use (&$strings): void {
-            if (is_string($value) && Translator::isMessage($value)) {
+            if (is_string($value) && Translator::isMessage($value)){
                 $strings[] = $this->prepareMessage($value);
             }
         });
 
-        if ($inherit && $reflection->getParentClass()) {
+        if ($inherit && $reflection->getParentClass()){
             //Joining strings data with parent class values (inheritance ON) - resolved into same
             //domain on export
             $strings = array_merge(
@@ -178,27 +178,27 @@ 
         //Translation using default bundle
         $domain = $this->config->getDefaultDomain();
 
-        if ($invocation->getName() === 'say') {
+        if ($invocation->getName() === 'say'){
             //Let's try to confirm domain
             $domain = $this->config->resolveDomain($invocation->getClass());
         }
 
         //`l` and `p`, `say` functions
         $argument = null;
-        switch (strtolower($invocation->getName())) {
+        switch (strtolower($invocation->getName())){
             case 'say':
             case 'l':
-                if ($invocation->countArguments() >= 3) {
+                if ($invocation->countArguments() >= 3){
                     $argument = $invocation->getArgument(2);
                 }
                 break;
             case 'p':
-                if ($invocation->countArguments() >= 4) {
+                if ($invocation->countArguments() >= 4){
                     $argument = $invocation->getArgument(3);
                 }
         }
 
-        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING) {
+        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING){
             //Domain specified in arguments
             $domain = $this->config->resolveDomain($argument->stringValue());
         }
@@ -214,7 +214,7 @@ 
      */
     private function prepareMessage(string $string): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string)){
             $string = substr($string, 2, -2);
         }
 

Braces +30 added lines, -15 removed lines

@@ -61,7 +61,8 @@ 
      */
     public function registerMessage(string $domain, string $string, bool $resolveDomain = true): void
     {
-        if ($resolveDomain) {
+        if ($resolveDomain)
+        {
             $domain = $this->config->resolveDomain($domain);
         }
 
@@ -82,9 +83,11 @@ 
      */
     public function indexClasses(ClassesInterface $locator): void
     {
-        foreach ($locator->getClasses(TranslatorTrait::class) as $class) {
+        foreach ($locator->getClasses(TranslatorTrait::class) as $class)
+        {
             $strings = $this->fetchMessages($class, true);
-            foreach ($strings as $string) {
+            foreach ($strings as $string)
+            {
                 $this->registerMessage($class->getName(), $string);
             }
         }
@@ -118,8 +121,10 @@ 
      */
     private function registerInvocations(array $invocations): void
     {
-        foreach ($invocations as $invocation) {
-            if ($invocation->getArgument(0)->getType() != ReflectionArgument::STRING) {
+        foreach ($invocations as $invocation)
+        {
+            if ($invocation->getArgument(0)->getType() != ReflectionArgument::STRING)
+            {
                 //We can only index invocations with constant string arguments
                 continue;
             }
@@ -142,20 +147,24 @@ 
     {
         $target = $reflection->getDefaultProperties() + $reflection->getConstants();
 
-        foreach ($reflection->getProperties() as $property) {
-            if (is_string($property->getDocComment()) && strpos($property->getDocComment(), '@do-not-index')) {
+        foreach ($reflection->getProperties() as $property)
+        {
+            if (is_string($property->getDocComment()) && strpos($property->getDocComment(), '@do-not-index'))
+            {
                 unset($target[$property->getName()]);
             }
         }
 
         $strings = [];
         array_walk_recursive($target, function ($value) use (&$strings): void {
-            if (is_string($value) && Translator::isMessage($value)) {
+            if (is_string($value) && Translator::isMessage($value))
+            {
                 $strings[] = $this->prepareMessage($value);
             }
         });
 
-        if ($inherit && $reflection->getParentClass()) {
+        if ($inherit && $reflection->getParentClass())
+        {
             //Joining strings data with parent class values (inheritance ON) - resolved into same
             //domain on export
             $strings = array_merge(
@@ -178,27 +187,32 @@ 
         //Translation using default bundle
         $domain = $this->config->getDefaultDomain();
 
-        if ($invocation->getName() === 'say') {
+        if ($invocation->getName() === 'say')
+        {
             //Let's try to confirm domain
             $domain = $this->config->resolveDomain($invocation->getClass());
         }
 
         //`l` and `p`, `say` functions
         $argument = null;
-        switch (strtolower($invocation->getName())) {
+        switch (strtolower($invocation->getName()))
+        {
             case 'say':
             case 'l':
-                if ($invocation->countArguments() >= 3) {
+                if ($invocation->countArguments() >= 3)
+                {
                     $argument = $invocation->getArgument(2);
                 }
                 break;
             case 'p':
-                if ($invocation->countArguments() >= 4) {
+                if ($invocation->countArguments() >= 4)
+                {
                     $argument = $invocation->getArgument(3);
                 }
         }
 
-        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING) {
+        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING)
+        {
             //Domain specified in arguments
             $domain = $this->config->resolveDomain($argument->stringValue());
         }
@@ -214,7 +228,8 @@ 
      */
     private function prepareMessage(string $string): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string))
+        {
             $string = substr($string, 2, -2);
         }
 

src/Translator/tests/TranslatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
         $container = new Container();
         $container->bind(TranslatorConfig::class, new TranslatorConfig([
             'locale'    => 'en',
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
             'loaders'   => [
                 'php' => PhpFileLoader::class,
                 'po'  => PoFileLoader::class,

src/Translator/tests/TraitTest.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
         $this->container->bind(TranslatorConfig::class, new TranslatorConfig([
             'locale'    => 'en',
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
             'loaders'   => [
                 'php' => PhpFileLoader::class,
                 'po'  => PoFileLoader::class,

src/Translator/tests/LoaderTest.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
     public function testHasLocale(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
         ]));
 
         $this->assertTrue($loader->hasLocale('ru'));
@@ -35,7 +35,7 @@ 
     public function testGetLocales(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
         ]));
 
         $compared = $loader->getLocales();
@@ -49,7 +49,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,
@@ -89,7 +89,7 @@ 
     public function testLoadCatalogueNoLoader(): void
     {
         $loader = new CatalogueLoader(new TranslatorConfig([
-            'directory' => __DIR__ . '/fixtures/locales/',
+            'directory' => __DIR__.'/fixtures/locales/',
             'loaders'   => [
                 'php' => PhpFileLoader::class,
             ],

src/Translator/tests/ManagerTest.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $cache->shouldReceive('setLocales')->andReturn(null);
 
         $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([
-                'directory' => __DIR__ . '/fixtures/locales/',
+                'directory' => __DIR__.'/fixtures/locales/',
                 'loaders'   => [
                     'php' => PhpFileLoader::class,
                     'po'  => PoFileLoader::class,
@@ -49,7 +49,7 @@ 
         $cache->shouldNotReceive('setLocales')->andReturn(null);
 
         $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([
-                'directory' => __DIR__ . '/fixtures/locales/',
+                'directory' => __DIR__.'/fixtures/locales/',
                 'loaders'   => [
                     'php' => PhpFileLoader::class,
                     'po'  => PoFileLoader::class,
@@ -66,7 +66,7 @@ 
         $cache->shouldReceive('getLocales')->andReturn(['en', 'ru']);
 
         $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([
-                'directory' => __DIR__ . '/fixtures/locales/',
+                'directory' => __DIR__.'/fixtures/locales/',
                 'loaders'   => [
                     'php' => PhpFileLoader::class,
                     'po'  => PoFileLoader::class,
@@ -129,7 +129,7 @@ 
         ]);
 
         $manager = new CatalogueManager(new CatalogueLoader(new TranslatorConfig([
-                'directory' => __DIR__ . '/fixtures/locales/',
+                'directory' => __DIR__.'/fixtures/locales/',
                 'loaders'   => [
                     'php' => PhpFileLoader::class,
                     'po'  => PoFileLoader::class,

src/Validation/src/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -75,7 +75,7 @@ 
     {
         $value = $this->data[$field] ?? $default;
 
-        if (is_object($value) && method_exists($value, 'getValue')) {
+        if (is_object($value) && method_exists($value, 'getValue')){
             return $value->getValue();
         }
 
@@ -87,7 +87,7 @@ 
      */
     public function hasValue(string $field): bool
     {
-        if (is_array($this->data)) {
+        if (is_array($this->data)){
             return array_key_exists($field, $this->data);
         }
 
@@ -151,30 +151,30 @@ 
      */
     protected function validate(): void
     {
-        if ($this->errors !== []) {
+        if ($this->errors !== []){
             // already validated
             return;
         }
 
         $this->errors = [];
 
-        foreach ($this->rules as $field => $rules) {
+        foreach ($this->rules as $field => $rules){
             $hasValue = $this->hasValue($field);
             $value = $this->getValue($field);
 
-            foreach ($this->provider->getRules($rules) as $rule) {
-                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) {
+            foreach ($this->provider->getRules($rules) as $rule){
+                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()){
                     continue;
                 }
 
-                foreach ($rule->getConditions() as $condition) {
-                    if (!$condition->isMet($this, $field, $value)) {
+                foreach ($rule->getConditions() as $condition){
+                    if (!$condition->isMet($this, $field, $value)){
                         // condition is not met, skipping validation
                         continue 2;
                     }
                 }
 
-                if (!$rule->validate($this, $field, $value)) {
+                if (!$rule->validate($this, $field, $value)){
                     // got error, jump to next field
                     $this->errors[$field] = $rule->getMessage($field, $value);
                     break;

Braces +18 added lines, -9 removed lines

@@ -75,7 +75,8 @@ 
     {
         $value = $this->data[$field] ?? $default;
 
-        if (is_object($value) && method_exists($value, 'getValue')) {
+        if (is_object($value) && method_exists($value, 'getValue'))
+        {
             return $value->getValue();
         }
 
@@ -87,7 +88,8 @@ 
      */
     public function hasValue(string $field): bool
     {
-        if (is_array($this->data)) {
+        if (is_array($this->data))
+        {
             return array_key_exists($field, $this->data);
         }
 
@@ -151,30 +153,37 @@ 
      */
     protected function validate(): void
     {
-        if ($this->errors !== []) {
+        if ($this->errors !== [])
+        {
             // already validated
             return;
         }
 
         $this->errors = [];
 
-        foreach ($this->rules as $field => $rules) {
+        foreach ($this->rules as $field => $rules)
+        {
             $hasValue = $this->hasValue($field);
             $value = $this->getValue($field);
 
-            foreach ($this->provider->getRules($rules) as $rule) {
-                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions()) {
+            foreach ($this->provider->getRules($rules) as $rule)
+            {
+                if (!$hasValue && $rule->ignoreEmpty($value) && !$rule->hasConditions())
+                {
                     continue;
                 }
 
-                foreach ($rule->getConditions() as $condition) {
-                    if (!$condition->isMet($this, $field, $value)) {
+                foreach ($rule->getConditions() as $condition)
+                {
+                    if (!$condition->isMet($this, $field, $value))
+                    {
                         // condition is not met, skipping validation
                         continue 2;
                     }
                 }
 
-                if (!$rule->validate($this, $field, $value)) {
+                if (!$rule->validate($this, $field, $value))
+                {
                     // got error, jump to next field
                     $this->errors[$field] = $rule->getMessage($field, $value);
                     break;

src/Validation/src/CallableRule.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
      */
     public function getMessage(string $field, $value): string
     {
-        if (!empty($this->message)) {
+        if (!empty($this->message)){
             return Translator::interpolate(
                 $this->message,
                 array_merge([$value, $field], $this->args)
@@ -81,13 +81,13 @@ 
         }
 
         $name = $this->check;
-        if (is_array($name) && isset($name[0], $name[1])) {
+        if (is_array($name) && isset($name[0], $name[1])){
             $name = sprintf(
                 '%s::%s',
                 is_object($name[0]) ? get_class($name[0]) : $name,
                 $name[1]
             );
-        } elseif (!is_string($name)) {
+        } elseif (!is_string($name)){
             $name = '~user-defined~';
         }
 

Braces +7 added lines, -3 removed lines

@@ -73,7 +73,8 @@ 
      */
     public function getMessage(string $field, $value): string
     {
-        if (!empty($this->message)) {
+        if (!empty($this->message))
+        {
             return Translator::interpolate(
                 $this->message,
                 array_merge([$value, $field], $this->args)
@@ -81,13 +82,16 @@ 
         }
 
         $name = $this->check;
-        if (is_array($name) && isset($name[0], $name[1])) {
+        if (is_array($name) && isset($name[0], $name[1]))
+        {
             $name = sprintf(
                 '%s::%s',
                 is_object($name[0]) ? get_class($name[0]) : $name,
                 $name[1]
             );
-        } elseif (!is_string($name)) {
+        }
+        elseif (!is_string($name))
+        {
             $name = '~user-defined~';
         }
 

src/Validation/src/AbstractRule.php

Spacing +2 added lines, -2 removed lines

@@ -40,11 +40,11 @@
      */
     public function getConditions(): \Generator
     {
-        if (empty($this->conditions)) {
+        if (empty($this->conditions)){
             return;
         }
 
-        foreach ($this->conditions as $condition) {
+        foreach ($this->conditions as $condition){
             yield $condition->withOptions($this->conditions->offsetGet($condition));
         }
     }

Braces +4 added lines, -2 removed lines

@@ -40,11 +40,13 @@
      */
     public function getConditions(): \Generator
     {
-        if (empty($this->conditions)) {
+        if (empty($this->conditions))
+        {
             return;
         }
 
-        foreach ($this->conditions as $condition) {
+        foreach ($this->conditions as $condition)
+        {
             yield $condition->withOptions($this->conditions->offsetGet($condition));
         }
     }

src/Validation/src/ValidationProvider.php

Spacing +11 added lines, -11 removed lines

@@ -41,7 +41,7 @@ 
         ValidatorConfig $config,
         ParserInterface $parser = null,
         FactoryInterface $factory = null
-    ) {
+    ){
         $this->config = $config;
         $this->parser = $parser ?? new RuleParser();
         $this->factory = $factory ?? new Container();
@@ -78,14 +78,14 @@ 
      */
     public function getRules($rules): \Generator
     {
-        foreach ($this->parser->split($rules) as $id => $rule) {
-            if (empty($id) || $rule instanceof \Closure) {
+        foreach ($this->parser->split($rules) as $id => $rule){
+            if (empty($id) || $rule instanceof \Closure){
                 yield new CallableRule($rule);
                 continue;
             }
 
             // fetch from cache
-            if (isset($this->rules[$id])) {
+            if (isset($this->rules[$id])){
                 yield $this->rules[$id];
                 continue;
             }
@@ -126,17 +126,17 @@ 
         $args = $this->parser->parseArgs($rule);
         $message = $this->parser->parseMessage($rule);
 
-        if (!is_array($check)) {
+        if (!is_array($check)){
             return new CallableRule($check, $args, $message);
         }
 
-        if (is_string($check[0]) && $this->config->hasChecker($check[0])) {
+        if (is_string($check[0]) && $this->config->hasChecker($check[0])){
             $check[0] = $this->config->getChecker($check[0])->resolve($this->factory);
 
             return new CheckerRule($check[0], $check[1], $args, $message);
         }
 
-        if (!is_object($check[0])) {
+        if (!is_object($check[0])){
             $check[0] = (new Autowire($check[0]))->resolve($this->factory);
         }
 
@@ -151,17 +151,17 @@ 
      */
     protected function makeConditions(array $conditions): ?\SplObjectStorage
     {
-        if (empty($conditions)) {
+        if (empty($conditions)){
             return null;
         }
 
         $storage = new \SplObjectStorage();
-        foreach ($conditions as $condition => $options) {
+        foreach ($conditions as $condition => $options){
             $condition = $this->config->resolveAlias($condition);
 
-            if ($this->config->hasCondition($condition)) {
+            if ($this->config->hasCondition($condition)){
                 $autowire = $this->config->getCondition($condition);
-            } else {
+            }else{
                 $autowire = new Autowire($condition);
             }
 

Braces +21 added lines, -10 removed lines

@@ -78,14 +78,17 @@ 
      */
     public function getRules($rules): \Generator
     {
-        foreach ($this->parser->split($rules) as $id => $rule) {
-            if (empty($id) || $rule instanceof \Closure) {
+        foreach ($this->parser->split($rules) as $id => $rule)
+        {
+            if (empty($id) || $rule instanceof \Closure)
+            {
                 yield new CallableRule($rule);
                 continue;
             }
 
             // fetch from cache
-            if (isset($this->rules[$id])) {
+            if (isset($this->rules[$id]))
+            {
                 yield $this->rules[$id];
                 continue;
             }
@@ -126,17 +129,20 @@ 
         $args = $this->parser->parseArgs($rule);
         $message = $this->parser->parseMessage($rule);
 
-        if (!is_array($check)) {
+        if (!is_array($check))
+        {
             return new CallableRule($check, $args, $message);
         }
 
-        if (is_string($check[0]) && $this->config->hasChecker($check[0])) {
+        if (is_string($check[0]) && $this->config->hasChecker($check[0]))
+        {
             $check[0] = $this->config->getChecker($check[0])->resolve($this->factory);
 
             return new CheckerRule($check[0], $check[1], $args, $message);
         }
 
-        if (!is_object($check[0])) {
+        if (!is_object($check[0]))
+        {
             $check[0] = (new Autowire($check[0]))->resolve($this->factory);
         }
 
@@ -151,17 +157,22 @@ 
      */
     protected function makeConditions(array $conditions): ?\SplObjectStorage
     {
-        if (empty($conditions)) {
+        if (empty($conditions))
+        {
             return null;
         }
 
         $storage = new \SplObjectStorage();
-        foreach ($conditions as $condition => $options) {
+        foreach ($conditions as $condition => $options)
+        {
             $condition = $this->config->resolveAlias($condition);
 
-            if ($this->config->hasCondition($condition)) {
+            if ($this->config->hasCondition($condition))
+            {
                 $autowire = $this->config->getCondition($condition);
-            } else {
+            }
+            else
+            {
                 $autowire = new Autowire($condition);
             }