spiral / framework

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

src/Security/src/RuleManager.php

Spacing +16 added lines, -16 removed lines

@@ -42,11 +42,11 @@ 
      */
     public function set(string $name, $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule)){
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule)){
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -62,7 +62,7 @@ 
      */
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -76,11 +76,11 @@ 
      */
     public function has(string $name): bool
     {
-        if (isset($this->rules[$name])) {
+        if (isset($this->rules[$name])){
             return true;
         }
 
-        if (class_exists($name)) {
+        if (class_exists($name)){
             //We are allowing to use class names without direct registration
             return true;
         }
@@ -94,26 +94,26 @@ 
      */
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException("Undefined rule '{$name}'");
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name])){
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }else{
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface){
             return $rule;
         }
 
-        if (is_string($rule)) {
+        if (is_string($rule)){
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface){
                 throw new RuleException(sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -136,18 +136,18 @@ 
      */
     private function validateRule($rule): bool
     {
-        if ($rule instanceof \Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof \Closure || $rule instanceof RuleInterface){
             return true;
         }
 
-        if (is_array($rule)) {
+        if (is_array($rule)){
             return is_callable($rule, true);
         }
 
-        if (is_string($rule) && class_exists($rule)) {
-            try {
+        if (is_string($rule) && class_exists($rule)){
+            try{
                 $reflection = new \ReflectionClass($rule);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 return false;
             }
 

Braces +34 added lines, -16 removed lines

@@ -42,11 +42,13 @@ 
      */
     public function set(string $name, $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule))
+        {
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule))
+        {
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -62,7 +64,8 @@ 
      */
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -76,11 +79,13 @@ 
      */
     public function has(string $name): bool
     {
-        if (isset($this->rules[$name])) {
+        if (isset($this->rules[$name]))
+        {
             return true;
         }
 
-        if (class_exists($name)) {
+        if (class_exists($name))
+        {
             //We are allowing to use class names without direct registration
             return true;
         }
@@ -94,26 +99,33 @@ 
      */
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException("Undefined rule '{$name}'");
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name]))
+        {
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }
+        else
+        {
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface)
+        {
             return $rule;
         }
 
-        if (is_string($rule)) {
+        if (is_string($rule))
+        {
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface)
+            {
                 throw new RuleException(sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -136,18 +148,24 @@ 
      */
     private function validateRule($rule): bool
     {
-        if ($rule instanceof \Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof \Closure || $rule instanceof RuleInterface)
+        {
             return true;
         }
 
-        if (is_array($rule)) {
+        if (is_array($rule))
+        {
             return is_callable($rule, true);
         }
 
-        if (is_string($rule) && class_exists($rule)) {
-            try {
+        if (is_string($rule) && class_exists($rule))
+        {
+            try
+            {
                 $reflection = new \ReflectionClass($rule);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 return false;
             }
 

src/Security/src/Traits/GuardedTrait.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,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'
             );
@@ -65,9 +65,9 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (defined('static::GUARD_NAMESPACE')) {
+        if (defined('static::GUARD_NAMESPACE')){
             // Yay! Isolation
-            $permission = constant(get_called_class() . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
+            $permission = constant(get_called_class().'::'.'GUARD_NAMESPACE').'.'.$permission;
         }
 
         return $permission;

Braces +4 added lines, -2 removed lines

@@ -28,7 +28,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'
             );
@@ -65,7 +66,8 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (defined('static::GUARD_NAMESPACE')) {
+        if (defined('static::GUARD_NAMESPACE'))
+        {
             // Yay! Isolation
             $permission = constant(get_called_class() . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
         }

src/Security/src/Rule/CompositeRule.php

Spacing +4 added lines, -4 removed lines

@@ -54,16 +54,16 @@
     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

@@ -54,16 +54,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;
             }
         }