spiral / framework

src/Csrf/src/Middleware/CsrfMiddleware.php

Spacing +8 added lines, -8 removed lines

@@ -25,15 +25,15 @@ 
 
     public function __construct(
         private readonly CsrfConfig $config
-    ) {
+    ){
     }
 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()])){
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }else{
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -44,7 +44,7 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie)){
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -75,12 +75,12 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try{
+            if (empty($string = random_bytes($length))){
                 throw new \RuntimeException('Unable to generate random string');
             }
-        } catch (\Throwable $e) {
-            throw new \RuntimeException('Unable to generate random string', (int) $e->getCode(), $e);
+        }catch (\Throwable $e){
+            throw new \RuntimeException('Unable to generate random string', (int)$e->getCode(), $e);
         }
 
         return \substr(\base64_encode($string), 0, $length);

Braces +14 added lines, -6 removed lines

@@ -31,9 +31,12 @@ 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()]))
+        {
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }
+        else
+        {
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -44,7 +47,8 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie))
+        {
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -75,11 +79,15 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try
+        {
+            if (empty($string = random_bytes($length)))
+            {
                 throw new \RuntimeException('Unable to generate random string');
             }
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new \RuntimeException('Unable to generate random string', (int) $e->getCode(), $e);
         }
 

src/Streams/src/StreamWrapper.php

Spacing +27 added lines, -27 removed lines

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

Braces +41 added lines, -20 removed lines

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

src/AnnotatedRoutes/tests/TestCase.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     protected function makeApp(array $env): App
     {
         $config = [
-            'root' => __DIR__ . '/App',
-            'app'  => __DIR__ . '/App',
+            'root' => __DIR__.'/App',
+            'app'  => __DIR__.'/App',
         ];
 
         return (App::create($config, false))->run(new Environment($env));

src/AnnotatedRoutes/tests/IntegrationTest.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v){
             $r = $r->withAttribute($k, $v);
         }
 
@@ -110,7 +110,7 @@ 
         $factory = $this->app->getContainer()->get(ServerRequestFactoryInterface::class);
         $request = $factory->createServerRequest($method, $uri);
 
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value){
             $request = $request->withAddedHeader($name, $value);
         }
 
