Kilix / php-abac

src/Cache/Pool/MemoryCacheItemPool.php

Spacing +8 added lines, -8 removed lines

@@ -16,10 +16,10 @@ 
      * {@inheritdoc}
      */
     public function deleteItem($key) {
-        if(isset($this->items[$key])) {
+        if (isset($this->items[$key])) {
             unset($this->items[$key]);
         }
-        if(isset($this->deferredItems[$key])) {
+        if (isset($this->deferredItems[$key])) {
             unset($this->deferredItems[$key]);
         }
         return true;
@@ -29,8 +29,8 @@ 
      * {@inheritdoc}
      */
     public function deleteItems(array $keys) {
-        foreach($keys as $key) {
-            if(!$this->deleteItem($key)) {
+        foreach ($keys as $key) {
+            if (!$this->deleteItem($key)) {
                 return false;
             }
         }
@@ -59,7 +59,7 @@ 
      * {@inheritdoc}
      */
     public function commit() {
-        foreach($this->deferredItems as $key => $item) {
+        foreach ($this->deferredItems as $key => $item) {
             $this->items[$key] = $item;
             unset($this->deferredItems[$key]);
         }
@@ -77,7 +77,7 @@ 
      * {@inheritdoc}
      */
     public function getItem($key) {
-        if(!$this->hasItem($key)) {
+        if (!$this->hasItem($key)) {
             return new MemoryCacheItem($key);
         }
         return $this->items[$key];
@@ -88,8 +88,8 @@ 
      */
     public function getItems(array $keys = array()) {
         $items = [];
-        foreach($keys as $key) {
-            if($this->hasItem($key)) {
+        foreach ($keys as $key) {
+            if ($this->hasItem($key)) {
                 $items[$key] = $this->getItem($key);
             }
         }

src/Cache/Item/MemoryCacheItem.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * {@inheritdoc}
      */
     public function get() {
-        if(!$this->isHit()) {
+        if (!$this->isHit()) {
             throw new ExpiredCacheException('Cache item is expired');
         }
         return $this->value;

src/Model/PolicyRuleAttribute.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      * @return \PhpAbac\Model\PolicyRuleAttribute
      */
     public function removeExtraData($key) {
-        if(isset($this->extraData[$key])) {
+        if (isset($this->extraData[$key])) {
             unset($this->extraData[$key]);
         }
         return $this;

Indentation +17 added lines, -17 removed lines

@@ -14,8 +14,8 @@ 
     protected $value;
     /** @var array **/
     protected $extraData;
-	/** @var array Extended parameter */
-	protected $getter_params_a = [];
+    /** @var array Extended parameter */
+    protected $getter_params_a = [];
 
     /**
      * @param \PhpAbac\Model\AbstractAttribute $attribute
@@ -136,21 +136,21 @@ 
         return $this->extraData;
     }
     
-	/**
-	 * @param array $value
-	 *
-	 * @return static
-	 */
-	public function setGetterParams($value) {
-		$this->getter_params_a = $value;
+    /**
+     * @param array $value
+     *
+     * @return static
+     */
+    public function setGetterParams($value) {
+        $this->getter_params_a = $value;
 		
-		return $this;
-	}
+        return $this;
+    }
 	
-	/**
-	 * @return array
-	 */
-	public function getGetterParams() {
-		return $this->getter_params_a;
-	}
+    /**
+     * @return array
+     */
+    public function getGetterParams() {
+        return $this->getter_params_a;
+    }
 }

src/Manager/ComparisonManager.php

Spacing +5 added lines, -5 removed lines

@@ -60,22 +60,22 @@ 
             : $pra->getValue()
         ;
         // Checking that the configured comparison type is available
-        if(!isset($this->comparisons[$pra->getComparisonType()])) {
+        if (!isset($this->comparisons[$pra->getComparisonType()])) {
             throw new \InvalidArgumentException('The requested comparison class does not exist');
         }
         // The comparison class will perform the attribute check with the configured method
         // For more complex comparisons, the comparison manager is injected
         $comparison = new $this->comparisons[$pra->getComparisonType()]($this);
-        if(!method_exists($comparison, $pra->getComparison())) {
+        if (!method_exists($comparison, $pra->getComparison())) {
             throw new \InvalidArgumentException('The requested comparison method does not exist');
         }
         // Then the comparison is performed with needed
         $result = $comparison->{$pra->getComparison()}($praValue, $attribute->getValue(), $pra->getExtraData());
         // If the checked attribute is not valid, the attribute slug is marked as rejected
         // The rejected attributes will be returned instead of the expected true boolean
-        if($result !== true) {
+        if ($result !== true) {
             // In case of sub comparing, the error reporting is disabled
-            if(!in_array($attribute->getSlug(), $this->rejectedAttributes) && $subComparing === false) {
+            if (!in_array($attribute->getSlug(), $this->rejectedAttributes) && $subComparing === false) {
                 $this->rejectedAttributes[] = $attribute->getSlug();
             }
             return false;
@@ -102,7 +102,7 @@ 
      * @throws \InvalidArgumentException
      */
     public function getDynamicAttribute($attributeSlug) {
-        if(!isset($this->dynamicAttributes[$attributeSlug])) {
+        if (!isset($this->dynamicAttributes[$attributeSlug])) {
             throw new \InvalidArgumentException("The dynamic value for attribute $attributeSlug was not given");
         }
         return $this->dynamicAttributes[$attributeSlug];

src/Comparison/ArrayComparison.php

Spacing +4 added lines, -4 removed lines

@@ -55,23 +55,23 @@
      * @return boolean
      */
     public function contains($policyRuleAttributes, $attributes, $extraData = []) {
-        foreach($extraData['attribute']->getValue() as $attribute) {
+        foreach ($extraData['attribute']->getValue() as $attribute) {
             $result = true;
             // For each attribute, we check the whole rules set
-            foreach($policyRuleAttributes as $pra) {
+            foreach ($policyRuleAttributes as $pra) {
                 $attributeData = $pra->getAttribute();
                 $attributeData->setValue(
                     $this->comparisonManager->getAttributeManager()->retrieveAttribute($attributeData, $extraData['user'], $attribute)
                 );
                 // If one field is not matched, the whole attribute is rejected
-                if(!$this->comparisonManager->compare($pra, true)) {
+                if (!$this->comparisonManager->compare($pra, true)) {
                     //var_dump($attributeData->getName(), $attributeData->getValue(), $pra->getValue());
                     $result = false;
                     break;
                 }
             }
             // If the result is still true at the end of the attribute check, the rule is enforced
-            if($result === true) {
+            if ($result === true) {
                 return true;
             }
         }

src/Cache/Item/TextCacheItem.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * {@inheritdoc}
      */
     public function get() {
-        if(!$this->isHit()) {
+        if (!$this->isHit()) {
             throw new ExpiredCacheException('Cache item is expired');
         }
         return $this->value;

src/Cache/Pool/TextCacheItemPool.php

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
     public function clear() {
         $items = glob("{$this->cacheFolder}/*.txt"); // get all file names
         foreach($items as $item){ // iterate files
-          if(is_file($item))
+            if(is_file($item))
             unlink($item); // delete file
         }
         $this->deferredItems = [];

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
         $this->cacheFolder =
             (isset($options['cache_folder']))
             ? "{$options['cache_folder']}/text"
-            : __DIR__ . '/../../../data/cache/text'
+            : __DIR__.'/../../../data/cache/text'
         ;
     }
 
@@ -35,10 +35,10 @@ 
      * {@inheritdoc}
      */
     public function deleteItem($key) {
-        if(is_file("{$this->cacheFolder}/$key.txt")) {
+        if (is_file("{$this->cacheFolder}/$key.txt")) {
             unlink("{$this->cacheFolder}/$key.txt");
         }
-        if(isset($this->deferredItems[$key])) {
+        if (isset($this->deferredItems[$key])) {
             unset($this->deferredItems[$key]);
         }
         return true;
@@ -48,8 +48,8 @@ 
      * {@inheritdoc}
      */
     public function deleteItems(array $keys) {
-        foreach($keys as $key) {
-            if(!$this->deleteItem($key)) {
+        foreach ($keys as $key) {
+            if (!$this->deleteItem($key)) {
                 return false;
             }
         }
@@ -80,7 +80,7 @@ 
      * {@inheritdoc}
      */
     public function commit() {
-        foreach($this->deferredItems as $key => $item) {
+        foreach ($this->deferredItems as $key => $item) {
             $this->save($item);
             unset($this->deferredItems[$key]);
         }
@@ -99,10 +99,10 @@ 
      */
     public function getItem($key) {
         $item = new TextCacheItem($key);
-        if(!$this->hasItem($key)) {
+        if (!$this->hasItem($key)) {
             return $item;
         }
-        $data = explode(';',file_get_contents("{$this->cacheFolder}/{$key}.txt"));
+        $data = explode(';', file_get_contents("{$this->cacheFolder}/{$key}.txt"));
         return $item
             ->set($data[0])
             ->expiresAt((new \DateTime($data[1])))
@@ -114,8 +114,8 @@ 
      */
     public function getItems(array $keys = array()) {
         $items = [];
-        foreach($keys as $key) {
-            if($this->hasItem($key)) {
+        foreach ($keys as $key) {
+            if ($this->hasItem($key)) {
                 $items[$key] = $this->getItem($key);
             }
         }
@@ -127,8 +127,8 @@ 
      */
     public function clear() {
         $items = glob("{$this->cacheFolder}/*.txt"); // get all file names
-        foreach($items as $item){ // iterate files
-          if(is_file($item))
+        foreach ($items as $item) { // iterate files
+          if (is_file($item))
             unlink($item); // delete file
         }
         $this->deferredItems = [];

example/User.php

Indentation +15 added lines, -15 removed lines

@@ -116,22 +116,22 @@
         return $this->visas;
     }
 	
-	/**
-	 * Return a specific visa
-	 *
-	 * @param Visa $visa
-	 *
-	 * @return mixed|null
-	 */
+    /**
+     * Return a specific visa
+     *
+     * @param Visa $visa
+     *
+     * @return mixed|null
+     */
     public function getVisa($country_code) {
-    	/** @var Visa $visa */
-    	$visas = [];
-		foreach($this->visas as $visa) {
-    		if ($visa->getCountry()->getCode() == $country_code)
-				$visas[] = $visa;
-		}
-		return $visas;
-	}
+        /** @var Visa $visa */
+        $visas = [];
+        foreach($this->visas as $visa) {
+            if ($visa->getCountry()->getCode() == $country_code)
+                $visas[] = $visa;
+        }
+        return $visas;
+    }
     
     /**
      * @param bool $hasDoneJapd

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
      * @return \PhpAbac\Example\User
      */
     public function removeVisa(Visa $visa) {
-        if(isset($this->visas[$visa->getId()])) {
+        if (isset($this->visas[$visa->getId()])) {
             unset($this->visas[$visa->getId()]);
         }
         return $this;
@@ -126,7 +126,7 @@ 
     public function getVisa($country_code) {
     	/** @var Visa $visa */
     	$visas = [];
-		foreach($this->visas as $visa) {
+		foreach ($this->visas as $visa) {
     		if ($visa->getCountry()->getCode() == $country_code)
 				$visas[] = $visa;
 		}

src/Abac.php

Indentation +147 added lines, -147 removed lines

@@ -13,165 +13,165 @@
 use PhpAbac\Model\PolicyRuleAttribute;
 
 class Abac {
-	/** @var \PhpAbac\Manager\ConfigurationManager * */
-	private $configuration;
-	/** @var \PhpAbac\Manager\PolicyRuleManager * */
-	private $policyRuleManager;
-	/** @var \PhpAbac\Manager\AttributeManager * */
-	private $attributeManager;
-	/** @var \PhpAbac\Manager\CacheManager * */
-	private $cacheManager;
-	/** @var \PhpAbac\Manager\ComparisonManager * */
-	private $comparisonManager;
+    /** @var \PhpAbac\Manager\ConfigurationManager * */
+    private $configuration;
+    /** @var \PhpAbac\Manager\PolicyRuleManager * */
+    private $policyRuleManager;
+    /** @var \PhpAbac\Manager\AttributeManager * */
+    private $attributeManager;
+    /** @var \PhpAbac\Manager\CacheManager * */
+    private $cacheManager;
+    /** @var \PhpAbac\Manager\ComparisonManager * */
+    private $comparisonManager;
 	
-	/**
-	 * @param array  $configPaths
-	 * @param array  $cacheOptions     Option for cache
-	 * @param string $configPaths_root The origin folder to find $configPaths
-	 * @param array  $options
-	 */
-	public function __construct( $configPaths, $cacheOptions = [], $configPaths_root = null, $options = [] ) {
-		$this->configure( $configPaths, $configPaths_root );
-		$this->attributeManager = new AttributeManager( $this->configuration->getAttributes(), $options );
-		$this->policyRuleManager = new PolicyRuleManager( $this->attributeManager, $this->configuration->getRules() );
-		$this->cacheManager      = new CacheManager( $cacheOptions );
-		$this->comparisonManager = new ComparisonManager( $this->attributeManager );
-	}
+    /**
+     * @param array  $configPaths
+     * @param array  $cacheOptions     Option for cache
+     * @param string $configPaths_root The origin folder to find $configPaths
+     * @param array  $options
+     */
+    public function __construct( $configPaths, $cacheOptions = [], $configPaths_root = null, $options = [] ) {
+        $this->configure( $configPaths, $configPaths_root );
+        $this->attributeManager = new AttributeManager( $this->configuration->getAttributes(), $options );
+        $this->policyRuleManager = new PolicyRuleManager( $this->attributeManager, $this->configuration->getRules() );
+        $this->cacheManager      = new CacheManager( $cacheOptions );
+        $this->comparisonManager = new ComparisonManager( $this->attributeManager );
+    }
 	
-	/**
-	 * @param array  $configPaths
-	 * @param string $configPaths_root The origin folder to find $configPaths
-	 */
-	public function configure( $configPaths, $configPaths_root = null ) {
+    /**
+     * @param array  $configPaths
+     * @param string $configPaths_root The origin folder to find $configPaths
+     */
+    public function configure( $configPaths, $configPaths_root = null ) {
 //		foreach ( $configPaths as &$configPath ) {
 //			$configPath = $configPaths_root . $configPath;
 //		}
-		$locator             = new FileLocator( $configPaths_root );
-		$this->configuration = new ConfigurationManager( $locator );
-		$this->configuration->setConfigPathRoot( $configPaths_root );
-		$this->configuration->parseConfigurationFile( $configPaths );
-	}
+        $locator             = new FileLocator( $configPaths_root );
+        $this->configuration = new ConfigurationManager( $locator );
+        $this->configuration->setConfigPathRoot( $configPaths_root );
+        $this->configuration->parseConfigurationFile( $configPaths );
+    }
 	
-	/**
-	 * Return true if both user and object respects all the rules conditions
-	 * If the objectId is null, policy rules about its attributes will be ignored
-	 * In case of mismatch between attributes and expected values,
-	 * an array with the concerned attributes slugs will be returned.
-	 *
-	 * Available options are :
-	 * * dynamic_attributes: array
-	 * * cache_result: boolean
-	 * * cache_ttl: integer
-	 * * cache_driver: string
-	 *
-	 * Available cache drivers are :
-	 * * memory
-	 *
-	 * @param string $ruleName
-	 * @param object $user
-	 * @param object $resource
-	 * @param array  $options
-	 *
-	 * @return boolean|array
-	 */
-	public function enforce( $ruleName, $user, $resource = null, $options = [] ) {
-		// If there is dynamic attributes, we pass them to the comparison manager
-		// When a comparison will be performed, the passed values will be retrieved and used
-		if ( isset( $options[ 'dynamic_attributes' ] ) ) {
-			$this->comparisonManager->setDynamicAttributes( $options[ 'dynamic_attributes' ] );
-		}
-		// Retrieve cache value for the current rule and values if cache item is valid
-		if ( ( $cacheResult = isset( $options[ 'cache_result' ] ) && $options[ 'cache_result' ] === true ) === true ) {
-			$cacheItem = $this->cacheManager->getItem( "$ruleName-{$user->getId()}-" . ( ( $resource !== null ) ? $resource->getId() : '' ), ( isset( $options[ 'cache_driver' ] ) ) ? $options[ 'cache_driver' ] : null, ( isset( $options[ 'cache_ttl' ] ) ) ? $options[ 'cache_ttl' ] : null );
-			// We check if the cache value s valid before returning it
-			if ( ( $cacheValue = $cacheItem->get() ) !== null ) {
-				return $cacheValue;
-			}
-		}
-		$policyRule_a = $this->policyRuleManager->getRule( $ruleName, $user, $resource );
+    /**
+     * Return true if both user and object respects all the rules conditions
+     * If the objectId is null, policy rules about its attributes will be ignored
+     * In case of mismatch between attributes and expected values,
+     * an array with the concerned attributes slugs will be returned.
+     *
+     * Available options are :
+     * * dynamic_attributes: array
+     * * cache_result: boolean
+     * * cache_ttl: integer
+     * * cache_driver: string
+     *
+     * Available cache drivers are :
+     * * memory
+     *
+     * @param string $ruleName
+     * @param object $user
+     * @param object $resource
+     * @param array  $options
+     *
+     * @return boolean|array
+     */
+    public function enforce( $ruleName, $user, $resource = null, $options = [] ) {
+        // If there is dynamic attributes, we pass them to the comparison manager
+        // When a comparison will be performed, the passed values will be retrieved and used
+        if ( isset( $options[ 'dynamic_attributes' ] ) ) {
+            $this->comparisonManager->setDynamicAttributes( $options[ 'dynamic_attributes' ] );
+        }
+        // Retrieve cache value for the current rule and values if cache item is valid
+        if ( ( $cacheResult = isset( $options[ 'cache_result' ] ) && $options[ 'cache_result' ] === true ) === true ) {
+            $cacheItem = $this->cacheManager->getItem( "$ruleName-{$user->getId()}-" . ( ( $resource !== null ) ? $resource->getId() : '' ), ( isset( $options[ 'cache_driver' ] ) ) ? $options[ 'cache_driver' ] : null, ( isset( $options[ 'cache_ttl' ] ) ) ? $options[ 'cache_ttl' ] : null );
+            // We check if the cache value s valid before returning it
+            if ( ( $cacheValue = $cacheItem->get() ) !== null ) {
+                return $cacheValue;
+            }
+        }
+        $policyRule_a = $this->policyRuleManager->getRule( $ruleName, $user, $resource );
 		
-		foreach ( $policyRule_a as $policyRule ) {
-			// For each policy rule attribute, we retrieve the attribute value and proceed configured extra data
-			foreach ( $policyRule->getPolicyRuleAttributes() as $pra ) {
-				/** @var PolicyRuleAttribute $pra */
-				$attribute = $pra->getAttribute();
+        foreach ( $policyRule_a as $policyRule ) {
+            // For each policy rule attribute, we retrieve the attribute value and proceed configured extra data
+            foreach ( $policyRule->getPolicyRuleAttributes() as $pra ) {
+                /** @var PolicyRuleAttribute $pra */
+                $attribute = $pra->getAttribute();
 				
-				$getter_params = $this->prepareGetterParams($pra->getGetterParams(), $user, $resource);
+                $getter_params = $this->prepareGetterParams($pra->getGetterParams(), $user, $resource);
 //				var_dump($pra->getGetterParams());
 //				var_dump($getter_params);
-				$attribute->setValue( $this->attributeManager->retrieveAttribute( $attribute, $user, $resource, $getter_params ) );
-				if ( count( $pra->getExtraData() ) > 0 ) {
-					$this->processExtraData( $pra, $user, $resource );
-				}
-				$this->comparisonManager->compare( $pra );
-			}
-			// The given result could be an array of rejected attributes or true
-			// True means that the rule is correctly enforced for the given user and resource
-			$result = $this->comparisonManager->getResult();
-			if ( true === $result ) {
-				break;
-			}
-		}
-		if ( $cacheResult ) {
-			$cacheItem->set( $result );
-			$this->cacheManager->save( $cacheItem );
-		}
+                $attribute->setValue( $this->attributeManager->retrieveAttribute( $attribute, $user, $resource, $getter_params ) );
+                if ( count( $pra->getExtraData() ) > 0 ) {
+                    $this->processExtraData( $pra, $user, $resource );
+                }
+                $this->comparisonManager->compare( $pra );
+            }
+            // The given result could be an array of rejected attributes or true
+            // True means that the rule is correctly enforced for the given user and resource
+            $result = $this->comparisonManager->getResult();
+            if ( true === $result ) {
+                break;
+            }
+        }
+        if ( $cacheResult ) {
+            $cacheItem->set( $result );
+            $this->cacheManager->save( $cacheItem );
+        }
 		
-		return $result;
-	}
+        return $result;
+    }
 	
-	/**
-	 * Function to prepare Getter Params when getter require parameters ( this parameters must be specified in configuration file)
-	 *
-	 * @param $getter_params
-	 * @param $user
-	 * @param $resource
-	 *
-	 * @return array
-	 */
-	private function prepareGetterParams($getter_params, $user, $resource) {
-		if (empty($getter_params)) return [];
-		$values = [];
-		foreach($getter_params as $getter_name=>$params) {
-			foreach($params as $param) {
-				if ( '@' !== $param[ 'param_name' ][ 0 ] ) {
-					$values[$getter_name][] = $param[ 'param_value' ];
-				}
-				else {
-					$values[$getter_name][] = $this->attributeManager->retrieveAttribute( $this->attributeManager->getAttribute( $param[ 'param_value' ] ) , $user, $resource );
-				}
-			}
-		}
-		return $values;
-	}
+    /**
+     * Function to prepare Getter Params when getter require parameters ( this parameters must be specified in configuration file)
+     *
+     * @param $getter_params
+     * @param $user
+     * @param $resource
+     *
+     * @return array
+     */
+    private function prepareGetterParams($getter_params, $user, $resource) {
+        if (empty($getter_params)) return [];
+        $values = [];
+        foreach($getter_params as $getter_name=>$params) {
+            foreach($params as $param) {
+                if ( '@' !== $param[ 'param_name' ][ 0 ] ) {
+                    $values[$getter_name][] = $param[ 'param_value' ];
+                }
+                else {
+                    $values[$getter_name][] = $this->attributeManager->retrieveAttribute( $this->attributeManager->getAttribute( $param[ 'param_value' ] ) , $user, $resource );
+                }
+            }
+        }
+        return $values;
+    }
 	
-	/**
-	 * @param \PhpAbac\Model\PolicyRuleAttribute $pra
-	 * @param object                             $user
-	 * @param object                             $resource
-	 */
-	public function processExtraData( PolicyRuleAttribute $pra, $user, $resource ) {
-		foreach ( $pra->getExtraData() as $key => $data ) {
-			switch ( $key ) {
-				case 'with':
-					// This data has to be removed for it will be stored elsewhere
-					// in the policy rule attribute
-					$pra->removeExtraData( 'with' );
-					// The "with" extra data is an array of attributes, which are objects
-					// Once we process it as policy rule attributes, we set it as the main policy rule attribute value
-					$subPolicyRuleAttributes = [];
-					$extraData               = [];
+    /**
+     * @param \PhpAbac\Model\PolicyRuleAttribute $pra
+     * @param object                             $user
+     * @param object                             $resource
+     */
+    public function processExtraData( PolicyRuleAttribute $pra, $user, $resource ) {
+        foreach ( $pra->getExtraData() as $key => $data ) {
+            switch ( $key ) {
+                case 'with':
+                    // This data has to be removed for it will be stored elsewhere
+                    // in the policy rule attribute
+                    $pra->removeExtraData( 'with' );
+                    // The "with" extra data is an array of attributes, which are objects
+                    // Once we process it as policy rule attributes, we set it as the main policy rule attribute value
+                    $subPolicyRuleAttributes = [];
+                    $extraData               = [];
 					
-					foreach ( $this->policyRuleManager->processRuleAttributes( $data, $user, $resource ) as $subPolicyRuleAttribute ) {
-						$subPolicyRuleAttributes[] = $subPolicyRuleAttribute;
-					}
-					$pra->setValue( $subPolicyRuleAttributes );
-					// This data can be used in complex comparisons
-					$pra->addExtraData( 'attribute', $pra->getAttribute() );
-					$pra->addExtraData( 'user', $user );
-					$pra->addExtraData( 'resource', $resource );
-					break;
-			}
-		}
-	}
+                    foreach ( $this->policyRuleManager->processRuleAttributes( $data, $user, $resource ) as $subPolicyRuleAttribute ) {
+                        $subPolicyRuleAttributes[] = $subPolicyRuleAttribute;
+                    }
+                    $pra->setValue( $subPolicyRuleAttributes );
+                    // This data can be used in complex comparisons
+                    $pra->addExtraData( 'attribute', $pra->getAttribute() );
+                    $pra->addExtraData( 'user', $user );
+                    $pra->addExtraData( 'resource', $resource );
+                    break;
+            }
+        }
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -30,26 +30,26 @@ 
 	 * @param string $configPaths_root The origin folder to find $configPaths
 	 * @param array  $options
 	 */
-	public function __construct( $configPaths, $cacheOptions = [], $configPaths_root = null, $options = [] ) {
-		$this->configure( $configPaths, $configPaths_root );
-		$this->attributeManager = new AttributeManager( $this->configuration->getAttributes(), $options );
-		$this->policyRuleManager = new PolicyRuleManager( $this->attributeManager, $this->configuration->getRules() );
-		$this->cacheManager      = new CacheManager( $cacheOptions );
-		$this->comparisonManager = new ComparisonManager( $this->attributeManager );
+	public function __construct($configPaths, $cacheOptions = [], $configPaths_root = null, $options = []) {
+		$this->configure($configPaths, $configPaths_root);
+		$this->attributeManager = new AttributeManager($this->configuration->getAttributes(), $options);
+		$this->policyRuleManager = new PolicyRuleManager($this->attributeManager, $this->configuration->getRules());
+		$this->cacheManager      = new CacheManager($cacheOptions);
+		$this->comparisonManager = new ComparisonManager($this->attributeManager);
 	}
 	
 	/**
 	 * @param array  $configPaths
 	 * @param string $configPaths_root The origin folder to find $configPaths
 	 */
-	public function configure( $configPaths, $configPaths_root = null ) {
+	public function configure($configPaths, $configPaths_root = null) {
 //		foreach ( $configPaths as &$configPath ) {
 //			$configPath = $configPaths_root . $configPath;
 //		}
-		$locator             = new FileLocator( $configPaths_root );
-		$this->configuration = new ConfigurationManager( $locator );
-		$this->configuration->setConfigPathRoot( $configPaths_root );
-		$this->configuration->parseConfigurationFile( $configPaths );
+		$locator             = new FileLocator($configPaths_root);
+		$this->configuration = new ConfigurationManager($locator);
+		$this->configuration->setConfigPathRoot($configPaths_root);
+		$this->configuration->parseConfigurationFile($configPaths);
 	}
 	
 	/**
@@ -74,47 +74,47 @@ 
 	 *
 	 * @return boolean|array
 	 */
-	public function enforce( $ruleName, $user, $resource = null, $options = [] ) {
+	public function enforce($ruleName, $user, $resource = null, $options = []) {
 		// If there is dynamic attributes, we pass them to the comparison manager
 		// When a comparison will be performed, the passed values will be retrieved and used
-		if ( isset( $options[ 'dynamic_attributes' ] ) ) {
-			$this->comparisonManager->setDynamicAttributes( $options[ 'dynamic_attributes' ] );
+		if (isset($options['dynamic_attributes'])) {
+			$this->comparisonManager->setDynamicAttributes($options['dynamic_attributes']);
 		}
 		// Retrieve cache value for the current rule and values if cache item is valid
-		if ( ( $cacheResult = isset( $options[ 'cache_result' ] ) && $options[ 'cache_result' ] === true ) === true ) {
-			$cacheItem = $this->cacheManager->getItem( "$ruleName-{$user->getId()}-" . ( ( $resource !== null ) ? $resource->getId() : '' ), ( isset( $options[ 'cache_driver' ] ) ) ? $options[ 'cache_driver' ] : null, ( isset( $options[ 'cache_ttl' ] ) ) ? $options[ 'cache_ttl' ] : null );
+		if (($cacheResult = isset($options['cache_result']) && $options['cache_result'] === true) === true) {
+			$cacheItem = $this->cacheManager->getItem("$ruleName-{$user->getId()}-".(($resource !== null) ? $resource->getId() : ''), (isset($options['cache_driver'])) ? $options['cache_driver'] : null, (isset($options['cache_ttl'])) ? $options['cache_ttl'] : null);
 			// We check if the cache value s valid before returning it
-			if ( ( $cacheValue = $cacheItem->get() ) !== null ) {
+			if (($cacheValue = $cacheItem->get()) !== null) {
 				return $cacheValue;
 			}
 		}
-		$policyRule_a = $this->policyRuleManager->getRule( $ruleName, $user, $resource );
+		$policyRule_a = $this->policyRuleManager->getRule($ruleName, $user, $resource);
 		
-		foreach ( $policyRule_a as $policyRule ) {
+		foreach ($policyRule_a as $policyRule) {
 			// For each policy rule attribute, we retrieve the attribute value and proceed configured extra data
-			foreach ( $policyRule->getPolicyRuleAttributes() as $pra ) {
+			foreach ($policyRule->getPolicyRuleAttributes() as $pra) {
 				/** @var PolicyRuleAttribute $pra */
 				$attribute = $pra->getAttribute();
 				
 				$getter_params = $this->prepareGetterParams($pra->getGetterParams(), $user, $resource);
 //				var_dump($pra->getGetterParams());
 //				var_dump($getter_params);
-				$attribute->setValue( $this->attributeManager->retrieveAttribute( $attribute, $user, $resource, $getter_params ) );
-				if ( count( $pra->getExtraData() ) > 0 ) {
-					$this->processExtraData( $pra, $user, $resource );
+				$attribute->setValue($this->attributeManager->retrieveAttribute($attribute, $user, $resource, $getter_params));
+				if (count($pra->getExtraData()) > 0) {
+					$this->processExtraData($pra, $user, $resource);
 				}
-				$this->comparisonManager->compare( $pra );
+				$this->comparisonManager->compare($pra);
 			}
 			// The given result could be an array of rejected attributes or true
 			// True means that the rule is correctly enforced for the given user and resource
 			$result = $this->comparisonManager->getResult();
-			if ( true === $result ) {
+			if (true === $result) {
 				break;
 			}
 		}
-		if ( $cacheResult ) {
-			$cacheItem->set( $result );
-			$this->cacheManager->save( $cacheItem );
+		if ($cacheResult) {
+			$cacheItem->set($result);
+			$this->cacheManager->save($cacheItem);
 		}
 		
 		return $result;
@@ -132,13 +132,13 @@ 
 	private function prepareGetterParams($getter_params, $user, $resource) {
 		if (empty($getter_params)) return [];
 		$values = [];
-		foreach($getter_params as $getter_name=>$params) {
-			foreach($params as $param) {
-				if ( '@' !== $param[ 'param_name' ][ 0 ] ) {
-					$values[$getter_name][] = $param[ 'param_value' ];
+		foreach ($getter_params as $getter_name=>$params) {
+			foreach ($params as $param) {
+				if ('@' !== $param['param_name'][0]) {
+					$values[$getter_name][] = $param['param_value'];
 				}
 				else {
-					$values[$getter_name][] = $this->attributeManager->retrieveAttribute( $this->attributeManager->getAttribute( $param[ 'param_value' ] ) , $user, $resource );
+					$values[$getter_name][] = $this->attributeManager->retrieveAttribute($this->attributeManager->getAttribute($param['param_value']), $user, $resource);
 				}
 			}
 		}
@@ -150,26 +150,26 @@ 
 	 * @param object                             $user
 	 * @param object                             $resource
 	 */
-	public function processExtraData( PolicyRuleAttribute $pra, $user, $resource ) {
-		foreach ( $pra->getExtraData() as $key => $data ) {
-			switch ( $key ) {
+	public function processExtraData(PolicyRuleAttribute $pra, $user, $resource) {
+		foreach ($pra->getExtraData() as $key => $data) {
+			switch ($key) {
 				case 'with':
 					// This data has to be removed for it will be stored elsewhere
 					// in the policy rule attribute
-					$pra->removeExtraData( 'with' );
+					$pra->removeExtraData('with');
 					// The "with" extra data is an array of attributes, which are objects
 					// Once we process it as policy rule attributes, we set it as the main policy rule attribute value
 					$subPolicyRuleAttributes = [];
 					$extraData               = [];
 					
-					foreach ( $this->policyRuleManager->processRuleAttributes( $data, $user, $resource ) as $subPolicyRuleAttribute ) {
+					foreach ($this->policyRuleManager->processRuleAttributes($data, $user, $resource) as $subPolicyRuleAttribute) {
 						$subPolicyRuleAttributes[] = $subPolicyRuleAttribute;
 					}
-					$pra->setValue( $subPolicyRuleAttributes );
+					$pra->setValue($subPolicyRuleAttributes);
 					// This data can be used in complex comparisons
-					$pra->addExtraData( 'attribute', $pra->getAttribute() );
-					$pra->addExtraData( 'user', $user );
-					$pra->addExtraData( 'resource', $resource );
+					$pra->addExtraData('attribute', $pra->getAttribute());
+					$pra->addExtraData('user', $user);
+					$pra->addExtraData('resource', $resource);
 					break;
 			}
 		}