spiral / framework

src/SendIt/src/MailJob.php

Spacing +6 added lines, -6 removed lines

@@ -48,11 +48,11 @@ 
      */
     public function handle(string $name, string $id, $payload): void
     {
-        if (\is_string($payload)) {
+        if (\is_string($payload)){
             $payload = json_decode($payload, true);
         }
 
-        if (!\is_array($payload)) {
+        if (!\is_array($payload)){
             throw new InvalidArgumentException('Mail job payload should be an array.');
         }
 
@@ -60,15 +60,15 @@ 
 
         $email = $this->renderer->render($message);
 
-        if ($email->getFrom() === []) {
+        if ($email->getFrom() === []){
             $email->from(Address::create($this->config->getFromAddress()));
         }
 
         $recipients = $this->getRecipients($email);
 
-        try {
+        try{
             $this->mailer->send($email);
-        } catch (TransportExceptionInterface $e) {
+        }catch (TransportExceptionInterface $e){
             $this->getLogger()->error(
                 sprintf(
                     'Failed to send `%s` to "%s": %s',
@@ -98,7 +98,7 @@ 
 
         $addresses = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 
-        foreach ($addresses as $address) {
+        foreach ($addresses as $address){
             $emails[] = $address->toString();
         }
 

Braces +13 added lines, -6 removed lines

@@ -48,11 +48,13 @@ 
      */
     public function handle(string $name, string $id, $payload): void
     {
-        if (\is_string($payload)) {
+        if (\is_string($payload))
+        {
             $payload = json_decode($payload, true);
         }
 
-        if (!\is_array($payload)) {
+        if (!\is_array($payload))
+        {
             throw new InvalidArgumentException('Mail job payload should be an array.');
         }
 
@@ -60,15 +62,19 @@ 
 
         $email = $this->renderer->render($message);
 
-        if ($email->getFrom() === []) {
+        if ($email->getFrom() === [])
+        {
             $email->from(Address::create($this->config->getFromAddress()));
         }
 
         $recipients = $this->getRecipients($email);
 
-        try {
+        try
+        {
             $this->mailer->send($email);
-        } catch (TransportExceptionInterface $e) {
+        }
+        catch (TransportExceptionInterface $e)
+        {
             $this->getLogger()->error(
                 sprintf(
                     'Failed to send `%s` to "%s": %s',
@@ -98,7 +104,8 @@ 
 
         $addresses = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 
-        foreach ($addresses as $address) {
+        foreach ($addresses as $address)
+        {
             $emails[] = $address->toString();
         }
 

src/Queue/src/QueueManager.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         // Replaces alias with real pipeline name
         $name = $this->config->getAliases()[$name] ?? $name;
 
-        if (!isset($this->pipelines[$name])) {
+        if (!isset($this->pipelines[$name])){
             $this->pipelines[$name] = $this->resolveConnection($name);
         }
 
@@ -44,9 +44,9 @@ 
     {
         $config = $this->config->getConnection($name);
 
-        try {
+        try{
             return $this->factory->make($config['driver'], $config);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             throw new Exception\NotSupportedDriverException(
                 \sprintf(
                     'Driver `%s` is not supported. Connection `%s` cannot be created. Reason: `%s`',

Braces +7 added lines, -3 removed lines

@@ -29,7 +29,8 @@ 
         // Replaces alias with real pipeline name
         $name = $this->config->getAliases()[$name] ?? $name;
 
-        if (!isset($this->pipelines[$name])) {
+        if (!isset($this->pipelines[$name]))
+        {
             $this->pipelines[$name] = $this->resolveConnection($name);
         }
 
@@ -44,9 +45,12 @@ 
     {
         $config = $this->config->getConnection($name);
 
-        try {
+        try
+        {
             return $this->factory->make($config['driver'], $config);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             throw new Exception\NotSupportedDriverException(
                 \sprintf(
                     'Driver `%s` is not supported. Connection `%s` cannot be created. Reason: `%s`',

src/AnnotatedRoutes/src/RouteLocator.php

Spacing +6 added lines, -6 removed lines

@@ -47,11 +47,11 @@ 
     public function findDeclarations(): array
     {
         $result = [];
-        foreach ($this->locator->getScopedClasses('routes') as $class) {
-            foreach ($class->getMethods() as $method) {
+        foreach ($this->locator->getScopedClasses('routes') as $class){
+            foreach ($class->getMethods() as $method){
                 $route = $this->reader->firstFunctionMetadata($method, Route::class);
 
-                if ($route === null) {
+                if ($route === null){
                     continue;
                 }
 
@@ -61,15 +61,15 @@ 
                     'controller' => $class->getName(),
                     'action'     => $method->getName(),
                     'group'      => $route->group,
-                    'verbs'      => (array) $route->methods,
+                    'verbs'      => (array)$route->methods,
                     'defaults'   => $route->defaults,
-                    'middleware' => (array) $route->middleware,
+                    'middleware' => (array)$route->middleware,
                     'priority'   => $route->priority,
                 ];
             }
         }
 
-        \uasort($result, static function (array $route1, array $route2) {
+        \uasort($result, static function (array $route1, array $route2){
             return $route1['priority'] <=> $route2['priority'];
         });
 

Braces +8 added lines, -4 removed lines

@@ -47,11 +47,14 @@ 
     public function findDeclarations(): array
     {
         $result = [];
-        foreach ($this->locator->getScopedClasses('routes') as $class) {
-            foreach ($class->getMethods() as $method) {
+        foreach ($this->locator->getScopedClasses('routes') as $class)
+        {
+            foreach ($class->getMethods() as $method)
+            {
                 $route = $this->reader->firstFunctionMetadata($method, Route::class);
 
-                if ($route === null) {
+                if ($route === null)
+                {
                     continue;
                 }
 
@@ -69,7 +72,8 @@ 
             }
         }
 
-        \uasort($result, static function (array $route1, array $route2) {
+        \uasort($result, static function (array $route1, array $route2)
+        {
             return $route1['priority'] <=> $route2['priority'];
         });
 

src/Cache/src/Bootloader/CacheBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     {
         $manager = new CacheManager($config, $container);
 
-        foreach ($config->getAliases() as $alias => $storageName) {
+        foreach ($config->getAliases() as $alias => $storageName){
             $container->bind($alias, static function (CacheManager $manager) use ($storageName) {
                 return $manager->storage($storageName);
             });
@@ -77,7 +77,7 @@ 
                     ],
                     'file' => [
                         'type' => 'file',
-                        'path' => $dirs->get('runtime') . 'cache',
+                        'path' => $dirs->get('runtime').'cache',
                     ],
                 ],
                 'typeAliases' => [

Braces +4 added lines, -2 removed lines

@@ -55,8 +55,10 @@
     {
         $manager = new CacheManager($config, $container);
 
-        foreach ($config->getAliases() as $alias => $storageName) {
-            $container->bind($alias, static function (CacheManager $manager) use ($storageName) {
+        foreach ($config->getAliases() as $alias => $storageName)
+        {
+            $container->bind($alias, static function (CacheManager $manager) use ($storageName)
+            {
                 return $manager->storage($storageName);
             });
         }

src/Router/src/CoreHandler.php

Spacing +17 added lines, -17 removed lines

@@ -56,7 +56,7 @@ 
         CoreInterface $core,
         ScopeInterface $scope,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->core = $core;
         $this->scope = $scope;
         $this->responseFactory = $responseFactory;
@@ -94,7 +94,7 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null){
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -104,7 +104,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -119,29 +119,29 @@ 
                     );
                 }
             );
-        } catch (ControllerException $e) {
+        }catch (ControllerException $e){
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
-                $output = ob_get_clean() . $output;
+        }finally{
+            while (ob_get_level() > $outputLevel + 1){
+                $output = ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            ob_get_clean() . $output
+            ob_get_clean().$output
         );
     }
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
-            return strtolower($request->getMethod()) . ucfirst($this->action);
+        if ($this->verbActions){
+            return strtolower($request->getMethod()).ucfirst($this->action);
         }
 
         return $this->action;
@@ -156,21 +156,21 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if ($output !== '' && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof \Generator) {
+        if ($result instanceof \Generator){
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 
@@ -185,7 +185,7 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode()){
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

Braces +32 added lines, -14 removed lines

@@ -94,7 +94,8 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null)
+        {
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -104,14 +105,16 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
                     Request::class  => $request,
                     Response::class => $response,
                 ],
-                function () use ($request) {
+                function () use ($request)
+                {
                     return $this->core->callAction(
                         $this->controller,
                         $this->getAction($request),
@@ -119,14 +122,21 @@ 
                     );
                 }
             );
-        } catch (ControllerException $e) {
+        }
+        catch (ControllerException $e)
+        {
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (ob_get_level() > $outputLevel + 1)
+            {
                 $output = ob_get_clean() . $output;
             }
         }
@@ -140,7 +150,8 @@ 
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return strtolower($request->getMethod()) . ucfirst($this->action);
         }
 
@@ -156,21 +167,27 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if ($output !== '' && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof \Generator) {
+        if ($result instanceof \Generator)
+        {
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof \JsonSerializable) {
+        if (\is_array($result) || $result instanceof \JsonSerializable)
+        {
             $response = $this->writeJson($response, $result);
-        } else {
+        }
+        else
+        {
             $response->getBody()->write((string)$result);
         }
 
@@ -185,7 +202,8 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode())
+        {
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

src/Prototype/src/Bootloader/PrototypeBootloader.php

Spacing +17 added lines, -17 removed lines

@@ -124,8 +124,8 @@ 
     public function initAnnotations(ContainerInterface $container, bool $reset = false): void
     {
         $prototyped = $this->memory->loadData('prototyped');
-        if (!$reset && $prototyped !== null) {
-            foreach ($prototyped as $property => $class) {
+        if (!$reset && $prototyped !== null){
+            foreach ($prototyped as $property => $class){
                 $this->bindProperty($property, $class);
             }
 
@@ -137,10 +137,10 @@ 
         $reader = $container->get(ReaderInterface::class);
 
         $prototyped = [];
-        foreach ($locator->getClasses() as $class) {
+        foreach ($locator->getClasses() as $class){
             $meta = $reader->firstClassMetadata($class, Prototyped::class);
 
-            if ($meta === null) {
+            if ($meta === null){
                 continue;
             }
 
@@ -156,19 +156,19 @@ 
      */
     public function initCycle(ContainerInterface $container): void
     {
-        if (!$container->has(ORM\SchemaInterface::class)) {
+        if (!$container->has(ORM\SchemaInterface::class)){
             return;
         }
 
         /** @var ORM\SchemaInterface|null $schema */
         $schema = $container->get(ORM\SchemaInterface::class);
-        if ($schema === null) {
+        if ($schema === null){
             return;
         }
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role){
             $repository = $schema->define($role, ORM\SchemaInterface::REPOSITORY);
-            if ($repository === ORM\Select\Repository::class || $repository === null) {
+            if ($repository === ORM\Select\Repository::class || $repository === null){
                 // default repository can not be wired
                 continue;
             }
@@ -179,23 +179,23 @@ 
 
     private function initDefaults(ContainerInterface $container): void
     {
-        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut) {
-            if (is_array($shortcut) && isset($shortcut['resolve'])) {
-                if (isset($shortcut['with'])) {
+        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut){
+            if (is_array($shortcut) && isset($shortcut['resolve'])){
+                if (isset($shortcut['with'])){
                     // check dependencies
-                    foreach ($shortcut['with'] as $dep) {
-                        if (!class_exists($dep, true) && !interface_exists($dep, true)) {
+                    foreach ($shortcut['with'] as $dep){
+                        if (!class_exists($dep, true) && !interface_exists($dep, true)){
                             continue 2;
                         }
                     }
                 }
 
-                try {
+                try{
                     $target = $container->get($shortcut['resolve']);
-                    if (is_object($target)) {
+                    if (is_object($target)){
                         $this->bindProperty($property, get_class($target));
                     }
-                } catch (ContainerExceptionInterface $e) {
+                }catch (ContainerExceptionInterface $e){
                     continue;
                 }
 
@@ -206,7 +206,7 @@ 
                 is_string($shortcut)
                 && (class_exists($shortcut, true)
                     || interface_exists($shortcut, true))
-            ) {
+            ){
                 $this->bindProperty($property, $shortcut);
             }
         }

Braces +33 added lines, -16 removed lines

@@ -124,8 +124,10 @@ 
     public function initAnnotations(ContainerInterface $container, bool $reset = false): void
     {
         $prototyped = $this->memory->loadData('prototyped');
-        if (!$reset && $prototyped !== null) {
-            foreach ($prototyped as $property => $class) {
+        if (!$reset && $prototyped !== null)
+        {
+            foreach ($prototyped as $property => $class)
+            {
                 $this->bindProperty($property, $class);
             }
 
@@ -137,10 +139,12 @@ 
         $reader = $container->get(ReaderInterface::class);
 
         $prototyped = [];
-        foreach ($locator->getClasses() as $class) {
+        foreach ($locator->getClasses() as $class)
+        {
             $meta = $reader->firstClassMetadata($class, Prototyped::class);
 
-            if ($meta === null) {
+            if ($meta === null)
+            {
                 continue;
             }
 
@@ -156,19 +160,23 @@ 
      */
     public function initCycle(ContainerInterface $container): void
     {
-        if (!$container->has(ORM\SchemaInterface::class)) {
+        if (!$container->has(ORM\SchemaInterface::class))
+        {
             return;
         }
 
         /** @var ORM\SchemaInterface|null $schema */
         $schema = $container->get(ORM\SchemaInterface::class);
-        if ($schema === null) {
+        if ($schema === null)
+        {
             return;
         }
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role)
+        {
             $repository = $schema->define($role, ORM\SchemaInterface::REPOSITORY);
-            if ($repository === ORM\Select\Repository::class || $repository === null) {
+            if ($repository === ORM\Select\Repository::class || $repository === null)
+            {
                 // default repository can not be wired
                 continue;
             }
@@ -179,23 +187,32 @@ 
 
     private function initDefaults(ContainerInterface $container): void
     {
-        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut) {
-            if (is_array($shortcut) && isset($shortcut['resolve'])) {
-                if (isset($shortcut['with'])) {
+        foreach (self::DEFAULT_SHORTCUTS as $property => $shortcut)
+        {
+            if (is_array($shortcut) && isset($shortcut['resolve']))
+            {
+                if (isset($shortcut['with']))
+                {
                     // check dependencies
-                    foreach ($shortcut['with'] as $dep) {
-                        if (!class_exists($dep, true) && !interface_exists($dep, true)) {
+                    foreach ($shortcut['with'] as $dep)
+                    {
+                        if (!class_exists($dep, true) && !interface_exists($dep, true))
+                        {
                             continue 2;
                         }
                     }
                 }
 
-                try {
+                try
+                {
                     $target = $container->get($shortcut['resolve']);
-                    if (is_object($target)) {
+                    if (is_object($target))
+                    {
                         $this->bindProperty($property, get_class($target));
                     }
-                } catch (ContainerExceptionInterface $e) {
+                }
+                catch (ContainerExceptionInterface $e)
+                {
                     continue;
                 }
 

src/Broadcasting/src/Driver/AbstractBroadcast.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     protected function formatTopics(array $topics): array
     {
-        return array_map(function ($topic) {
+        return array_map(function ($topic){
             return (string)$topic;
         }, $topics);
     }
@@ -28,7 +28,7 @@ 
      */
     protected function toArray($entries): array
     {
-        switch (true) {
+        switch (true){
             case \is_array($entries):
                 return $entries;
 

Braces +4 added lines, -2 removed lines

@@ -16,7 +16,8 @@ 
      */
     protected function formatTopics(array $topics): array
     {
-        return array_map(function ($topic) {
+        return array_map(function ($topic)
+        {
             return (string)$topic;
         }, $topics);
     }
@@ -28,7 +29,8 @@ 
      */
     protected function toArray($entries): array
     {
-        switch (true) {
+        switch (true)
+        {
             case \is_array($entries):
                 return $entries;
 

src/Broadcasting/src/Bootloader/WebsocketsBootloader.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         });
 
 
-        if ($config->getAuthorizationPath() !== null) {
+        if ($config->getAuthorizationPath() !== null){
             $http->addMiddleware(AuthorizationMiddleware::class);
         }
     }

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
         });
 
 
-        if ($config->getAuthorizationPath() !== null) {
+        if ($config->getAuthorizationPath() !== null)
+        {
             $http->addMiddleware(AuthorizationMiddleware::class);
         }
     }

src/SendIt/src/Bootloader/MailerBootloader.php

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
 
     public function start(Container $container): void
     {
-        if ($container->has(JobRegistry::class)) {
+        if ($container->has(JobRegistry::class)){
             // Will be removed since v3.0
             $registry = $container->get(JobRegistry::class);
             $registry->setHandler(MailQueue::JOB_NAME, \Spiral\SendIt\Jobs\MailJobAdapter::class);
@@ -77,19 +77,19 @@ 
             $container->bindSingleton(
                 MailerInterface::class,
                 static function (MailerConfig $config) use ($container) {
-                    if ($config->getQueueConnection() === 'sync') {
+                    if ($config->getQueueConnection() === 'sync'){
                         $queue = $container->get(ShortCircuit::class);
-                    } else {
+                    }else{
                         $queue = $container->get(QueueInterface::class);
                     }
 
                     return new MailQueue($config, $queue);
                 }
             );
-        } else {
+        }else{
             $container->bindSingleton(
                 MailerInterface::class,
-                static function (MailerConfig $config, QueueConnectionProviderInterface $provider) {
+                static function (MailerConfig $config, QueueConnectionProviderInterface $provider){
                     return new MailQueue(
                         $config,
                         $provider->getConnection($config->getQueueConnection())
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ($container->has(HandlerRegistryInterface::class)) {
+        if ($container->has(HandlerRegistryInterface::class)){
             $registry = $container->get(HandlerRegistryInterface::class);
             $registry->setHandler(MailQueue::JOB_NAME, \Spiral\SendIt\MailJob::class);
         }

Braces +16 added lines, -7 removed lines

@@ -68,7 +68,8 @@ 
 
     public function start(Container $container): void
     {
-        if ($container->has(JobRegistry::class)) {
+        if ($container->has(JobRegistry::class))
+        {
             // Will be removed since v3.0
             $registry = $container->get(JobRegistry::class);
             $registry->setHandler(MailQueue::JOB_NAME, \Spiral\SendIt\Jobs\MailJobAdapter::class);
@@ -76,20 +77,27 @@ 
 
             $container->bindSingleton(
                 MailerInterface::class,
-                static function (MailerConfig $config) use ($container) {
-                    if ($config->getQueueConnection() === 'sync') {
+                static function (MailerConfig $config) use ($container)
+                {
+                    if ($config->getQueueConnection() === 'sync')
+                    {
                         $queue = $container->get(ShortCircuit::class);
-                    } else {
+                    }
+                    else
+                    {
                         $queue = $container->get(QueueInterface::class);
                     }
 
                     return new MailQueue($config, $queue);
                 }
             );
-        } else {
+        }
+        else
+        {
             $container->bindSingleton(
                 MailerInterface::class,
-                static function (MailerConfig $config, QueueConnectionProviderInterface $provider) {
+                static function (MailerConfig $config, QueueConnectionProviderInterface $provider)
+                {
                     return new MailQueue(
                         $config,
                         $provider->getConnection($config->getQueueConnection())
@@ -98,7 +106,8 @@ 
             );
         }
 
-        if ($container->has(HandlerRegistryInterface::class)) {
+        if ($container->has(HandlerRegistryInterface::class))
+        {
             $registry = $container->get(HandlerRegistryInterface::class);
             $registry->setHandler(MailQueue::JOB_NAME, \Spiral\SendIt\MailJob::class);
         }