spiral / framework

src/Translator/src/Matcher.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         return match (true) {
             $string === $pattern => true,
             !$this->isPattern($pattern) => false,
-            default => (bool) \preg_match($this->getRegex($pattern), $string)
+            default => (bool)\preg_match($this->getRegex($pattern), $string)
         };
     }
 

src/Translator/src/Exception/LocaleException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         protected string $locale,
         int $code = 0,
         \Throwable $previous = null
-    ) {
+    ){
         parent::__construct(\sprintf('Undefined locale \'%s\'', $locale), $code, $previous);
     }
 

src/Translator/src/Traits/TranslatorTrait.php

Spacing +3 added lines, -3 removed lines

@@ -33,13 +33,13 @@ 
      */
     protected function say(string $string, array $options = [], string $bundle = null): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string)){
             //Cut [[ and ]]
             $string = \substr($string, 2, -2);
         }
 
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class)){
             return Translator::interpolate($string, $options);
         }
 
@@ -48,7 +48,7 @@ 
          */
         $translator = $container->get(TranslatorInterface::class);
 
-        if (\is_null($bundle)) {
+        if (\is_null($bundle)){
             $bundle = $translator->getDomain(static::class);
         }
 

Braces +6 added lines, -3 removed lines

@@ -33,13 +33,15 @@ 
      */
     protected function say(string $string, array $options = [], string $bundle = null): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string))
+        {
             //Cut [[ and ]]
             $string = \substr($string, 2, -2);
         }
 
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(TranslatorInterface::class)) {
+        if (empty($container) || !$container->has(TranslatorInterface::class))
+        {
             return Translator::interpolate($string, $options);
         }
 
@@ -48,7 +50,8 @@ 
          */
         $translator = $container->get(TranslatorInterface::class);
 
-        if (\is_null($bundle)) {
+        if (\is_null($bundle))
+        {
             $bundle = $translator->getDomain(static::class);
         }
 

src/Translator/src/Event/LocaleUpdated.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
 {
     public function __construct(
         public readonly string $locale,
-    ) {
+    ){
     }
 }

src/Translator/src/helpers.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,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.
      *
@@ -22,7 +22,7 @@ 
     {
         /** @psalm-suppress InternalMethod */
         $container = ContainerScope::getContainer();
-        if ($container === null || !$container->has(TranslatorInterface::class)) {
+        if ($container === null || !$container->has(TranslatorInterface::class)){
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );
@@ -35,7 +35,7 @@ 
     }
 }
 
-if (!\function_exists('p')) {
+if (!\function_exists('p')){
     /**
      * Pluralize string using language pluralization options and specified numeric value.
      *
@@ -51,7 +51,7 @@ 
     {
         /** @psalm-suppress InternalMethod */
         $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

@@ -7,7 +7,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.
      *
@@ -22,7 +23,8 @@ 
     {
         /** @psalm-suppress InternalMethod */
         $container = ContainerScope::getContainer();
-        if ($container === null || !$container->has(TranslatorInterface::class)) {
+        if ($container === null || !$container->has(TranslatorInterface::class))
+        {
             throw new ScopeException(
                 '`TranslatorInterface` binding is missing or container scope is not set'
             );
@@ -35,7 +37,8 @@ 
     }
 }
 
-if (!\function_exists('p')) {
+if (!\function_exists('p'))
+{
     /**
      * Pluralize string using language pluralization options and specified numeric value.
      *
@@ -51,7 +54,8 @@ 
     {
         /** @psalm-suppress InternalMethod */
         $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/Catalogue/RuntimeLoader.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
     public function loadCatalogue(string $locale): CatalogueInterface
     {
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale)){
             throw new LocaleException($locale);
         }
 

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
 
     public function loadCatalogue(string $locale): CatalogueInterface
     {
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale))
+        {
             throw new LocaleException($locale);
         }
 

src/Translator/src/Catalogue/CatalogueManager.php

Spacing +7 added lines, -7 removed lines

@@ -24,18 +24,18 @@ 
     public function __construct(
         private readonly LoaderInterface $loader,
         CacheInterface $cache = null
-    ) {
+    ){
         $this->cache = $cache ?? new NullCache();
     }
 
     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);
         }
@@ -45,14 +45,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);
         }
 
@@ -80,7 +80,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

@@ -30,12 +30,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);
         }
@@ -45,14 +47,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);
         }
 
