spiral / framework

src/Translator/src/Catalogue/CatalogueManager.php

Spacing +6 added lines, -6 removed lines

@@ -50,12 +50,12 @@ 
      */
     public function getLocales(): array
     {
-        if ($this->locales !== []) {
+        if ($this->locales !== []){
             return $this->locales;
         }
 
         $this->locales = (array)$this->cache->getLocales();
-        if ($this->locales === []) {
+        if ($this->locales === []){
             $this->locales = $this->loader->getLocales();
             $this->cache->setLocales($this->locales);
         }
@@ -68,14 +68,14 @@ 
      */
     public function load(string $locale): CatalogueInterface
     {
-        if (isset($this->catalogues[$locale])) {
+        if (isset($this->catalogues[$locale])){
             return $this->catalogues[$locale];
         }
 
         $data = (array)$this->cache->loadLocale($locale);
-        if (!empty($data)) {
+        if (!empty($data)){
             $this->catalogues[$locale] = new Catalogue($locale, $data);
-        } else {
+        }else{
             $this->catalogues[$locale] = $this->loader->loadCatalogue($locale);
         }
 
@@ -112,7 +112,7 @@ 
     public function reset(): void
     {
         $this->cache->setLocales(null);
-        foreach ($this->getLocales() as $locale) {
+        foreach ($this->getLocales() as $locale){
             $this->cache->saveLocale($locale, null);
         }
 

Braces +13 added lines, -6 removed lines

@@ -50,12 +50,14 @@ 
      */
     public function getLocales(): array
     {
-        if ($this->locales !== []) {
+        if ($this->locales !== [])
+        {
             return $this->locales;
         }
 
         $this->locales = (array)$this->cache->getLocales();
-        if ($this->locales === []) {
+        if ($this->locales === [])
+        {
             $this->locales = $this->loader->getLocales();
             $this->cache->setLocales($this->locales);
         }
@@ -68,14 +70,18 @@ 
      */
     public function load(string $locale): CatalogueInterface
     {
-        if (isset($this->catalogues[$locale])) {
+        if (isset($this->catalogues[$locale]))
+        {
             return $this->catalogues[$locale];
         }
 
         $data = (array)$this->cache->loadLocale($locale);
-        if (!empty($data)) {
+        if (!empty($data))
+        {
             $this->catalogues[$locale] = new Catalogue($locale, $data);
-        } else {
+        }
+        else
+        {
             $this->catalogues[$locale] = $this->loader->loadCatalogue($locale);
         }
 
@@ -112,7 +118,8 @@ 
     public function reset(): void
     {
         $this->cache->setLocales(null);
-        foreach ($this->getLocales() as $locale) {
+        foreach ($this->getLocales() as $locale)
+        {
             $this->cache->saveLocale($locale, null);
         }
 

src/Translator/src/helpers.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 use Spiral\Translator\Exception\TranslatorException;
 use Spiral\Translator\TranslatorInterface;
 
-if (!function_exists('l')) {
+if (!function_exists('l')){
     /**
      * Translate message using default or specific bundle name.
      *
@@ -34,7 +34,7 @@ 
     function l(string $string, array $options = [], string $domain = null): string
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class)){
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );
@@ -47,7 +47,7 @@ 
     }
 }
 
-if (!function_exists('p')) {
+if (!function_exists('p')){
     /**
      * Pluralize string using language pluralization options and specified numeric value.
      *
@@ -67,7 +67,7 @@ 
     function p(string $string, int $number, array $options = [], string $domain = null): string
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class)){
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );

Braces +8 added lines, -4 removed lines

@@ -14,7 +14,8 @@ 
 use Spiral\Translator\Exception\TranslatorException;
 use Spiral\Translator\TranslatorInterface;
 
-if (!function_exists('l')) {
+if (!function_exists('l'))
+{
     /**
      * Translate message using default or specific bundle name.
      *
@@ -34,7 +35,8 @@ 
     function l(string $string, array $options = [], string $domain = null): string
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class))
+        {
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );
@@ -47,7 +49,8 @@ 
     }
 }
 
-if (!function_exists('p')) {
+if (!function_exists('p'))
+{
     /**
      * Pluralize string using language pluralization options and specified numeric value.
      *
@@ -67,7 +70,8 @@ 
     function p(string $string, int $number, array $options = [], string $domain = null): string
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class))
+        {
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );

src/Translator/src/Translator.php

Spacing +14 added lines, -14 removed lines

@@ -44,7 +44,7 @@ 
         TranslatorConfig $config,
         CatalogueManagerInterface $catalogueManager,
         IdentityTranslator $identityTranslator = null
-    ) {
+    ){
         $this->config = $config;
         $this->identityTranslator = $identityTranslator ?? new IdentityTranslator();
         $this->catalogueManager = $catalogueManager;
@@ -68,7 +68,7 @@ 
      */
     public function setLocale(string $locale): void
     {
-        if (!$this->catalogueManager->has($locale)) {
+        if (!$this->catalogueManager->has($locale)){
             throw new LocaleException($locale);
         }
 
@@ -124,11 +124,11 @@ 
         array $parameters = [],
         $domain = null,
         $locale = null
-    ) {
+    ){
         $domain = $domain ?? $this->config->getDefaultDomain();
         $locale = $locale ?? $this->locale;
 
-        try {
+        try{
             $message = $this->get($locale, $domain, $id);
 
             $pluralized = $this->identityTranslator->trans(
@@ -137,12 +137,12 @@ 
                 null,
                 $locale
             );
-        } catch (\InvalidArgumentException $e) {
+        }catch (\InvalidArgumentException $e){
             //Wrapping into more explanatory exception
             throw new PluralizationException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (empty($parameters['n']) && is_numeric($number)) {
+        if (empty($parameters['n']) && is_numeric($number)){
             $parameters['n'] = $number;
         }
 
@@ -168,18 +168,18 @@ 
         string $postfix = '}'
     ): string {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
 
-            if (is_object($value)) {
-                if (method_exists($value, '__toString')) {
+            if (is_object($value)){
+                if (method_exists($value, '__toString')){
                     $value = $value->__toString();
-                } else {
+                }else{
                     $value = '';
                 }
             }
 
-            $replaces[$prefix . $key . $postfix] = $value;
+            $replaces[$prefix.$key.$postfix] = $value;
         }
 
         return strtr($string, $replaces);
@@ -207,18 +207,18 @@ 
      */
     protected function get(string &$locale, string $domain, string $string): string
     {
-        if ($this->catalogueManager->get($locale)->has($domain, $string)) {
+        if ($this->catalogueManager->get($locale)->has($domain, $string)){
             return $this->catalogueManager->get($locale)->get($domain, $string);
         }
 
         $locale = $this->config->getFallbackLocale();
 
-        if ($this->catalogueManager->get($locale)->has($domain, $string)) {
+        if ($this->catalogueManager->get($locale)->has($domain, $string)){
             return $this->catalogueManager->get($locale)->get($domain, $string);
         }
 
         // we can automatically register message
-        if ($this->config->isAutoRegisterMessages()) {
+        if ($this->config->isAutoRegisterMessages()){
             $this->catalogueManager->get($locale)->set($domain, $string, $string);
             $this->catalogueManager->save($locale);
         }

Braces +24 added lines, -11 removed lines

@@ -68,7 +68,8 @@ 
      */
     public function setLocale(string $locale): void
     {
-        if (!$this->catalogueManager->has($locale)) {
+        if (!$this->catalogueManager->has($locale))
+        {
             throw new LocaleException($locale);
         }
 
@@ -128,7 +129,8 @@ 
         $domain = $domain ?? $this->config->getDefaultDomain();
         $locale = $locale ?? $this->locale;
 
-        try {
+        try
+        {
             $message = $this->get($locale, $domain, $id);
 
             $pluralized = $this->identityTranslator->trans(
@@ -137,12 +139,15 @@ 
                 null,
                 $locale
             );
-        } catch (\InvalidArgumentException $e) {
+        }
+        catch (\InvalidArgumentException $e)
+        {
             //Wrapping into more explanatory exception
             throw new PluralizationException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (empty($parameters['n']) && is_numeric($number)) {
+        if (empty($parameters['n']) && is_numeric($number))
+        {
             $parameters['n'] = $number;
         }
 
@@ -168,13 +173,18 @@ 
         string $postfix = '}'
     ): string {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $value = (is_array($value) || $value instanceof \Closure) ? '' : $value;
 
-            if (is_object($value)) {
-                if (method_exists($value, '__toString')) {
+            if (is_object($value))
+            {
+                if (method_exists($value, '__toString'))
+                {
                     $value = $value->__toString();
-                } else {
+                }
+                else
+                {
                     $value = '';
                 }
             }
@@ -207,18 +217,21 @@ 
      */
     protected function get(string &$locale, string $domain, string $string): string
     {
-        if ($this->catalogueManager->get($locale)->has($domain, $string)) {
+        if ($this->catalogueManager->get($locale)->has($domain, $string))
+        {
             return $this->catalogueManager->get($locale)->get($domain, $string);
         }
 
         $locale = $this->config->getFallbackLocale();
 
-        if ($this->catalogueManager->get($locale)->has($domain, $string)) {
+        if ($this->catalogueManager->get($locale)->has($domain, $string))
+        {
             return $this->catalogueManager->get($locale)->get($domain, $string);
         }
 
         // we can automatically register message
-        if ($this->config->isAutoRegisterMessages()) {
+        if ($this->config->isAutoRegisterMessages())
+        {
             $this->catalogueManager->get($locale)->set($domain, $string, $string);
             $this->catalogueManager->save($locale);
         }

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/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~';
         }