spiral / framework

src/Command/Migrate/StatusCommand.php

Spacing +4 added lines, -4 removed lines

@@ -28,18 +28,18 @@ 
      */
     public function perform(FilesInterface $files): void
     {
-        if (!$this->verifyConfigured()) {
+        if (!$this->verifyConfigured()){
             return;
         }
 
-        if (empty($this->migrator->getMigrations())) {
+        if (empty($this->migrator->getMigrations())){
             $this->writeln('<comment>No migrations were found.</comment>');
 
             return;
         }
 
         $table = $this->table(['Migration', 'Created at', 'Executed at']);
-        foreach ($this->migrator->getMigrations() as $migration) {
+        foreach ($this->migrator->getMigrations() as $migration){
             $state = $migration->getState();
 
             $table->addRow(
@@ -48,7 +48,7 @@ 
                     $state->getTimeCreated()->format('Y-m-d H:i:s'),
                     $state->getStatus() == State::STATUS_PENDING
                         ? self::PENDING
-                        : '<info>' . $state->getTimeExecuted()->format('Y-m-d H:i:s') . '</info>'
+                        : '<info>'.$state->getTimeExecuted()->format('Y-m-d H:i:s').'</info>'
                 ]
             );
         }

Braces +6 added lines, -3 removed lines

@@ -28,18 +28,21 @@
      */
     public function perform(FilesInterface $files): void
     {
-        if (!$this->verifyConfigured()) {
+        if (!$this->verifyConfigured())
+        {
             return;
         }
 
-        if (empty($this->migrator->getMigrations())) {
+        if (empty($this->migrator->getMigrations()))
+        {
             $this->writeln('<comment>No migrations were found.</comment>');
 
             return;
         }
 
         $table = $this->table(['Migration', 'Created at', 'Executed at']);
-        foreach ($this->migrator->getMigrations() as $migration) {
+        foreach ($this->migrator->getMigrations() as $migration)
+        {
             $state = $migration->getState();
 
             $table->addRow(

src/Command/GRPC/ListCommand.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
     {
         $services = $locator->getServices();
 
-        if ($services === []) {
+        if ($services === []){
             $this->writeln('<comment>No GRPC services were found.</comment>');
             return;
         }
@@ -39,7 +39,7 @@ 
             ]
         );
 
-        foreach ($services as $interface => $instance) {
+        foreach ($services as $interface => $instance){
             $grid->addRow(
                 [
                     $interface::NAME,

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,8 @@ 
     {
         $services = $locator->getServices();
 
-        if ($services === []) {
+        if ($services === [])
+        {
             $this->writeln('<comment>No GRPC services were found.</comment>');
             return;
         }
@@ -39,7 +40,8 @@ 
             ]
         );
 
-        foreach ($services as $interface => $instance) {
+        foreach ($services as $interface => $instance)
+        {
             $grid->addRow(
                 [
                     $interface::NAME,

src/Domain/GuardInterceptor.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)){
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +79,14 @@ 
     private function getPermissions(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return null;
         }
 
@@ -104,7 +104,7 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null){
             return null;
         }
 
@@ -126,7 +126,7 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null){
             throw new InterceptorException(
                 sprintf(
                     'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
@@ -136,16 +136,16 @@ 
             );
         }
 
-        if ($ns !== null) {
+        if ($ns !== null){
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null){
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else){
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;

Braces +19 added lines, -9 removed lines

@@ -52,7 +52,8 @@ 
     {
         $permission = $this->getPermissions($controller, $action);
 
-        if ($permission !== null && !$this->guard->allows($permission[0], $parameters)) {
+        if ($permission !== null && !$this->guard->allows($permission[0], $parameters))
+        {
             throw new ControllerException(
                 sprintf(
                     'Unauthorized permission `%s` for action `%s`->`%s`',
@@ -79,14 +80,18 @@ 
     private function getPermissions(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return null;
         }
 
@@ -104,7 +109,8 @@ 
             Guarded::class
         );
 
-        if ($action === null) {
+        if ($action === null)
+        {
             return null;
         }
 
@@ -126,7 +132,8 @@ 
             ControllerException::FORBIDDEN
         ];
 
-        if ($guarded->permission === null && $ns === null) {
+        if ($guarded->permission === null && $ns === null)
+        {
             throw new InterceptorException(
                 sprintf(
                     'Unable to apply @Guarded without name or @GuardNamespace on `%s`->`%s`',
@@ -136,16 +143,19 @@ 
             );
         }
 
-        if ($ns !== null) {
+        if ($ns !== null)
+        {
             $permission[0] = sprintf('%s.%s', $ns->namespace, $permission[0]);
         }
 
-        if ($this->namespace !== null) {
+        if ($this->namespace !== null)
+        {
             // global namespace
             $permission[0] = sprintf('%s.%s', $this->namespace, $permission[0]);
         }
 
-        switch ($guarded->else) {
+        switch ($guarded->else)
+        {
             case 'badAction':
                 $permission[1] = ControllerException::BAD_ACTION;
                 break;

src/GRPC/GRPCDispatcher.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
         EnvironmentInterface $env,
         FinalizerInterface $finalizer,
         ContainerInterface $container
-    ) {
+    ){
         $this->env = $env;
         $this->finalizer = $finalizer;
         $this->container = $container;
@@ -69,14 +69,14 @@ 
         $worker = $this->container->get(Worker::class);
         $locator = $this->container->get(LocatorInterface::class);
 
-        foreach ($locator->getServices() as $interface => $service) {
+        foreach ($locator->getServices() as $interface => $service){
             $server->registerService($interface, $service);
         }
 
         $server->serve(
             $worker,
             function (\Throwable $e = null): void {
-                if ($e !== null) {
+                if ($e !== null){
                     $this->handleException($e);
                 }
 
@@ -90,9 +90,9 @@ 
      */
     protected function handleException(\Throwable $e): void
     {
-        try {
+        try{
             $this->container->get(SnapshotterInterface::class)->register($e);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }catch (\Throwable | ContainerExceptionInterface $se){
             // no need to notify when unable to register an exception
         }
     }

Braces +9 added lines, -4 removed lines

@@ -69,14 +69,16 @@ 
         $worker = $this->container->get(Worker::class);
         $locator = $this->container->get(LocatorInterface::class);
 
-        foreach ($locator->getServices() as $interface => $service) {
+        foreach ($locator->getServices() as $interface => $service)
+        {
             $server->registerService($interface, $service);
         }
 
         $server->serve(
             $worker,
             function (\Throwable $e = null): void {
-                if ($e !== null) {
+                if ($e !== null)
+                {
                     $this->handleException($e);
                 }
 
@@ -90,9 +92,12 @@ 
      */
     protected function handleException(\Throwable $e): void
     {
-        try {
+        try
+        {
             $this->container->get(SnapshotterInterface::class)->register($e);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }
+        catch (\Throwable | ContainerExceptionInterface $se)
+        {
             // no need to notify when unable to register an exception
         }
     }

src/GRPC/ProtoCompiler.php

Spacing +6 added lines, -6 removed lines

@@ -63,14 +63,14 @@ 
 
         $output = trim(join("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== ''){
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file){
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -87,11 +87,11 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0){
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 
-        $target = $this->files->normalizePath($this->basePath . '/' . $source);
+        $target = $this->files->normalizePath($this->basePath.'/'.$source);
 
         $this->files->ensureDirectory(dirname($target));
         $this->files->copy($file, $target);
@@ -104,7 +104,7 @@ 
      */
     private function tmpDir(): string
     {
-        $directory = sys_get_temp_dir() . '/' . spl_object_hash($this);
+        $directory = sys_get_temp_dir().'/'.spl_object_hash($this);
         $this->files->ensureDirectory($directory);
 
         return $this->files->normalizePath($directory, true);
@@ -120,7 +120,7 @@ 
     {
         return array_filter(
             $this->files->getFiles(dirname($protoFile)),
-            function ($file) {
+            function ($file){
                 return strpos($file, '.proto') !== false;
             }
         );

Braces +8 added lines, -4 removed lines

@@ -63,14 +63,16 @@ 
 
         $output = trim(join("\n", $output), "\n ,");
 
-        if ($output !== '') {
+        if ($output !== '')
+        {
             $this->files->deleteDirectory($tmpDir);
             throw new CompileException($output);
         }
 
         // copying files (using relative path and namespace)
         $result = [];
-        foreach ($this->files->getFiles($tmpDir) as $file) {
+        foreach ($this->files->getFiles($tmpDir) as $file)
+        {
             $result[] = $this->copy($tmpDir, $file);
         }
 
@@ -87,7 +89,8 @@ 
     private function copy(string $tmpDir, string $file): string
     {
         $source = ltrim($this->files->relativePath($file, $tmpDir), '\\/');
-        if (strpos($source, $this->baseNamespace) === 0) {
+        if (strpos($source, $this->baseNamespace) === 0)
+        {
             $source = ltrim(substr($source, strlen($this->baseNamespace)), '\\/');
         }
 
@@ -120,7 +123,8 @@ 
     {
         return array_filter(
             $this->files->getFiles(dirname($protoFile)),
-            function ($file) {
+            function ($file)
+            {
                 return strpos($file, '.proto') !== false;
             }
         );

functions.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 use Spiral\Core\Container\Autowire;
 use Spiral\Debug\Dumper;
 
-if (!function_exists('bind')) {
+if (!function_exists('bind')){
     /**
      * Shortcut to container Autowire definition.
      *
@@ -30,7 +30,7 @@ 
     }
 }
 
-if (!function_exists('dumprr')) {
+if (!function_exists('dumprr')){
     /**
      * Dumprr is similar to Dump function but always redirect output to STDERR.
      *

Braces +4 added lines, -2 removed lines

@@ -12,7 +12,8 @@ 
 use Spiral\Core\Container\Autowire;
 use Spiral\Debug\Dumper;
 
-if (!function_exists('bind')) {
+if (!function_exists('bind'))
+{
     /**
      * Shortcut to container Autowire definition.
      *
@@ -30,7 +31,8 @@ 
     }
 }
 
-if (!function_exists('dumprr')) {
+if (!function_exists('dumprr'))
+{
     /**
      * Dumprr is similar to Dump function but always redirect output to STDERR.
      *

src/Auth/Cycle/TokenStorage.php

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false){
             return null;
         }
 
@@ -55,7 +55,7 @@ 
         /** @var Token $token */
         $token = $this->orm->getRepository(Token::class)->findByPK($pk);
 
-        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))) {
+        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))){
             // hijacked or deleted
             return null;
         }
@@ -63,7 +63,7 @@ 
         $token->setSecretValue($hash);
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()){
             $this->delete($token);
             return null;
         }
@@ -76,7 +76,7 @@ 
      */
     public function create(array $payload, DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token(
                 $this->issueID(),
                 $this->randomHash(128),
@@ -89,7 +89,7 @@ 
             $this->em->run();
 
             return $token;
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -99,10 +99,10 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try{
             $this->em->delete($token);
             $this->em->run();
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }
@@ -122,7 +122,7 @@ 
             ->select()
             ->from($this->orm->getSource(Token::class)->getTable());
 
-        while ((clone $query)->where('id', $id)->count('id') !== 0) {
+        while ((clone $query)->where('id', $id)->count('id') !== 0){
             $id = $this->randomHash(64);
         }
 

Braces +18 added lines, -8 removed lines

@@ -46,7 +46,8 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        if (strpos($id, ':') === false) {
+        if (strpos($id, ':') === false)
+        {
             return null;
         }
 
@@ -55,7 +56,8 @@ 
         /** @var Token $token */
         $token = $this->orm->getRepository(Token::class)->findByPK($pk);
 
-        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash))) {
+        if ($token === null || !hash_equals($token->getHashedValue(), hash('sha512', $hash)))
+        {
             // hijacked or deleted
             return null;
         }
@@ -63,7 +65,8 @@ 
         $token->setSecretValue($hash);
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable())
+        {
             $this->delete($token);
             return null;
         }
@@ -76,7 +79,8 @@ 
      */
     public function create(array $payload, DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token(
                 $this->issueID(),
                 $this->randomHash(128),
@@ -89,7 +93,9 @@ 
             $this->em->run();
 
             return $token;
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new TokenStorageException('Unable to create token', $e->getCode(), $e);
         }
     }
@@ -99,10 +105,13 @@ 
      */
     public function delete(TokenInterface $token): void
     {
-        try {
+        try
+        {
             $this->em->delete($token);
             $this->em->run();
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new TokenStorageException('Unable to delete token', $e->getCode(), $e);
         }
     }
@@ -122,7 +131,8 @@ 
             ->select()
             ->from($this->orm->getSource(Token::class)->getTable());
 
-        while ((clone $query)->where('id', $id)->count('id') !== 0) {
+        while ((clone $query)->where('id', $id)->count('id') !== 0)
+        {
             $id = $this->randomHash(64);
         }
 

src/Auth/Cycle/Token.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         array $payload,
         DateTimeInterface $createdAt,
         DateTimeInterface $expiresAt = null
-    ) {
+    ){
         $this->id = $id;
 
         $this->secretValue = $secretValue;

src/Auth/Session/TokenStorage.php

Spacing +7 added lines, -7 removed lines

@@ -43,23 +43,23 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try{
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null){
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if (!hash_equals($token->getID(), $id)) {
+        if (!hash_equals($token->getID(), $id)){
             return null;
         }
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()){
             $this->delete($token);
             return null;
         }
@@ -72,12 +72,12 @@ 
      */
     public function create(array $payload, DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }

Braces +16 added lines, -7 removed lines

@@ -43,23 +43,29 @@ 
      */
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try
+        {
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null)
+            {
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new TokenStorageException('Unable to load session token', $e->getCode(), $e);
         }
 
-        if (!hash_equals($token->getID(), $id)) {
+        if (!hash_equals($token->getID(), $id))
+        {
             return null;
         }
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new DateTimeImmutable())
+        {
             $this->delete($token);
             return null;
         }
@@ -72,12 +78,15 @@ 
      */
     public function create(array $payload, DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new TokenStorageException('Unable to create session token', $e->getCode(), $e);
         }
     }