@@ -80,7 +86,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/Translator.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
         /** @internal */
         private readonly IdentityTranslator $identityTranslator = new IdentityTranslator(),
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {
+    ){
         $this->locale = $this->config->getDefaultLocale();
         $this->catalogueManager->load($this->locale);
     }
@@ -41,7 +41,7 @@ 
      */
     public function setLocale(string $locale): void
     {
-        if (!$this->catalogueManager->has($locale)) {
+        if (!$this->catalogueManager->has($locale)){
             throw new LocaleException($locale);
         }
 
@@ -85,7 +85,7 @@ 
      */
     public function transChoice(
         string $id,
-        string|int $number,
+        string | int $number,
         array $parameters = [],
         string $domain = null,
         string $locale = null
@@ -93,7 +93,7 @@ 
         $domain = $domain ?? $this->config->getDefaultDomain();
         $locale = $locale ?? $this->locale;
 
-        try {
+        try{
             $message = $this->get($locale, $domain, $id);
 
             $pluralized = $this->identityTranslator->trans(
@@ -102,12 +102,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;
         }
 
@@ -131,18 +131,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);
@@ -162,18 +162,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

@@ -41,7 +41,8 @@ 
      */
     public function setLocale(string $locale): void
     {
-        if (!$this->catalogueManager->has($locale)) {
+        if (!$this->catalogueManager->has($locale))
+        {
             throw new LocaleException($locale);
         }
 
@@ -93,7 +94,8 @@ 
         $domain = $domain ?? $this->config->getDefaultDomain();
         $locale = $locale ?? $this->locale;
 
-        try {
+        try
+        {
             $message = $this->get($locale, $domain, $id);
 
             $pluralized = $this->identityTranslator->trans(
@@ -102,12 +104,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;
         }
 
@@ -131,13 +136,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 = '';
                 }
             }
@@ -162,18 +172,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/Catalogue.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
     public function __construct(
         private readonly string $locale,
         private array $data = []
-    ) {
+    ){
     }
 
     public function getLocale(): string
@@ -34,7 +34,7 @@ 
 
     public function has(string $domain, string $id): bool
     {
-        if (!isset($this->data[$domain])) {
+        if (!isset($this->data[$domain])){
             return false;
         }
 
@@ -43,7 +43,7 @@ 
 
     public function get(string $domain, string $id): string
     {
-        if (!$this->has($domain, $id)) {
+        if (!$this->has($domain, $id)){
             throw new CatalogueException(\sprintf("Undefined string in domain '%s'", $domain));
         }
 
@@ -66,15 +66,15 @@ 
      */
     public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void
     {
-        foreach ($catalogue->all() as $domain => $messages) {
-            if (!isset($this->data[$domain])) {
+        foreach ($catalogue->all() as $domain => $messages){
+            if (!isset($this->data[$domain])){
                 $this->data[$domain] = [];
             }
 
-            if ($follow) {
+            if ($follow){
                 //MessageCatalogue string has higher priority that string stored in memory
                 $this->data[$domain] = \array_merge($messages, $this->data[$domain]);
-            } else {
+            }else{
                 $this->data[$domain] = \array_merge($this->data[$domain], $messages);
             }
         }

Braces +13 added lines, -6 removed lines

@@ -34,7 +34,8 @@ 
 
     public function has(string $domain, string $id): bool
     {
-        if (!isset($this->data[$domain])) {
+        if (!isset($this->data[$domain]))
+        {
             return false;
         }
 
@@ -43,7 +44,8 @@ 
 
     public function get(string $domain, string $id): string
     {
-        if (!$this->has($domain, $id)) {
+        if (!$this->has($domain, $id))
+        {
             throw new CatalogueException(\sprintf("Undefined string in domain '%s'", $domain));
         }
 
@@ -66,15 +68,20 @@ 
      */
     public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void
     {
-        foreach ($catalogue->all() as $domain => $messages) {
-            if (!isset($this->data[$domain])) {
+        foreach ($catalogue->all() as $domain => $messages)
+        {
+            if (!isset($this->data[$domain]))
+            {
                 $this->data[$domain] = [];
             }
 
-            if ($follow) {
+            if ($follow)
+            {
                 //MessageCatalogue string has higher priority that string stored in memory
                 $this->data[$domain] = \array_merge($messages, $this->data[$domain]);
-            } else {
+            }
+            else
+            {
                 $this->data[$domain] = \array_merge($this->data[$domain], $messages);
             }
         }