spiral / framework

rector.php

Spacing +22 added lines, -22 removed lines

@@ -16,43 +16,43 @@
 
 return RectorConfig::configure()
     ->withPaths([
-        __DIR__ . '/src/*/src',
+        __DIR__.'/src/*/src',
     ])
     ->withParallel()
     ->withSkip([
         IfIssetToCoalescingRector::class,
         RemoveUnusedPrivatePropertyRector::class => [
-            __DIR__ . '/src/Scaffolder/src/Command/BootloaderCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/CommandCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/ConfigCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/ControllerCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/FilterCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/JobHandlerCommand.php',
-            __DIR__ . '/src/Scaffolder/src/Command/MiddlewareCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/BootloaderCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/CommandCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/ConfigCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/ControllerCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/FilterCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/JobHandlerCommand.php',
+            __DIR__.'/src/Scaffolder/src/Command/MiddlewareCommand.php',
         ],
         RemoveUnusedPrivateMethodRector::class => [
-            __DIR__ . '/src/Boot/src/Bootloader/ConfigurationBootloader.php',
-            __DIR__ . '/src/Broadcasting/src/Bootloader/BroadcastingBootloader.php',
-            __DIR__ . '/src/Cache/src/Bootloader/CacheBootloader.php',
-            __DIR__ . '/src/Serializer/src/Bootloader/SerializerBootloader.php',
-            __DIR__ . '/src/Validation/src/Bootloader/ValidationBootloader.php',
+            __DIR__.'/src/Boot/src/Bootloader/ConfigurationBootloader.php',
+            __DIR__.'/src/Broadcasting/src/Bootloader/BroadcastingBootloader.php',
+            __DIR__.'/src/Cache/src/Bootloader/CacheBootloader.php',
+            __DIR__.'/src/Serializer/src/Bootloader/SerializerBootloader.php',
+            __DIR__.'/src/Validation/src/Bootloader/ValidationBootloader.php',
         ],
         RemoveUselessVarTagRector::class => [
-            __DIR__ . '/src/Console/src/Traits/HelpersTrait.php',
+            __DIR__.'/src/Console/src/Traits/HelpersTrait.php',
         ],
         RemoveAlwaysTrueIfConditionRector::class => [
-            __DIR__ . '/src/Boot/src/BootloadManager/Initializer.php',
-            __DIR__ . '/src/Stempler/src/Traverser.php',
-            __DIR__ . '/src/Prototype/src/NodeVisitors/LocateProperties.php',
-            __DIR__ . '/src/Prototype/src/NodeVisitors/RemoveTrait.php',
-            __DIR__ . '/src/Logger/src/ListenerRegistry.php',
-            __DIR__ . '/src/Stempler/src/Transform/Merge/ExtendsParent.php',
+            __DIR__.'/src/Boot/src/BootloadManager/Initializer.php',
+            __DIR__.'/src/Stempler/src/Traverser.php',
+            __DIR__.'/src/Prototype/src/NodeVisitors/LocateProperties.php',
+            __DIR__.'/src/Prototype/src/NodeVisitors/RemoveTrait.php',
+            __DIR__.'/src/Logger/src/ListenerRegistry.php',
+            __DIR__.'/src/Stempler/src/Transform/Merge/ExtendsParent.php',
         ],
         RemoveExtraParametersRector::class => [
-            __DIR__ . '/src/Boot/src/BootloadManager/AbstractBootloadManager.php',
+            __DIR__.'/src/Boot/src/BootloadManager/AbstractBootloadManager.php',
         ],
         RemoveUnusedPrivateMethodParameterRector::class => [
-            __DIR__ . '/src/Core/src/Internal/Factory.php',
+            __DIR__.'/src/Core/src/Internal/Factory.php',
         ],
 
         // to be enabled later after upgrade to 1.2.4 merged

src/Streams/src/StreamWrapper.php

Spacing +27 added lines, -27 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function stream_eof(): bool
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -55,7 +55,7 @@ 
      */
     public function stream_open(string $path, string $mode): bool
     {
-        if (!isset(self::$uris[$path])) {
+        if (!isset(self::$uris[$path])){
             return false;
         }
 
@@ -70,9 +70,9 @@ 
     /**
      * Read data from StreamInterface.
      */
-    public function stream_read(int $length): string|false
+    public function stream_read(int $length): string | false
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -84,7 +84,7 @@ 
      */
     public function stream_seek(int $offset, int $whence = SEEK_SET): bool
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -102,7 +102,7 @@ 
      */
     public function stream_stat(): array
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -114,7 +114,7 @@ 
      */
     public function stream_tell(): int
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -128,7 +128,7 @@ 
      */
     public function stream_write(string $data): int
     {
-        if ($this->stream === null) {
+        if ($this->stream === null){
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -140,14 +140,14 @@ 
      *
      * @see stat()
      */
-    public function url_stat(string $path, int $flag): array|false
+    public function url_stat(string $path, int $flag): array | false
     {
-        try {
-            if (isset(self::$uris[$path])) {
+        try{
+            if (isset(self::$uris[$path])){
                 return $this->getStreamStats(self::$uris[$path]);
             }
-        } catch (\Throwable $e) {
-            if (($flag & \STREAM_URL_STAT_QUIET) === \STREAM_URL_STAT_QUIET) {
+        }catch (\Throwable $e){
+            if (($flag & \STREAM_URL_STAT_QUIET) === \STREAM_URL_STAT_QUIET){
                 return false;
             }
             \trigger_error($e->getMessage(), \E_USER_ERROR);
@@ -161,7 +161,7 @@ 
      */
     public static function register(): void
     {
-        if (self::$registered) {
+        if (self::$registered){
             return;
         }
 
@@ -173,10 +173,10 @@ 
     /**
      * Check if given uri or stream has been allocated.
      */
-    public static function has(StreamInterface|string $file): bool
+    public static function has(StreamInterface | string $file): bool
     {
-        if ($file instanceof StreamInterface) {
-            $file = 'spiral://' . \spl_object_hash($file);
+        if ($file instanceof StreamInterface){
+            $file = 'spiral://'.\spl_object_hash($file);
         }
 
         return isset(self::$uris[$file]);
@@ -191,15 +191,15 @@ 
     public static function getResource(StreamInterface $stream)
     {
         $mode = null;
-        if ($stream->isReadable()) {
+        if ($stream->isReadable()){
             $mode = 'r';
         }
 
-        if ($stream->isWritable()) {
+        if ($stream->isWritable()){
             $mode = !empty($mode) ? 'r+' : 'w';
         }
 
-        if (empty($mode)) {
+        if (empty($mode)){
             throw new WrapperException('Stream is not available in read or write modes');
         }
 
@@ -213,7 +213,7 @@ 
     {
         self::register();
 
-        $uri = 'spiral://' . \spl_object_hash($stream);
+        $uri = 'spiral://'.\spl_object_hash($stream);
         self::$uris[$uri] = $stream;
 
         return $uri;
@@ -225,10 +225,10 @@ 
      *
      * @param string|StreamInterface $file String uri or StreamInterface.
      */
-    public static function release(StreamInterface|string $file): void
+    public static function release(StreamInterface | string $file): void
     {
-        if ($file instanceof StreamInterface) {
-            $file = 'spiral://' . \spl_object_hash($file);
+        if ($file instanceof StreamInterface){
+            $file = 'spiral://'.\spl_object_hash($file);
         }
 
         unset(self::$uris[$file]);
@@ -240,12 +240,12 @@ 
     private function getStreamStats(StreamInterface $stream): array
     {
         $mode = $this->mode;
-        if (empty($mode)) {
-            if ($stream->isReadable()) {
+        if (empty($mode)){
+            if ($stream->isReadable()){
                 $mode = 'r';
             }
 
-            if ($stream->isWritable()) {
+            if ($stream->isWritable()){
                 $mode = !empty($mode) ? 'r+' : 'w';
             }
         }

Braces +41 added lines, -20 removed lines

@@ -43,7 +43,8 @@ 
      */
     public function stream_eof(): bool
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -55,7 +56,8 @@ 
      */
     public function stream_open(string $path, string $mode): bool
     {
-        if (!isset(self::$uris[$path])) {
+        if (!isset(self::$uris[$path]))
+        {
             return false;
         }
 
@@ -72,7 +74,8 @@ 
      */
     public function stream_read(int $length): string|false
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -84,7 +87,8 @@ 
      */
     public function stream_seek(int $offset, int $whence = SEEK_SET): bool
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -102,7 +106,8 @@ 
      */
     public function stream_stat(): array
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -114,7 +119,8 @@ 
      */
     public function stream_tell(): int
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -128,7 +134,8 @@ 
      */
     public function stream_write(string $data): int
     {
-        if ($this->stream === null) {
+        if ($this->stream === null)
+        {
             throw new WrapperException('Stream is not opened.');
         }
 
@@ -142,12 +149,17 @@ 
      */
     public function url_stat(string $path, int $flag): array|false
     {
-        try {
-            if (isset(self::$uris[$path])) {
+        try
+        {
+            if (isset(self::$uris[$path]))
+            {
                 return $this->getStreamStats(self::$uris[$path]);
             }
-        } catch (\Throwable $e) {
-            if (($flag & \STREAM_URL_STAT_QUIET) === \STREAM_URL_STAT_QUIET) {
+        }
+        catch (\Throwable $e)
+        {
+            if (($flag & \STREAM_URL_STAT_QUIET) === \STREAM_URL_STAT_QUIET)
+            {
                 return false;
             }
             \trigger_error($e->getMessage(), \E_USER_ERROR);
@@ -161,7 +173,8 @@ 
      */
     public static function register(): void
     {
-        if (self::$registered) {
+        if (self::$registered)
+        {
             return;
         }
 
@@ -175,7 +188,8 @@ 
      */
     public static function has(StreamInterface|string $file): bool
     {
-        if ($file instanceof StreamInterface) {
+        if ($file instanceof StreamInterface)
+        {
             $file = 'spiral://' . \spl_object_hash($file);
         }
 
@@ -191,15 +205,18 @@ 
     public static function getResource(StreamInterface $stream)
     {
         $mode = null;
-        if ($stream->isReadable()) {
+        if ($stream->isReadable())
+        {
             $mode = 'r';
         }
 
-        if ($stream->isWritable()) {
+        if ($stream->isWritable())
+        {
             $mode = !empty($mode) ? 'r+' : 'w';
         }
 
-        if (empty($mode)) {
+        if (empty($mode))
+        {
             throw new WrapperException('Stream is not available in read or write modes');
         }
 
@@ -227,7 +244,8 @@ 
      */
     public static function release(StreamInterface|string $file): void
     {
-        if ($file instanceof StreamInterface) {
+        if ($file instanceof StreamInterface)
+        {
             $file = 'spiral://' . \spl_object_hash($file);
         }
 
@@ -240,12 +258,15 @@ 
     private function getStreamStats(StreamInterface $stream): array
     {
         $mode = $this->mode;
-        if (empty($mode)) {
-            if ($stream->isReadable()) {
+        if (empty($mode))
+        {
+            if ($stream->isReadable())
+            {
                 $mode = 'r';
             }
 
-            if ($stream->isWritable()) {
+            if ($stream->isWritable())
+            {
                 $mode = !empty($mode) ? 'r+' : 'w';
             }
         }

src/Filters/src/Model/Schema/AttributeMapper.php

Spacing +24 added lines, -24 removed lines

@@ -26,7 +26,7 @@ 
         private readonly FilterProviderInterface $provider,
         private readonly ReaderInterface $reader,
         private readonly Mapper $mapper
-    ) {
+    ){
     }
 
     /**
@@ -40,54 +40,54 @@ 
         $optionalFilters = [];
         $class = new \ReflectionClass($filter);
 
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property){
             /** @var object $attribute */
-            foreach ($this->reader->getPropertyMetadata($property) as $attribute) {
-                if ($attribute instanceof AbstractInput) {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute){
+                if ($attribute instanceof AbstractInput){
                     $value = $attribute->getValue($input, $property);
-                    try {
+                    try{
                         $this->setValue($filter, $property, $value);
-                    } catch (SetterException $e) {
+                    }catch (SetterException $e){
                         $errors[$property->getName()] = $this->createErrorMessage($e, $property, $value);
                     }
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedFilter) {
+                } elseif ($attribute instanceof NestedFilter){
                     $prefix = $attribute->prefix ?? $property->name;
-                    try {
+                    try{
                         $value = $this->provider->createFilter(
                             $attribute->class,
                             $input->withPrefix($prefix)
                         );
 
-                        try {
+                        try{
                             $this->setValue($filter, $property, $value);
-                        } catch (SetterException $e) {
+                        }catch (SetterException $e){
                             $errors[$property->getName()] = $this->createErrorMessage($e, $property, $value);
                         }
-                    } catch (ValidationException $e) {
-                        if ($this->allowsNull($property)) {
+                    }catch (ValidationException $e){
+                        if ($this->allowsNull($property)){
                             $this->setValue($filter, $property, null);
                             $optionalFilters[] = $property->getName();
-                        } else {
+                        }else{
                             $errors[$prefix] = $e->errors;
                         }
                     }
 
                     $schema[$property->getName()] = $attribute->getSchema();
-                } elseif ($attribute instanceof NestedArray) {
+                } elseif ($attribute instanceof NestedArray){
                     $values = $attribute->getValue($input, $property);
                     $propertyValues = [];
 
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
 
-                    if (\is_array($values)) {
-                        foreach (\array_keys($values) as $key) {
-                            try {
+                    if (\is_array($values)){
+                        foreach (\array_keys($values) as $key){
+                            try{
                                 $propertyValues[$key] = $this->provider->createFilter(
                                     $attribute->class,
-                                    $input->withPrefix($prefix . '.' . $key)
+                                    $input->withPrefix($prefix.'.'.$key)
                                 );
-                            } catch (ValidationException $e) {
+                            }catch (ValidationException $e){
                                 /** @psalm-suppress InvalidArrayOffset */
                                 $errors[$property->getName()][$key] = $e->errors;
                             }
@@ -95,8 +95,8 @@ 
                     }
 
                     $this->setValue($filter, $property, $propertyValues);
-                    $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                    $schema[$property->getName()] = [$attribute->class, $prefix.'.*'];
+                } elseif ($attribute instanceof Setter){
                     $setters[$property->getName()][] = $attribute;
                 }
             }
@@ -107,13 +107,13 @@ 
 
     private function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
-        if ($value === null) {
+        if ($value === null){
             return;
         }
 
         $setters = $this->reader->getPropertyMetadata($property, Setter::class);
 
-        foreach ($setters as $setter) {
+        foreach ($setters as $setter){
             $value = $setter->updateValue($value);
         }
 
@@ -134,7 +134,7 @@ 
     ): string {
         $attribute = $this->reader->firstPropertyMetadata($property, CastingErrorMessage::class);
 
-        if ($attribute === null) {
+        if ($attribute === null){
             return $exception->getMessage();
         }
 

Braces +50 added lines, -21 removed lines

@@ -40,54 +40,78 @@ 
         $optionalFilters = [];
         $class = new \ReflectionClass($filter);
 
-        foreach ($class->getProperties() as $property) {
+        foreach ($class->getProperties() as $property)
+        {
             /** @var object $attribute */
-            foreach ($this->reader->getPropertyMetadata($property) as $attribute) {
-                if ($attribute instanceof AbstractInput) {
+            foreach ($this->reader->getPropertyMetadata($property) as $attribute)
+            {
+                if ($attribute instanceof AbstractInput)
+                {
                     $value = $attribute->getValue($input, $property);
-                    try {
+                    try
+                    {
                         $this->setValue($filter, $property, $value);
-                    } catch (SetterException $e) {
+                    }
+                    catch (SetterException $e)
+                    {
                         $errors[$property->getName()] = $this->createErrorMessage($e, $property, $value);
                     }
                     $schema[$property->getName()] = $attribute->getSchema($property);
-                } elseif ($attribute instanceof NestedFilter) {
+                }
+                elseif ($attribute instanceof NestedFilter)
+                {
                     $prefix = $attribute->prefix ?? $property->name;
-                    try {
+                    try
+                    {
                         $value = $this->provider->createFilter(
                             $attribute->class,
                             $input->withPrefix($prefix)
                         );
 
-                        try {
+                        try
+                        {
                             $this->setValue($filter, $property, $value);
-                        } catch (SetterException $e) {
+                        }
+                        catch (SetterException $e)
+                        {
                             $errors[$property->getName()] = $this->createErrorMessage($e, $property, $value);
                         }
-                    } catch (ValidationException $e) {
-                        if ($this->allowsNull($property)) {
+                    }
+                    catch (ValidationException $e)
+                    {
+                        if ($this->allowsNull($property))
+                        {
                             $this->setValue($filter, $property, null);
                             $optionalFilters[] = $property->getName();
-                        } else {
+                        }
+                        else
+                        {
                             $errors[$prefix] = $e->errors;
                         }
                     }
 
                     $schema[$property->getName()] = $attribute->getSchema();
-                } elseif ($attribute instanceof NestedArray) {
+                }
+                elseif ($attribute instanceof NestedArray)
+                {
                     $values = $attribute->getValue($input, $property);
                     $propertyValues = [];
 
                     $prefix = $attribute->input->key ?? $attribute->prefix ?? $property->getName();
 
-                    if (\is_array($values)) {
-                        foreach (\array_keys($values) as $key) {
-                            try {
+                    if (\is_array($values))
+                    {
+                        foreach (\array_keys($values) as $key)
+                        {
+                            try
+                            {
                                 $propertyValues[$key] = $this->provider->createFilter(
                                     $attribute->class,
                                     $input->withPrefix($prefix . '.' . $key)
                                 );
-                            } catch (ValidationException $e) {
+                            }
+                            catch (ValidationException $e)
+                            {
                                 /** @psalm-suppress InvalidArrayOffset */
                                 $errors[$property->getName()][$key] = $e->errors;
                             }
@@ -96,7 +120,9 @@ 
 
                     $this->setValue($filter, $property, $propertyValues);
                     $schema[$property->getName()] = [$attribute->class, $prefix . '.*'];
-                } elseif ($attribute instanceof Setter) {
+                }
+                elseif ($attribute instanceof Setter)
+                {
                     $setters[$property->getName()][] = $attribute;
                 }
             }
@@ -107,13 +133,15 @@ 
 
     private function setValue(FilterInterface $filter, \ReflectionProperty $property, mixed $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             return;
         }
 
         $setters = $this->reader->getPropertyMetadata($property, Setter::class);
 
-        foreach ($setters as $setter) {
+        foreach ($setters as $setter)
+        {
             $value = $setter->updateValue($value);
         }
 
@@ -134,7 +162,8 @@ 
     ): string {
         $attribute = $this->reader->firstPropertyMetadata($property, CastingErrorMessage::class);
 
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return $exception->getMessage();
         }
 

src/Filters/src/Attribute/NestedFilter.php

Spacing +3 added lines, -3 removed lines

@@ -29,12 +29,12 @@
     public function __construct(
         public readonly string $class,
         public readonly ?string $prefix = null
-    ) {
+    ){
     }
 
-    public function getSchema(): string|array
+    public function getSchema(): string | array
     {
-        if ($this->prefix) {
+        if ($this->prefix){
             return [$this->class, $this->prefix];
         }
 

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
 
     public function getSchema(): string|array
     {
-        if ($this->prefix) {
+        if ($this->prefix)
+        {
             return [$this->class, $this->prefix];
         }
 

src/Filters/src/Attribute/NestedArray.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         public readonly string $class,
         public readonly AbstractInput $input,
         public readonly ?string $prefix = null
-    ) {
+    ){
     }
 
     public function getValue(InputInterface $input, \ReflectionProperty $property): mixed
@@ -46,7 +46,7 @@ 
 
     public function getSchema(): array
     {
-        if ($this->prefix) {
+        if ($this->prefix){
             return [$this->class, $this->prefix];
         }
 

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
 
     public function getSchema(): array
     {
-        if ($this->prefix) {
+        if ($this->prefix)
+        {
             return [$this->class, $this->prefix];
         }