@@ -122,7 +122,7 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line){
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,8 @@ 
         array $headers = []
     ): ResponseInterface {
         $r = $this->request($uri, 'GET', [], $headers, []);
-        foreach ($attributes as $k => $v) {
+        foreach ($attributes as $k => $v)
+        {
             $r = $r->withAttribute($k, $v);
         }
 
@@ -110,7 +111,8 @@ 
         $factory = $this->app->getContainer()->get(ServerRequestFactoryInterface::class);
         $request = $factory->createServerRequest($method, $uri);
 
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value)
+        {
             $request = $request->withAddedHeader($name, $value);
         }
 
@@ -122,7 +124,8 @@ 
     public function fetchCookies(array $header)
     {
         $result = [];
-        foreach ($header as $line) {
+        foreach ($header as $line)
+        {
             $cookie = explode('=', $line);
             $result[$cookie[0]] = rawurldecode(substr($cookie[1], 0, strpos($cookie[1], ';')));
         }

src/Security/src/Rule/CompositeRule.php

Spacing +5 added lines, -5 removed lines

@@ -32,22 +32,22 @@
 
     public function __construct(
         private readonly RulesInterface $repository
-    ) {
+    ){
     }
 
     public function allows(ActorInterface $actor, string $permission, array $context): bool
     {
         $allowed = 0;
-        foreach (static::RULES as $rule) {
+        foreach (static::RULES as $rule){
             $rule = $this->repository->get($rule);
 
-            if ($rule->allows($actor, $permission, $context)) {
-                if (static::BEHAVIOUR === self::AT_LEAST_ONE) {
+            if ($rule->allows($actor, $permission, $context)){
+                if (static::BEHAVIOUR === self::AT_LEAST_ONE){
                     return true;
                 }
 
                 $allowed++;
-            } elseif (static::BEHAVIOUR === self::ALL) {
+            } elseif (static::BEHAVIOUR === self::ALL){
                 return false;
             }
         }

Braces +9 added lines, -4 removed lines

@@ -38,16 +38,21 @@
     public function allows(ActorInterface $actor, string $permission, array $context): bool
     {
         $allowed = 0;
-        foreach (static::RULES as $rule) {
+        foreach (static::RULES as $rule)
+        {
             $rule = $this->repository->get($rule);
 
-            if ($rule->allows($actor, $permission, $context)) {
-                if (static::BEHAVIOUR === self::AT_LEAST_ONE) {
+            if ($rule->allows($actor, $permission, $context))
+            {
+                if (static::BEHAVIOUR === self::AT_LEAST_ONE)
+                {
                     return true;
                 }
 
                 $allowed++;
-            } elseif (static::BEHAVIOUR === self::ALL) {
+            }
+            elseif (static::BEHAVIOUR === self::ALL)
+            {
                 return false;
             }
         }

src/Security/src/Rule/CallableRule.php

Spacing +1 added lines, -1 removed lines

@@ -21,6 +21,6 @@
 
     public function allows(ActorInterface $actor, string $permission, array $context): bool
     {
-        return (bool) ($this->callable)($actor, $permission, $context);
+        return (bool)($this->callable)($actor, $permission, $context);
     }
 }

src/Security/src/PermissionManager.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
     public function __construct(
         private readonly RulesInterface $rules,
         private readonly string $defaultRule = ForbidRule::class
-    ) {
+    ){
         $this->matcher = new Matcher();
     }
 
@@ -43,7 +43,7 @@ 
 
     public function addRole(string $role): PermissionManager
     {
-        if ($this->hasRole($role)) {
+        if ($this->hasRole($role)){
             throw new RoleException(\sprintf("Role '%s' already exists", $role));
         }
 
@@ -56,7 +56,7 @@ 
 
     public function removeRole(string $role): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -72,7 +72,7 @@ 
 
     public function getPermissions(string $role): array
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -81,7 +81,7 @@ 
 
     public function getRule(string $role, string $permission): RuleInterface
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -91,11 +91,11 @@ 
 
     public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
-        if (!$this->rules->has($rule)) {
+        if (!$this->rules->has($rule)){
             throw new PermissionException(\sprintf("Undefined rule '%s'", $rule));
         }
 
@@ -121,14 +121,14 @@ 
      */
     private function findRule(string $role, string $permission): string
     {
-        if (isset($this->permissions[$role][$permission])) {
+        if (isset($this->permissions[$role][$permission])){
             //O(1) check
             return $this->permissions[$role][$permission];
         }
 
         //Matching using star syntax
-        foreach ($this->permissions[$role] as $pattern => $rule) {
-            if ($this->matcher->matches($permission, $pattern)) {
+        foreach ($this->permissions[$role] as $pattern => $rule){
+            if ($this->matcher->matches($permission, $pattern)){
                 return $rule;
             }
         }

Braces +18 added lines, -9 removed lines

@@ -43,7 +43,8 @@ 
 
     public function addRole(string $role): PermissionManager
     {
-        if ($this->hasRole($role)) {
+        if ($this->hasRole($role))
+        {
             throw new RoleException(\sprintf("Role '%s' already exists", $role));
         }
 
@@ -56,7 +57,8 @@ 
 
     public function removeRole(string $role): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -72,7 +74,8 @@ 
 
     public function getPermissions(string $role): array
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -81,7 +84,8 @@ 
 
     public function getRule(string $role, string $permission): RuleInterface
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
@@ -91,11 +95,13 @@ 
 
     public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException(\sprintf("Undefined role '%s'", $role));
         }
 
-        if (!$this->rules->has($rule)) {
+        if (!$this->rules->has($rule))
+        {
             throw new PermissionException(\sprintf("Undefined rule '%s'", $rule));
         }
 
@@ -121,14 +127,17 @@ 
      */
     private function findRule(string $role, string $permission): string
     {
-        if (isset($this->permissions[$role][$permission])) {
+        if (isset($this->permissions[$role][$permission]))
+        {
             //O(1) check
             return $this->permissions[$role][$permission];
         }
 
         //Matching using star syntax
-        foreach ($this->permissions[$role] as $pattern => $rule) {
-            if ($this->matcher->matches($permission, $pattern)) {
+        foreach ($this->permissions[$role] as $pattern => $rule)
+        {
+            if ($this->matcher->matches($permission, $pattern))
+            {
                 return $rule;
             }
         }

src/Security/src/Actor/Actor.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 {
     public function __construct(
         private readonly array $roles
-    ) {
+    ){
     }
 
     public function getRoles(): array

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