spiral / framework

src/Views/src/Loader/PathParser.php

Spacing +12 added lines, -12 removed lines

@@ -75,21 +75,21 @@ 
         );
 
         $namespace = $this->defaultNamespace;
-        if (strpos($filename, '.') === false) {
+        if (strpos($filename, '.') === false){
             //Force default extension
-            $filename .= '.' . $this->extension;
-        } elseif (!$this->match($filename)) {
+            $filename .= '.'.$this->extension;
+        } elseif (!$this->match($filename)){
             return null;
         }
 
-        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false) {
+        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false){
             list($namespace, $filename) = explode(LoaderInterface::NS_SEPARATOR, $filename);
         }
 
         //Twig like namespaces
-        if (isset($filename[0]) && $filename[0] == '@') {
+        if (isset($filename[0]) && $filename[0] == '@'){
             $separator = strpos($filename, '/');
-            if ($separator === false) {
+            if ($separator === false){
                 throw new PathException(sprintf('Malformed view path"%s" (expecting "@namespace/name").', $path));
             }
 
@@ -123,11 +123,11 @@ 
      */
     private function validatePath(string $path): void
     {
-        if (empty($path)) {
+        if (empty($path)){
             throw new PathException('A view path is empty');
         }
 
-        if (false !== strpos($path, "\0")) {
+        if (false !== strpos($path, "\0")){
             throw new PathException('A view path cannot contain NUL bytes');
         }
 
@@ -135,14 +135,14 @@ 
         $parts = explode('/', $path);
         $level = 0;
 
-        foreach ($parts as $part) {
-            if ('..' === $part) {
+        foreach ($parts as $part){
+            if ('..' === $part){
                 --$level;
-            } elseif ('.' !== $part) {
+            } elseif ('.' !== $part){
                 ++$level;
             }
 
-            if ($level < 0) {
+            if ($level < 0){
                 throw new PathException(sprintf(
                     'Looks like you try to load a view outside configured directories (%s)',
                     $path

Braces +24 added lines, -11 removed lines

@@ -75,21 +75,27 @@ 
         );
 
         $namespace = $this->defaultNamespace;
-        if (strpos($filename, '.') === false) {
+        if (strpos($filename, '.') === false)
+        {
             //Force default extension
             $filename .= '.' . $this->extension;
-        } elseif (!$this->match($filename)) {
+        }
+        elseif (!$this->match($filename))
+        {
             return null;
         }
 
-        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false) {
+        if (strpos($filename, LoaderInterface::NS_SEPARATOR) !== false)
+        {
             list($namespace, $filename) = explode(LoaderInterface::NS_SEPARATOR, $filename);
         }
 
         //Twig like namespaces
-        if (isset($filename[0]) && $filename[0] == '@') {
+        if (isset($filename[0]) && $filename[0] == '@')
+        {
             $separator = strpos($filename, '/');
-            if ($separator === false) {
+            if ($separator === false)
+            {
                 throw new PathException(sprintf('Malformed view path"%s" (expecting "@namespace/name").', $path));
             }
 
@@ -123,11 +129,13 @@ 
      */
     private function validatePath(string $path): void
     {
-        if (empty($path)) {
+        if (empty($path))
+        {
             throw new PathException('A view path is empty');
         }
 
-        if (false !== strpos($path, "\0")) {
+        if (false !== strpos($path, "\0"))
+        {
             throw new PathException('A view path cannot contain NUL bytes');
         }
 
@@ -135,14 +143,19 @@ 
         $parts = explode('/', $path);
         $level = 0;
 
-        foreach ($parts as $part) {
-            if ('..' === $part) {
+        foreach ($parts as $part)
+        {
+            if ('..' === $part)
+            {
                 --$level;
-            } elseif ('.' !== $part) {
+            }
+            elseif ('.' !== $part)
+            {
                 ++$level;
             }
 
-            if ($level < 0) {
+            if ($level < 0)
+            {
                 throw new PathException(sprintf(
                     'Looks like you try to load a view outside configured directories (%s)',
                     $path

src/Views/src/ViewLoader.php

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
         array $namespaces,
         FilesInterface $files = null,
         string $defaultNamespace = self::DEFAULT_NAMESPACE
-    ) {
+    ){
         $this->namespaces = $namespaces;
         $this->files = $files ?? new Files();
         $this->defaultNamespace = $defaultNamespace;
@@ -65,7 +65,7 @@ 
      */
     public function getExtension(): ?string
     {
-        if ($this->parser !== null) {
+        if ($this->parser !== null){
             return $this->parser->getExtension();
         }
 
@@ -80,22 +80,22 @@ 
      */
     public function exists(string $path, string &$filename = null, ViewPath &$parsed = null): bool
     {
-        if (empty($this->parser)) {
+        if (empty($this->parser)){
             throw new LoaderException('Unable to locate view source, no extension has been associated.');
         }
 
         $parsed = $this->parser->parse($path);
-        if (empty($parsed)) {
+        if (empty($parsed)){
             return false;
         }
 
-        if (!isset($this->namespaces[$parsed->getNamespace()])) {
+        if (!isset($this->namespaces[$parsed->getNamespace()])){
             return false;
         }
 
-        foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory) {
+        foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory){
             $directory = $this->files->normalizePath($directory, true);
-            if ($this->files->exists(sprintf('%s%s', $directory, $parsed->getBasename()))) {
+            if ($this->files->exists(sprintf('%s%s', $directory, $parsed->getBasename()))){
                 $filename = sprintf('%s%s', $directory, $parsed->getBasename());
 
                 return true;
@@ -110,7 +110,7 @@ 
      */
     public function load(string $path): ViewSource
     {
-        if (!$this->exists($path, $filename, $parsed)) {
+        if (!$this->exists($path, $filename, $parsed)){
             throw new LoaderException("Unable to load view `$path`, file does not exists.");
         }
 
@@ -123,21 +123,21 @@ 
      */
     public function list(string $namespace = null): array
     {
-        if (empty($this->parser)) {
+        if (empty($this->parser)){
             throw new LoaderException('Unable to list view sources, no extension has been associated.');
         }
 
         $result = [];
-        foreach ($this->namespaces as $ns => $directories) {
-            if (!empty($namespace) && $namespace != $ns) {
+        foreach ($this->namespaces as $ns => $directories){
+            if (!empty($namespace) && $namespace != $ns){
                 continue;
             }
 
-            foreach ((array)$directories as $directory) {
+            foreach ((array)$directories as $directory){
                 $files = $this->files->getFiles($directory);
 
-                foreach ($files as $filename) {
-                    if (!$this->parser->match($filename)) {
+                foreach ($files as $filename){
+                    if (!$this->parser->match($filename)){
                         // does not belong to this loader
                         continue;
                     }

Braces +26 added lines, -13 removed lines

@@ -65,7 +65,8 @@ 
      */
     public function getExtension(): ?string
     {
-        if ($this->parser !== null) {
+        if ($this->parser !== null)
+        {
             return $this->parser->getExtension();
         }
 
@@ -80,22 +81,27 @@ 
      */
     public function exists(string $path, string &$filename = null, ViewPath &$parsed = null): bool
     {
-        if (empty($this->parser)) {
+        if (empty($this->parser))
+        {
             throw new LoaderException('Unable to locate view source, no extension has been associated.');
         }
 
         $parsed = $this->parser->parse($path);
-        if (empty($parsed)) {
+        if (empty($parsed))
+        {
             return false;
         }
 
-        if (!isset($this->namespaces[$parsed->getNamespace()])) {
+        if (!isset($this->namespaces[$parsed->getNamespace()]))
+        {
             return false;
         }
 
-        foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory) {
+        foreach ((array)$this->namespaces[$parsed->getNamespace()] as $directory)
+        {
             $directory = $this->files->normalizePath($directory, true);
-            if ($this->files->exists(sprintf('%s%s', $directory, $parsed->getBasename()))) {
+            if ($this->files->exists(sprintf('%s%s', $directory, $parsed->getBasename())))
+            {
                 $filename = sprintf('%s%s', $directory, $parsed->getBasename());
 
                 return true;
@@ -110,7 +116,8 @@ 
      */
     public function load(string $path): ViewSource
     {
-        if (!$this->exists($path, $filename, $parsed)) {
+        if (!$this->exists($path, $filename, $parsed))
+        {
             throw new LoaderException("Unable to load view `$path`, file does not exists.");
         }
 
@@ -123,21 +130,27 @@ 
      */
     public function list(string $namespace = null): array
     {
-        if (empty($this->parser)) {
+        if (empty($this->parser))
+        {
             throw new LoaderException('Unable to list view sources, no extension has been associated.');
         }
 
         $result = [];
-        foreach ($this->namespaces as $ns => $directories) {
-            if (!empty($namespace) && $namespace != $ns) {
+        foreach ($this->namespaces as $ns => $directories)
+        {
+            if (!empty($namespace) && $namespace != $ns)
+            {
                 continue;
             }
 
-            foreach ((array)$directories as $directory) {
+            foreach ((array)$directories as $directory)
+            {
                 $files = $this->files->getFiles($directory);
 
-                foreach ($files as $filename) {
-                    if (!$this->parser->match($filename)) {
+                foreach ($files as $filename)
+                {
+                    if (!$this->parser->match($filename))
+                    {
                         // does not belong to this loader
                         continue;
                     }

src/Security/tests/PermissionManagerTest.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
         $this->assertEquals($allowRule, $manager->getRule(static::ROLE, static::PERMISSION));
 
         // test pattern permission
-        $this->assertEquals($manager, $manager->associate(static::ROLE, static::PERMISSION . '.*', AllowRule::class));
-        $this->assertEquals($allowRule, $manager->getRule(static::ROLE, static::PERMISSION . '.' . static::PERMISSION));
+        $this->assertEquals($manager, $manager->associate(static::ROLE, static::PERMISSION.'.*', AllowRule::class));
+        $this->assertEquals($allowRule, $manager->getRule(static::ROLE, static::PERMISSION.'.'.static::PERMISSION));
 
         $this->assertEquals($manager, $manager->deassociate(static::ROLE, static::PERMISSION));
         $this->assertEquals($forbidRule, $manager->getRule(static::ROLE, static::PERMISSION));

src/Security/tests/Traits/GuardedTraitTest.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         $this->assertEquals(static::OPERATION, $guarded->resolvePermission(static::OPERATION));
 
         $guarded = new GuardedWithNamespace();
-        $resolvedPermission = GuardedWithNamespace::GUARD_NAMESPACE . '.' . static::OPERATION;
+        $resolvedPermission = GuardedWithNamespace::GUARD_NAMESPACE.'.'.static::OPERATION;
         $this->assertEquals($resolvedPermission, $guarded->resolvePermission(static::OPERATION));
     }
 }

src/Security/tests/RuleManagerTest.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         // other rule types
         $manager->set('RuleInterface', $this->rule);
         $this->assertEquals($this->rule, $manager->get('RuleInterface'));
-        $manager->set('Closure', function () {
+        $manager->set('Closure', function (){
             return true;
         });
         $this->assertTrue($manager->get('Closure') instanceof CallableRule);

Braces +2 added lines, -1 removed lines

@@ -60,7 +60,8 @@
         // other rule types
         $manager->set('RuleInterface', $this->rule);
         $this->assertEquals($this->rule, $manager->get('RuleInterface'));
-        $manager->set('Closure', function () {
+        $manager->set('Closure', function ()
+        {
             return true;
         });
         $this->assertTrue($manager->get('Closure') instanceof CallableRule);

src/Security/src/PermissionManager.php

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function addRole(string $role): PermissionManager
     {
-        if ($this->hasRole($role)) {
+        if ($this->hasRole($role)){
             throw new RoleException("Role '{$role}' already exists");
         }
 
@@ -90,7 +90,7 @@ 
      */
     public function removeRole(string $role): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -112,7 +112,7 @@ 
      */
     public function getPermissions(string $role): array
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -124,7 +124,7 @@ 
      */
     public function getRule(string $role, string $permission): RuleInterface
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -139,11 +139,11 @@ 
      */
     public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role)){
             throw new RoleException("Undefined role '{$role}'");
         }
 
-        if (!$this->rules->has($rule)) {
+        if (!$this->rules->has($rule)){
             throw new PermissionException("Undefined rule '{$rule}'");
         }
 
@@ -176,14 +176,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

@@ -72,7 +72,8 @@ 
      */
     public function addRole(string $role): PermissionManager
     {
-        if ($this->hasRole($role)) {
+        if ($this->hasRole($role))
+        {
             throw new RoleException("Role '{$role}' already exists");
         }
 
@@ -90,7 +91,8 @@ 
      */
     public function removeRole(string $role): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -112,7 +114,8 @@ 
      */
     public function getPermissions(string $role): array
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -124,7 +127,8 @@ 
      */
     public function getRule(string $role, string $permission): RuleInterface
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException("Undefined role '{$role}'");
         }
 
@@ -139,11 +143,13 @@ 
      */
     public function associate(string $role, string $permission, string $rule = AllowRule::class): PermissionManager
     {
-        if (!$this->hasRole($role)) {
+        if (!$this->hasRole($role))
+        {
             throw new RoleException("Undefined role '{$role}'");
         }
 
-        if (!$this->rules->has($rule)) {
+        if (!$this->rules->has($rule))
+        {
             throw new PermissionException("Undefined rule '{$rule}'");
         }
 
@@ -176,14 +182,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/Guard.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
         PermissionsInterface $permissions,
         ActorInterface $actor = null,
         array $roles = []
-    ) {
+    ){
         $this->roles = $roles;
         $this->actor = $actor;
         $this->permissions = $permissions;
@@ -48,8 +48,8 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role){
+            if (!$this->permissions->hasRole($role)){
                 continue;
             }
 
@@ -95,7 +95,7 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (empty($this->actor)) {
+        if (empty($this->actor)){
             throw new GuardException('Unable to get Guard Actor, no value set');
         }
 

Braces +6 added lines, -3 removed lines

@@ -48,8 +48,10 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role)
+        {
+            if (!$this->permissions->hasRole($role))
+            {
                 continue;
             }
 
@@ -95,7 +97,8 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (empty($this->actor)) {
+        if (empty($this->actor))
+        {
             throw new GuardException('Unable to get Guard Actor, no value set');
         }
 

src/Security/src/Matcher.php

Spacing +2 added lines, -2 removed lines

@@ -40,10 +40,10 @@
      */
     public function matches(string $string, string $pattern): bool
     {
-        if ($string === $pattern) {
+        if ($string === $pattern){
             return true;
         }
-        if (!$this->isPattern($pattern)) {
+        if (!$this->isPattern($pattern)){
             return false;
         }
         return (bool)preg_match($this->getRegex($pattern), $string);

Braces +4 added lines, -2 removed lines

@@ -40,10 +40,12 @@
      */
     public function matches(string $string, string $pattern): bool
     {
-        if ($string === $pattern) {
+        if ($string === $pattern)
+        {
             return true;
         }
-        if (!$this->isPattern($pattern)) {
+        if (!$this->isPattern($pattern))
+        {
             return false;
         }
         return (bool)preg_match($this->getRegex($pattern), $string);

src/Security/src/Rule.php

Spacing +5 added lines, -5 removed lines

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

Braces +12 added lines, -5 removed lines

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