spiral / framework

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

src/Auth/Session/Token.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] !== null) {
+        if ($data['expiresAt'] !== null){
             $expiresAt = (new DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] !== null) {
+        if ($data['expiresAt'] !== null)
+        {
             $expiresAt = (new DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

src/Cycle/RepositoryInjector.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
     {
         $schema = $this->orm->getSchema();
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role){
             $repository = $schema->define($role, Schema::REPOSITORY);
 
             if (
                 $repository !== Select\Repository::class
                 && $repository === $class->getName()
-            ) {
+            ){
                 return $this->orm->getRepository($role);
             }
         }

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
     {
         $schema = $this->orm->getSchema();
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role)
+        {
             $repository = $schema->define($role, Schema::REPOSITORY);
 
             if (

src/Framework/Kernel.php

Spacing +9 added lines, -9 removed lines

@@ -43,29 +43,29 @@
      */
     protected function mapDirectories(array $directories): array
     {
-        if (!isset($directories['root'])) {
+        if (!isset($directories['root'])){
             throw new BootException('Missing required directory `root`');
         }
 
-        if (!isset($directories['app'])) {
-            $directories['app'] = $directories['root'] . '/app/';
+        if (!isset($directories['app'])){
+            $directories['app'] = $directories['root'].'/app/';
         }
 
         return array_merge(
             [
                 // public root
-                'public'    => $directories['root'] . '/public/',
+                'public'    => $directories['root'].'/public/',
 
                 // vendor libraries
-                'vendor'    => $directories['root'] . '/vendor/',
+                'vendor'    => $directories['root'].'/vendor/',
 
                 // data directories
-                'runtime'   => $directories['root'] . '/runtime/',
-                'cache'     => $directories['root'] . '/runtime/cache/',
+                'runtime'   => $directories['root'].'/runtime/',
+                'cache'     => $directories['root'].'/runtime/cache/',
 
                 // application directories
-                'config'    => $directories['app'] . '/config/',
-                'resources' => $directories['app'] . '/resources/',
+                'config'    => $directories['app'].'/config/',
+                'resources' => $directories['app'].'/resources/',
             ],
             $directories
         );

Braces +4 added lines, -2 removed lines

@@ -43,11 +43,13 @@
      */
     protected function mapDirectories(array $directories): array
     {
-        if (!isset($directories['root'])) {
+        if (!isset($directories['root']))
+        {
             throw new BootException('Missing required directory `root`');
         }
 
-        if (!isset($directories['app'])) {
+        if (!isset($directories['app']))
+        {
             $directories['app'] = $directories['root'] . '/app/';
         }
 

src/Command/Router/ListCommand.php

Spacing +11 added lines, -11 removed lines

@@ -42,8 +42,8 @@ 
     {
         $grid = $this->table(['Verbs:', 'Pattern:', 'Target:']);
 
-        foreach ($router->getRoutes() as $route) {
-            if ($route instanceof Route) {
+        foreach ($router->getRoutes() as $route){
+            if ($route instanceof Route){
                 $grid->addRow(
                     [
                         $this->getVerbs($route),
@@ -63,14 +63,14 @@ 
      */
     private function getVerbs(Route $route): string
     {
-        if ($route->getVerbs() === Route::VERBS) {
+        if ($route->getVerbs() === Route::VERBS){
             return '*';
         }
 
         $result = [];
 
-        foreach ($route->getVerbs() as $verb) {
-            switch (strtolower($verb)) {
+        foreach ($route->getVerbs() as $verb){
+            switch (strtolower($verb)){
                 case 'get':
                     $verb = '<fg=green>GET</>';
                     break;
@@ -106,7 +106,7 @@ 
 
         return preg_replace_callback(
             '/<([^>]*)>/',
-            static function ($m) {
+            static function ($m){
                 return sprintf('<fg=magenta>%s</>', $m[0]);
             },
             $pattern
@@ -123,7 +123,7 @@ 
     private function getTarget(Route $route, KernelInterface $kernel): string
     {
         $target = $this->getValue($route, 'target');
-        switch (true) {
+        switch (true){
             case $target instanceof Closure:
                 $reflection = new ReflectionFunction($target);
                 return sprintf(
@@ -147,7 +147,7 @@ 
 
             case $target instanceof Group:
                 $result = [];
-                foreach ($this->getValue($target, 'controllers') as $alias => $class) {
+                foreach ($this->getValue($target, 'controllers') as $alias => $class){
                     $result[] = sprintf('%s => %s', $alias, $this->relativeClass($class, $kernel));
                 }
 
@@ -171,11 +171,11 @@ 
      */
     private function getValue(object $object, string $property)
     {
-        try {
+        try{
             $r = new ReflectionObject($object);
             $prop = $r->getProperty($property);
             $prop->setAccessible(true);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             return $e->getMessage();
         }
 
@@ -192,7 +192,7 @@ 
         $r = new ReflectionObject($kernel);
         $r->getNamespaceName();
 
-        if (strpos($class, $r->getNamespaceName()) === 0) {
+        if (strpos($class, $r->getNamespaceName()) === 0){
             return substr($class, strlen($r->getNamespaceName()) + 1);
         }
 

Braces +23 added lines, -11 removed lines

@@ -42,8 +42,10 @@ 
     {
         $grid = $this->table(['Verbs:', 'Pattern:', 'Target:']);
 
-        foreach ($router->getRoutes() as $route) {
-            if ($route instanceof Route) {
+        foreach ($router->getRoutes() as $route)
+        {
+            if ($route instanceof Route)
+            {
                 $grid->addRow(
                     [
                         $this->getVerbs($route),
@@ -63,14 +65,17 @@ 
      */
     private function getVerbs(Route $route): string
     {
-        if ($route->getVerbs() === Route::VERBS) {
+        if ($route->getVerbs() === Route::VERBS)
+        {
             return '*';
         }
 
         $result = [];
 
-        foreach ($route->getVerbs() as $verb) {
-            switch (strtolower($verb)) {
+        foreach ($route->getVerbs() as $verb)
+        {
+            switch (strtolower($verb))
+            {
                 case 'get':
                     $verb = '<fg=green>GET</>';
                     break;
@@ -106,7 +111,8 @@ 
 
         return preg_replace_callback(
             '/<([^>]*)>/',
-            static function ($m) {
+            static function ($m)
+            {
                 return sprintf('<fg=magenta>%s</>', $m[0]);
             },
             $pattern
@@ -123,7 +129,8 @@ 
     private function getTarget(Route $route, KernelInterface $kernel): string
     {
         $target = $this->getValue($route, 'target');
-        switch (true) {
+        switch (true)
+        {
             case $target instanceof Closure:
                 $reflection = new ReflectionFunction($target);
                 return sprintf(
@@ -147,7 +154,8 @@ 
 
             case $target instanceof Group:
                 $result = [];
-                foreach ($this->getValue($target, 'controllers') as $alias => $class) {
+                foreach ($this->getValue($target, 'controllers') as $alias => $class)
+                {
                     $result[] = sprintf('%s => %s', $alias, $this->relativeClass($class, $kernel));
                 }
 
@@ -171,11 +179,14 @@ 
      */
     private function getValue(object $object, string $property)
     {
-        try {
+        try
+        {
             $r = new ReflectionObject($object);
             $prop = $r->getProperty($property);
             $prop->setAccessible(true);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             return $e->getMessage();
         }
 
@@ -192,7 +203,8 @@ 
         $r = new ReflectionObject($kernel);
         $r->getNamespaceName();
 
-        if (strpos($class, $r->getNamespaceName()) === 0) {
+        if (strpos($class, $r->getNamespaceName()) === 0)
+        {
             return substr($class, strlen($r->getNamespaceName()) + 1);
         }
 

src/Console/Logger/DebugListener.php

Spacing +9 added lines, -9 removed lines

@@ -51,11 +51,11 @@ 
      */
     public function __invoke(LogEvent $event): void
     {
-        if (empty($this->output)) {
+        if (empty($this->output)){
             return;
         }
 
-        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE){
             return;
         }
 
@@ -93,7 +93,7 @@ 
      */
     public function enable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry)){
             $this->listenerRegistry->addListener($this);
         }
 
@@ -107,7 +107,7 @@ 
      */
     public function disable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry)){
             $this->listenerRegistry->removeListener($this);
         }
 
@@ -130,13 +130,13 @@ 
      */
     private function getChannel(string $channel): string
     {
-        if (!class_exists($channel, false)) {
+        if (!class_exists($channel, false)){
             return "[{$channel}]";
         }
 
-        try {
+        try{
             $reflection = new \ReflectionClass($channel);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return $channel;
         }
 
@@ -150,10 +150,10 @@ 
      */
     private function getMessage(bool $decorated, string $message): string
     {
-        if (!$decorated) {
+        if (!$decorated){
             return $message;
         }
 
-        return Color::GRAY . $message . Color::RESET;
+        return Color::GRAY.$message.Color::RESET;
     }
 }

Braces +17 added lines, -8 removed lines

@@ -51,11 +51,13 @@ 
      */
     public function __invoke(LogEvent $event): void
     {
-        if (empty($this->output)) {
+        if (empty($this->output))
+        {
             return;
         }
 
-        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if ($this->output->getVerbosity() < OutputInterface::VERBOSITY_VERY_VERBOSE)
+        {
             return;
         }
 
@@ -93,7 +95,8 @@ 
      */
     public function enable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry))
+        {
             $this->listenerRegistry->addListener($this);
         }
 
@@ -107,7 +110,8 @@ 
      */
     public function disable(): self
     {
-        if (!empty($this->listenerRegistry)) {
+        if (!empty($this->listenerRegistry))
+        {
             $this->listenerRegistry->removeListener($this);
         }
 
@@ -130,13 +134,17 @@ 
      */
     private function getChannel(string $channel): string
     {
-        if (!class_exists($channel, false)) {
+        if (!class_exists($channel, false))
+        {
             return "[{$channel}]";
         }
 
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($channel);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return $channel;
         }
 
@@ -150,7 +158,8 @@ 
      */
     private function getMessage(bool $decorated, string $message): string
     {
-        if (!$decorated) {
+        if (!$decorated)
+        {
             return $message;
         }