spiral / framework

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/Catalogue/CatalogueLoader.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 
     public function __construct(
         private readonly TranslatorConfig $config
-    ) {
+    ){
     }
 
     public function hasLocale(string $locale): bool
@@ -28,7 +28,7 @@ 
 
     public function getLocales(): array
     {
-        if (!\is_dir($this->config->getLocalesDirectory())) {
+        if (!\is_dir($this->config->getLocalesDirectory())){
             return [];
         }
 
@@ -37,7 +37,7 @@ 
 
         $locales = [];
 
-        foreach ($finder->directories() as $directory) {
+        foreach ($finder->directories() as $directory){
             $locales[] = $directory->getFilename();
         }
 
@@ -49,14 +49,14 @@ 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale)){
             return $catalogue;
         }
 
         $finder = new Finder();
         $finder->in($this->config->getLocaleDirectory($locale));
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file){
             $this->getLogger()->info(
                 \sprintf(
                     "found locale domain file '%s'",
@@ -68,7 +68,7 @@ 
             //Per application agreement domain name must present in filename
             $domain = \strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension())){
                 $this->getLogger()->warning(
                     \sprintf(
                         "unable to load domain file '%s', no loader found",

Braces +10 added lines, -5 removed lines

@@ -28,7 +28,8 @@ 
 
     public function getLocales(): array
     {
-        if (!\is_dir($this->config->getLocalesDirectory())) {
+        if (!\is_dir($this->config->getLocalesDirectory()))
+        {
             return [];
         }
 
@@ -37,7 +38,8 @@ 
 
         $locales = [];
 
-        foreach ($finder->directories() as $directory) {
+        foreach ($finder->directories() as $directory)
+        {
             $locales[] = $directory->getFilename();
         }
 
@@ -49,14 +51,16 @@ 
         $locale = \preg_replace('/[^a-zA-Z_]/', '', \mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale))
+        {
             return $catalogue;
         }
 
         $finder = new Finder();
         $finder->in($this->config->getLocaleDirectory($locale));
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file)
+        {
             $this->getLogger()->info(
                 \sprintf(
                     "found locale domain file '%s'",
@@ -68,7 +72,8 @@ 
             //Per application agreement domain name must present in filename
             $domain = \strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension()))
+            {
                 $this->getLogger()->warning(
                     \sprintf(
                         "unable to load domain file '%s', no loader found",

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);
             }
         }

src/Translator/src/Indexer.php

Spacing +13 added lines, -13 removed lines

@@ -31,7 +31,7 @@ 
     public function __construct(
         private readonly TranslatorConfig $config,
         private readonly CatalogueInterface $catalogue
-    ) {
+    ){
     }
 
     /**
@@ -39,7 +39,7 @@ 
      */
     public function registerMessage(string $domain, string $string, bool $resolveDomain = true): void
     {
-        if ($resolveDomain) {
+        if ($resolveDomain){
             $domain = $this->config->resolveDomain($domain);
         }
 
@@ -58,9 +58,9 @@ 
      */
     public function indexClasses(ScopedClassesInterface $locator): void
     {
-        foreach ($locator->getScopedClasses('translations', TranslatorTrait::class) as $class) {
+        foreach ($locator->getScopedClasses('translations', TranslatorTrait::class) as $class){
             $strings = $this->fetchMessages($class, true);
-            foreach ($strings as $string) {
+            foreach ($strings as $string){
                 $this->registerMessage($class->getName(), $string);
             }
         }
@@ -92,8 +92,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;
             }
@@ -112,20 +112,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(
@@ -145,7 +145,7 @@ 
         //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());
         }
@@ -157,7 +157,7 @@ 
             default => null
         };
 
-        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING) {
+        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING){
             //Domain specified in arguments
             $domain = $this->config->resolveDomain($argument->stringValue());
         }
@@ -170,7 +170,7 @@ 
      */
     private function prepareMessage(string $string): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string)){
             $string = \substr($string, 2, -2);
         }
 

Braces +24 added lines, -12 removed lines

@@ -39,7 +39,8 @@ 
      */
     public function registerMessage(string $domain, string $string, bool $resolveDomain = true): void
     {
-        if ($resolveDomain) {
+        if ($resolveDomain)
+        {
             $domain = $this->config->resolveDomain($domain);
         }
 
@@ -58,9 +59,11 @@ 
      */
     public function indexClasses(ScopedClassesInterface $locator): void
     {
-        foreach ($locator->getScopedClasses('translations', TranslatorTrait::class) as $class) {
+        foreach ($locator->getScopedClasses('translations', TranslatorTrait::class) as $class)
+        {
             $strings = $this->fetchMessages($class, true);
-            foreach ($strings as $string) {
+            foreach ($strings as $string)
+            {
                 $this->registerMessage($class->getName(), $string);
             }
         }
@@ -92,8 +95,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;
             }
@@ -112,20 +117,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(
@@ -145,7 +154,8 @@ 
         //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());
         }
@@ -157,7 +167,8 @@ 
             default => null
         };
 
-        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING) {
+        if (!empty($argument) && $argument->getType() === ReflectionArgument::STRING)
+        {
             //Domain specified in arguments
             $domain = $this->config->resolveDomain($argument->stringValue());
         }
@@ -170,7 +181,8 @@ 
      */
     private function prepareMessage(string $string): string
     {
-        if (Translator::isMessage($string)) {
+        if (Translator::isMessage($string))
+        {
             $string = \substr($string, 2, -2);
         }
 

src/Distribution/src/Internal/DateTimeIntervalFactory.php

Spacing +5 added lines, -5 removed lines

@@ -14,16 +14,16 @@ 
 
     public function __construct(
         private DateTimeFactoryInterface $factory = new DateTimeFactory()
-    ) {
+    ){
     }
 
     public function create(mixed $duration): \DateInterval
     {
-        try {
+        try{
             return $this->createOrFail($duration);
-        } catch (\InvalidArgumentException $e) {
+        }catch (\InvalidArgumentException $e){
             throw $e;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new \InvalidArgumentException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -44,7 +44,7 @@ 
             $duration instanceof \DateInterval => $duration,
             $duration instanceof \DateTimeInterface => $this->factory->now()->diff($duration),
             \is_string($duration) => new \DateInterval($duration),
-            \is_int($duration) => new \DateInterval('PT' . $duration . 'S'),
+            \is_int($duration) => new \DateInterval('PT'.$duration.'S'),
             $duration === null => new \DateInterval('PT0S'),
             default => throw new \InvalidArgumentException(
                 \sprintf(self::ERROR_INVALID_INTERVAL_TYPE, \get_debug_type($duration))

Braces +8 added lines, -3 removed lines

@@ -19,11 +19,16 @@
 
     public function create(mixed $duration): \DateInterval
     {
-        try {
+        try
+        {
             return $this->createOrFail($duration);
-        } catch (\InvalidArgumentException $e) {
+        }
+        catch (\InvalidArgumentException $e)
+        {
             throw $e;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new \InvalidArgumentException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }

src/Distribution/src/Config/DistributionConfig.php

Spacing +24 added lines, -24 removed lines

@@ -51,8 +51,8 @@ 
 
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -60,7 +60,7 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -77,9 +77,9 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null){
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -93,7 +93,7 @@ 
 
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type'])){
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
@@ -107,17 +107,17 @@ 
 
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true)){
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options'])){
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try{
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -126,36 +126,36 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region'])){
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret'])){
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket'])){
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? '')){
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? '')){
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0)){
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -180,19 +180,19 @@ 
 
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private'])){
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain'])){
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -206,7 +206,7 @@ 
 
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri'])){
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -215,7 +215,7 @@ 
 
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? '')){
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 

Braces +49 added lines, -24 removed lines

@@ -51,8 +51,10 @@ 
 
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child)
+        {
+            if (!\is_string($name))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -60,7 +62,8 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -77,9 +80,11 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null)
+        {
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -93,7 +98,8 @@ 
 
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type']))
+        {
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
@@ -107,17 +113,22 @@ 
 
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true))
+        {
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options']))
+        {
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try
+        {
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -126,36 +137,44 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region']))
+        {
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret']))
+        {
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket']))
+        {
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0))
+        {
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -180,19 +199,23 @@ 
 
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private']))
+        {
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain']))
+        {
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -206,7 +229,8 @@ 
 
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri']))
+        {
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -215,7 +239,8 @@ 
 
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }