spiral / framework

src/Security/src/Traits/GuardedTrait.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
     public function getGuard(): GuardInterface
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(GuardInterface::class)) {
+        if (empty($container) || !$container->has(GuardInterface::class)){
             throw new ScopeException(
                 'Unable to get `GuardInterface`, binding is missing or container scope is not set'
             );
@@ -44,9 +44,9 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (\defined('static::GUARD_NAMESPACE')) {
+        if (\defined('static::GUARD_NAMESPACE')){
             // Yay! Isolation
-            $permission = \constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
+            $permission = \constant(static::class.'::'.'GUARD_NAMESPACE').'.'.$permission;
         }
 
         return $permission;

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
     public function getGuard(): GuardInterface
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(GuardInterface::class)) {
+        if (empty($container) || !$container->has(GuardInterface::class))
+        {
             throw new ScopeException(
                 'Unable to get `GuardInterface`, binding is missing or container scope is not set'
             );
@@ -44,7 +45,8 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (\defined('static::GUARD_NAMESPACE')) {
+        if (\defined('static::GUARD_NAMESPACE'))
+        {
             // Yay! Isolation
             $permission = \constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
         }

src/Security/src/Rule.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 
     public function __construct(
         protected ResolverInterface $resolver
-    ) {
+    ){
     }
 
     /**
@@ -48,20 +48,20 @@ 
         $parameters = \compact('actor', 'permission', 'context') + $context;
 
         //Mounting aliases
-        foreach (static::ALIASES as $target => $alias) {
+        foreach (static::ALIASES as $target => $alias){
             $parameters[$target] = $parameters[$alias];
         }
 
-        try {
+        try{
             $method = new \ReflectionMethod($this, static::CHECK_METHOD);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new RuleException($e->getMessage(), $e->getCode(), $e);
         }
 
-        try {
+        try{
             return $method->invokeArgs($this, $this->resolver->resolveArguments($method, $parameters));
-        } catch (\Throwable $e) {
-            throw new RuleException(\sprintf('[%s] %s', $this::class, $e->getMessage()), (int) $e->getCode(), $e);
+        }catch (\Throwable $e){
+            throw new RuleException(\sprintf('[%s] %s', $this::class, $e->getMessage()), (int)$e->getCode(), $e);
         }
     }
 }

Braces +12 added lines, -5 removed lines

@@ -48,19 +48,26 @@
         $parameters = \compact('actor', 'permission', 'context') + $context;
 
         //Mounting aliases
-        foreach (static::ALIASES as $target => $alias) {
+        foreach (static::ALIASES as $target => $alias)
+        {
             $parameters[$target] = $parameters[$alias];
         }
 
-        try {
+        try
+        {
             $method = new \ReflectionMethod($this, static::CHECK_METHOD);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new RuleException($e->getMessage(), $e->getCode(), $e);
         }
 
-        try {
+        try
+        {
             return $method->invokeArgs($this, $this->resolver->resolveArguments($method, $parameters));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new RuleException(\sprintf('[%s] %s', $this::class, $e->getMessage()), (int) $e->getCode(), $e);
         }
     }

src/Security/src/Command/RolePermissionsCommand.php

Spacing +5 added lines, -5 removed lines

@@ -28,16 +28,16 @@ 
     {
         $role = $this->argument('role');
 
-        if ($role !== null && !$rbac->hasRole($role)) {
+        if ($role !== null && !$rbac->hasRole($role)){
             throw new CommandException('Unknown role provided');
         }
 
-        if ($role !== null) {
+        if ($role !== null){
             $rows = $this->getRolePermissions($role, $rbac);
-        } else {
+        }else{
             $rows = [];
 
-            foreach ($rbac->getRoles() as $role) {
+            foreach ($rbac->getRoles() as $role){
                 /** @noinspection SlowArrayOperationsInLoopInspection */
                 $rows = \array_merge(
                     $this->getRolePermissions($role, $rbac),
@@ -63,7 +63,7 @@ 
     {
         $permissions = [];
 
-        foreach ($rbac->getPermissions($role) as $permission => $rule) {
+        foreach ($rbac->getPermissions($role) as $permission => $rule){
             $permissions[] = [
                 'role' => $role,
                 'permission' => $permission,

Braces +11 added lines, -5 removed lines

@@ -28,16 +28,21 @@ 
     {
         $role = $this->argument('role');
 
-        if ($role !== null && !$rbac->hasRole($role)) {
+        if ($role !== null && !$rbac->hasRole($role))
+        {
             throw new CommandException('Unknown role provided');
         }
 
-        if ($role !== null) {
+        if ($role !== null)
+        {
             $rows = $this->getRolePermissions($role, $rbac);
-        } else {
+        }
+        else
+        {
             $rows = [];
 
-            foreach ($rbac->getRoles() as $role) {
+            foreach ($rbac->getRoles() as $role)
+            {
                 /** @noinspection SlowArrayOperationsInLoopInspection */
                 $rows = \array_merge(
                     $this->getRolePermissions($role, $rbac),
@@ -63,7 +68,8 @@ 
     {
         $permissions = [];
 
-        foreach ($rbac->getPermissions($role) as $permission => $rule) {
+        foreach ($rbac->getPermissions($role) as $permission => $rule)
+        {
             $permissions[] = [
                 'role' => $role,
                 'permission' => $permission,

src/Security/src/RuleManager.php

Spacing +15 added lines, -15 removed lines

@@ -18,16 +18,16 @@ 
 
     public function __construct(
         private readonly ContainerInterface $container
-    ) {
+    ){
     }
 
     public function set(string $name, mixed $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule)){
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule)){
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -38,7 +38,7 @@ 
 
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -60,26 +60,26 @@ 
 
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException(\sprintf("Undefined rule '%s'", $name));
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name])){
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }else{
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface){
             return $rule;
         }
 
-        if (\is_string($rule)) {
+        if (\is_string($rule)){
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface){
                 throw new RuleException(\sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -99,18 +99,18 @@ 
      */
     private function validateRule(mixed $rule): bool
     {
-        if ($rule instanceof \Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof \Closure || $rule instanceof RuleInterface){
             return true;
         }
 
-        if (\is_array($rule)) {
+        if (\is_array($rule)){
             return \is_callable($rule, true);
         }
 
-        if (\is_string($rule) && \class_exists($rule)) {
-            try {
+        if (\is_string($rule) && \class_exists($rule)){
+            try{
                 $reflection = new \ReflectionClass($rule);
-            } catch (\ReflectionException) {
+            }catch (\ReflectionException){
                 return false;
             }
 

Braces +30 added lines, -14 removed lines

@@ -23,11 +23,13 @@ 
 
     public function set(string $name, mixed $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule))
+        {
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule))
+        {
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -38,7 +40,8 @@ 
 
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -60,26 +63,33 @@ 
 
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException(\sprintf("Undefined rule '%s'", $name));
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name]))
+        {
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }
+        else
+        {
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface)
+        {
             return $rule;
         }
 
-        if (\is_string($rule)) {
+        if (\is_string($rule))
+        {
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface)
+            {
                 throw new RuleException(\sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -99,18 +109,24 @@ 
      */
     private function validateRule(mixed $rule): bool
     {
-        if ($rule instanceof \Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof \Closure || $rule instanceof RuleInterface)
+        {
             return true;
         }
 
-        if (\is_array($rule)) {
+        if (\is_array($rule))
+        {
             return \is_callable($rule, true);
         }
 
-        if (\is_string($rule) && \class_exists($rule)) {
-            try {
+        if (\is_string($rule) && \class_exists($rule))
+        {
+            try
+            {
                 $reflection = new \ReflectionClass($rule);
-            } catch (\ReflectionException) {
+            }
+            catch (\ReflectionException)
+            {
                 return false;
             }
 

src/Queue/tests/Config/QueueConfigTest.php

Spacing +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
         yield [['defaultSerializer' => null], null];
         yield [['defaultSerializer' => 'json'], 'json'];
         yield [['defaultSerializer' => JsonSerializer::class], JsonSerializer::class];
-        yield [['defaultSerializer' => new JsonSerializer ()], new JsonSerializer()];
+        yield [['defaultSerializer' => new JsonSerializer()], new JsonSerializer()];
         yield [['defaultSerializer' => new Autowire(JsonSerializer::class)], new Autowire(JsonSerializer::class)];
     }
 }

src/Queue/src/Config/QueueConfig.php

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function getDefaultDriver(): string
     {
-        if (!\is_string($this->config['default'])) {
+        if (!\is_string($this->config['default'])){
             throw new InvalidArgumentException('Default queue connection config value must be a string');
         }
 
@@ -86,14 +86,14 @@ 
     {
         $connections = $this->config['connections'] ?? [];
 
-        if ($driver === null) {
+        if ($driver === null){
             return $connections;
         }
 
         $driverAliases = $this->getDriverAliases();
 
-        if (isset($driverAliases[$driver])) {
-            if (!\is_string($this->config['driverAliases'][$driver])) {
+        if (isset($driverAliases[$driver])){
+            if (!\is_string($this->config['driverAliases'][$driver])){
                 throw new InvalidArgumentException(
                     \sprintf('Driver alias for `%s` value must be a string', $driver)
                 );
@@ -103,7 +103,7 @@ 
         }
 
         return \array_filter($connections, static function (array $connection) use ($driverAliases, $driver): bool {
-            if (empty($connection['driver'])) {
+            if (empty($connection['driver'])){
                 return false;
             }
 
@@ -121,28 +121,28 @@ 
     {
         $connections = $this->getConnections();
 
-        if (!isset($connections[$name])) {
+        if (!isset($connections[$name])){
             throw new InvalidArgumentException(sprintf('Queue connection with given name `%s` is not defined.', $name));
         }
 
-        if (!isset($connections[$name]['driver'])) {
+        if (!isset($connections[$name]['driver'])){
             throw new InvalidArgumentException(\sprintf('Driver for queue connection `%s` is not defined.', $name));
         }
 
         $connection = $connections[$name];
         $driver = $connection['driver'];
 
-        if (!\is_string($driver)) {
+        if (!\is_string($driver)){
             throw new InvalidArgumentException(
                 \sprintf('Driver for queue connection `%s` value must be a string', $name)
             );
         }
 
-        if (isset($this->config['driverAliases'][$driver])) {
+        if (isset($this->config['driverAliases'][$driver])){
             $connection['driver'] = $this->config['driverAliases'][$driver];
         }
 
-        if (!\is_string($connection['driver'])) {
+        if (!\is_string($connection['driver'])){
             throw new InvalidArgumentException(
                 \sprintf('Driver alias for queue connection `%s` value must be a string', $name)
             );
@@ -167,7 +167,7 @@ 
     /**
      * @psalm-return SerializerInterface|class-string|Autowire|null
      */
-    public function getDefaultSerializer(): SerializerInterface|string|Autowire|null
+    public function getDefaultSerializer(): SerializerInterface | string | Autowire | null
     {
         return $this->config['defaultSerializer'] ?? null;
     }

Braces +20 added lines, -10 removed lines

@@ -64,7 +64,8 @@ 
      */
     public function getDefaultDriver(): string
     {
-        if (!\is_string($this->config['default'])) {
+        if (!\is_string($this->config['default']))
+        {
             throw new InvalidArgumentException('Default queue connection config value must be a string');
         }
 
@@ -86,14 +87,17 @@ 
     {
         $connections = $this->config['connections'] ?? [];
 
-        if ($driver === null) {
+        if ($driver === null)
+        {
             return $connections;
         }
 
         $driverAliases = $this->getDriverAliases();
 
-        if (isset($driverAliases[$driver])) {
-            if (!\is_string($this->config['driverAliases'][$driver])) {
+        if (isset($driverAliases[$driver]))
+        {
+            if (!\is_string($this->config['driverAliases'][$driver]))
+            {
                 throw new InvalidArgumentException(
                     \sprintf('Driver alias for `%s` value must be a string', $driver)
                 );
@@ -103,7 +107,8 @@ 
         }
 
         return \array_filter($connections, static function (array $connection) use ($driverAliases, $driver): bool {
-            if (empty($connection['driver'])) {
+            if (empty($connection['driver']))
+            {
                 return false;
             }
 
@@ -121,28 +126,33 @@ 
     {
         $connections = $this->getConnections();
 
-        if (!isset($connections[$name])) {
+        if (!isset($connections[$name]))
+        {
             throw new InvalidArgumentException(sprintf('Queue connection with given name `%s` is not defined.', $name));
         }
 
-        if (!isset($connections[$name]['driver'])) {
+        if (!isset($connections[$name]['driver']))
+        {
             throw new InvalidArgumentException(\sprintf('Driver for queue connection `%s` is not defined.', $name));
         }
 
         $connection = $connections[$name];
         $driver = $connection['driver'];
 
-        if (!\is_string($driver)) {
+        if (!\is_string($driver))
+        {
             throw new InvalidArgumentException(
                 \sprintf('Driver for queue connection `%s` value must be a string', $name)
             );
         }
 
-        if (isset($this->config['driverAliases'][$driver])) {
+        if (isset($this->config['driverAliases'][$driver]))
+        {
             $connection['driver'] = $this->config['driverAliases'][$driver];
         }
 
-        if (!\is_string($connection['driver'])) {
+        if (!\is_string($connection['driver']))
+        {
             throw new InvalidArgumentException(
                 \sprintf('Driver alias for queue connection `%s` value must be a string', $name)
             );

src/Queue/src/QueueRegistry.php

Spacing +12 added lines, -14 removed lines

@@ -26,13 +26,13 @@ 
         private readonly ContainerInterface $container,
         private readonly FactoryInterface $factory,
         private readonly HandlerRegistryInterface $fallbackHandlers
-    ) {
+    ){
     }
 
     /**
      * Associate specific job type with handler class or object
      */
-    public function setHandler(string $jobType, HandlerInterface|string $handler): void
+    public function setHandler(string $jobType, HandlerInterface | string $handler): void
     {
         $this->handlers[$jobType] = $handler;
     }
@@ -43,8 +43,8 @@ 
      */
     public function getHandler(string $jobType): HandlerInterface
     {
-        if (isset($this->handlers[$jobType])) {
-            if ($this->handlers[$jobType] instanceof HandlerInterface) {
+        if (isset($this->handlers[$jobType])){
+            if ($this->handlers[$jobType] instanceof HandlerInterface){
                 return $this->handlers[$jobType];
             }
 
@@ -61,7 +61,7 @@ 
      *
      * @throws InvalidArgumentException
      */
-    public function setSerializer(string $jobType, SerializerInterface|string|Autowire $serializer): void
+    public function setSerializer(string $jobType, SerializerInterface | string | Autowire $serializer): void
     {
         $this->serializers[$jobType] = $this->resolveSerializer($serializer);
     }
@@ -71,15 +71,14 @@ 
      */
     public function getSerializer(?string $jobType = null): SerializerInterface
     {
-        if ($jobType && $this->hasSerializer($jobType)) {
+        if ($jobType && $this->hasSerializer($jobType)){
             return $this->serializers[$jobType];
         }
 
         $config = $this->container->get(QueueConfig::class);
 
         return $config->getDefaultSerializer() === null ?
-            $this->container->get(SerializerManager::class)->getSerializer() :
-            $this->resolveSerializer($config->getDefaultSerializer());
+            $this->container->get(SerializerManager::class)->getSerializer() : $this->resolveSerializer($config->getDefaultSerializer());
     }
 
     public function hasSerializer(string $jobType): bool
@@ -92,22 +91,21 @@ 
      *
      * @throws InvalidArgumentException
      */
-    private function resolveSerializer(SerializerInterface|string|Autowire $serializer): SerializerInterface
+    private function resolveSerializer(SerializerInterface | string | Autowire $serializer): SerializerInterface
     {
-        if ($serializer instanceof Autowire) {
+        if ($serializer instanceof Autowire){
             $serializer = $serializer->resolve($this->factory);
         }
 
-        if (\is_string($serializer)) {
+        if (\is_string($serializer)){
             $registry = $this->container->get(SerializerRegistryInterface::class);
             \assert($registry instanceof SerializerRegistryInterface);
 
             $serializer = $registry->has($serializer) ?
-                $registry->get($serializer) :
-                $this->container->get($serializer);
+                $registry->get($serializer) : $this->container->get($serializer);
         }
 
-        if (!$serializer instanceof SerializerInterface) {
+        if (!$serializer instanceof SerializerInterface){
             throw new InvalidArgumentException(\sprintf(
                 'Serializer must be an instance of `SerializerInterface` but `%s` given.',
                 \get_debug_type($serializer)

Braces +12 added lines, -6 removed lines

@@ -43,8 +43,10 @@ 
      */
     public function getHandler(string $jobType): HandlerInterface
     {
-        if (isset($this->handlers[$jobType])) {
-            if ($this->handlers[$jobType] instanceof HandlerInterface) {
+        if (isset($this->handlers[$jobType]))
+        {
+            if ($this->handlers[$jobType] instanceof HandlerInterface)
+            {
                 return $this->handlers[$jobType];
             }
 
@@ -71,7 +73,8 @@ 
      */
     public function getSerializer(?string $jobType = null): SerializerInterface
     {
-        if ($jobType && $this->hasSerializer($jobType)) {
+        if ($jobType && $this->hasSerializer($jobType))
+        {
             return $this->serializers[$jobType];
         }
 
@@ -94,11 +97,13 @@ 
      */
     private function resolveSerializer(SerializerInterface|string|Autowire $serializer): SerializerInterface
     {
-        if ($serializer instanceof Autowire) {
+        if ($serializer instanceof Autowire)
+        {
             $serializer = $serializer->resolve($this->factory);
         }
 
-        if (\is_string($serializer)) {
+        if (\is_string($serializer))
+        {
             $registry = $this->container->get(SerializerRegistryInterface::class);
             \assert($registry instanceof SerializerRegistryInterface);
 
@@ -107,7 +112,8 @@ 
                 $this->container->get($serializer);
         }
 
-        if (!$serializer instanceof SerializerInterface) {
+        if (!$serializer instanceof SerializerInterface)
+        {
             throw new InvalidArgumentException(\sprintf(
                 'Serializer must be an instance of `SerializerInterface` but `%s` given.',
                 \get_debug_type($serializer)

src/Queue/src/Exception/RetryException.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     public function __construct(
         string $reason = '',
         private ?OptionsInterface $options = null
-    ) {
+    ){
         parent::__construct($reason);
     }
 

src/Queue/src/ContainerRegistry.php

Spacing +4 added lines, -4 removed lines

@@ -16,19 +16,19 @@
 
     public function __construct(
         private readonly ContainerInterface $container
-    ) {
+    ){
         $this->inflector = (new InflectorFactory())->build();
     }
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try{
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface){
             throw new JobException(\sprintf('Unable to resolve job handler for `%s`', $jobType));
         }
 

Braces +7 added lines, -3 removed lines

@@ -22,13 +22,17 @@
 
     public function getHandler(string $jobType): HandlerInterface
     {
-        try {
+        try
+        {
             $handler = $this->container->get($this->className($jobType));
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new JobException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if (!$handler instanceof HandlerInterface) {
+        if (!$handler instanceof HandlerInterface)
+        {
             throw new JobException(\sprintf('Unable to resolve job handler for `%s`', $jobType));
         }