Kilix / php-abac

src/Manager/ConfigurationManager.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use PhpAbac\Manager\PolicyRuleManager;
 use PhpAbac\Manager\ConfigurationManager;
 use PhpAbac\Manager\CacheManager;
-
 use Symfony\Component\Config\FileLocator;
 
 class Abac

Spacing +19 added lines, -19 removed lines

@@ -27,26 +27,26 @@ 
 	 * @param FileLocatorInterface $locator
 	 * @param string|array         $format A format or an array of format
 	 */
-	public function __construct( FileLocatorInterface $locator, $format = [
+	public function __construct(FileLocatorInterface $locator, $format = [
 		'yaml',
 		'json',
-	] ) {
+	]) {
 		$this->locator             = $locator;
 		$this->attributes          = [];
 		$this->rules               = [];
 		$this->config_files_loaded = [];
-		if ( in_array( 'yaml', $format ) ) {
-			$this->loaders[ 'yaml' ] = new YamlAbacLoader( $locator, $this );
+		if (in_array('yaml', $format)) {
+			$this->loaders['yaml'] = new YamlAbacLoader($locator, $this);
 		}
-		if ( in_array( 'json', $format ) ) {
-			$this->loaders[ 'json' ] = new JsonAbacLoader( $locator, $this );
+		if (in_array('json', $format)) {
+			$this->loaders['json'] = new JsonAbacLoader($locator, $this);
 		}
 		
 	}
 	
 	public function setConfigPathRoot($configPaths_root = null) {
 //		$this->config_path_route = $configPaths_root;
-		foreach($this->loaders as $loader) {
+		foreach ($this->loaders as $loader) {
 			$loader->setCurrentDir($configPaths_root);
 		}
 	}
@@ -54,11 +54,11 @@ 
 	/**
 	 * @param array $configurationFiles
 	 */
-	public function parseConfigurationFile( $configurationFiles ) {
-		foreach ( $configurationFiles as $configurationFile ) {
-			$config = $this->getLoader( $configurationFile )->import( $configurationFile, pathinfo( $configurationFile, PATHINFO_EXTENSION ) );
+	public function parseConfigurationFile($configurationFiles) {
+		foreach ($configurationFiles as $configurationFile) {
+			$config = $this->getLoader($configurationFile)->import($configurationFile, pathinfo($configurationFile, PATHINFO_EXTENSION));
 			
-			if (in_array($config['path'],$this->config_files_loaded)) {
+			if (in_array($config['path'], $this->config_files_loaded)) {
 				continue;
 			}
 			
@@ -69,11 +69,11 @@ 
 				unset($config['@import']);
 			}
 			
-			if ( isset( $config[ 'attributes' ] ) ) {
-				$this->attributes = array_merge( $this->attributes, $config[ 'attributes' ] );
+			if (isset($config['attributes'])) {
+				$this->attributes = array_merge($this->attributes, $config['attributes']);
 			}
-			if ( isset( $config[ 'rules' ] ) ) {
-				$this->rules = array_merge( $this->rules, $config[ 'rules' ] );
+			if (isset($config['rules'])) {
+				$this->rules = array_merge($this->rules, $config['rules']);
 			}
 		}
 	}
@@ -89,14 +89,14 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function getLoader( $configurationFile ) {
+	private function getLoader($configurationFile) {
 		
-		foreach ( $this->loaders as $AbacLoader ) {
-			if ( $AbacLoader::supportsExtension( $configurationFile ) ) {
+		foreach ($this->loaders as $AbacLoader) {
+			if ($AbacLoader::supportsExtension($configurationFile)) {
 				return $AbacLoader;
 			}
 		}
-		throw new \Exception( 'Loader not found for the file ' . $configurationFile );
+		throw new \Exception('Loader not found for the file '.$configurationFile);
 	}
 	
 	/**

example/User.php

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

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

src/Loader/AbacLoader.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
 	/** @var  ConfigurationManager The configuration manage instanciator and user of this AbacLoader Instance */
 	protected $configurationManger;
 	
-	public function __construct( FileLocatorInterface $locator ) {
-		parent::__construct( $locator );
+	public function __construct(FileLocatorInterface $locator) {
+		parent::__construct($locator);
 	}
 	
 	/**
@@ -33,7 +33,7 @@ 
 	 *
 	 * @return string
 	 */
-	abstract public function load( $resource, $type = null );
+	abstract public function load($resource, $type = null);
 	
 //	/**
 //	 * Method to check if a resource ( by his path ) is supported by the loader
@@ -53,8 +53,8 @@ 
 	 *
 	 * @return boolean Return true if the extension of the ressource is supported by the loader
 	 */
-	public static final function supportsExtension( $resource ) {
-		return in_array( pathinfo( $resource, PATHINFO_EXTENSION ), self::getExtensionAllowed() );
+	public static final function supportsExtension($resource) {
+		return in_array(pathinfo($resource, PATHINFO_EXTENSION), self::getExtensionAllowed());
 	}
 
     /**

src/Loader/YamlAbacLoader.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class YamlAbacLoader extends AbacLoader
 {
-	protected static $_EXTENSION_ALLOWED_A = ['yml','yaml'];
+	protected static $_EXTENSION_ALLOWED_A = ['yml', 'yaml'];
 	
     public function load($resource, $type = null)
     {

src/Loader/JsonAbacLoader.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 //    	$path_to_load = $this->locator->locate($resource);
     	$path_to_load = $resource;
     	
-    	return (new JsonDecode(true))->decode(file_get_contents($path_to_load),JsonEncoder::FORMAT,[ 'json_decode_associative' => true ] ) + ['path' => $path_to_load];
+    	return (new JsonDecode(true))->decode(file_get_contents($path_to_load), JsonEncoder::FORMAT, ['json_decode_associative' => true]) + ['path' => $path_to_load];
     }
 
     public function supports($resource, $type = null)

src/Manager/PolicyRuleManager.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     public function getRule($ruleName, $user, $resource)
     {
         if (!isset($this->rules[$ruleName])) {
-            throw new \InvalidArgumentException('The given rule "' . $ruleName . '" is not configured');
+            throw new \InvalidArgumentException('The given rule "'.$ruleName.'" is not configured');
         }
 
         // force to treat always arrays
@@ -70,12 +70,12 @@ 
                 ->setComparison($attribute['comparison'])
                 ->setComparisonType($attribute['comparison_type'])
                 ->setValue((isset($attribute['value'])) ? $attribute['value'] : null)
-				->setGetterParams( isset( $attribute[ 'getter_params' ] ) ? $attribute[ 'getter_params' ] : [] );
+				->setGetterParams(isset($attribute['getter_params']) ? $attribute['getter_params'] : []);
             $this->processRuleAttributeComparisonType($pra, $user, $resource);
             // In the case the user configured more keys than the basic ones
             // it will be stored as extra data
             foreach ($attribute as $key => $value) {
-                if (!in_array($key, ['comparison', 'comparison_type', 'value','getter_params'])) {
+                if (!in_array($key, ['comparison', 'comparison_type', 'value', 'getter_params'])) {
                     $pra->addExtraData($key, $value);
                 }
             }

src/Manager/AttributeManager.php

Spacing +9 added lines, -9 removed lines

@@ -28,12 +28,12 @@ 
     {
         $this->attributes = $attributes;
 	
-		$options = array_intersect_key( $options, array_flip( [
+		$options = array_intersect_key($options, array_flip([
 			'getter_prefix',
 			'getter_name_transformation_function',
-		] ) );
+		]));
 		
-		foreach($options as $name => $value) {
+		foreach ($options as $name => $value) {
 			$this->$name = $value;
 		}
     }
@@ -95,7 +95,7 @@ 
      */
     public function retrieveAttribute(AbstractAttribute $attribute, $user = null, $object = null, $getter_params = [])
     {
-        switch($attribute->getType()) {
+        switch ($attribute->getType()) {
             case 'user':
                 return $this->retrieveClassicAttribute($attribute, $user, $getter_params);
             case 'resource':
@@ -114,18 +114,18 @@ 
     {
         $propertyPath = explode('.', $attribute->getProperty());
         $propertyValue = $object;
-        foreach($propertyPath as $property) {
+        foreach ($propertyPath as $property) {
 	
         	
-			$getter = $this->getter_prefix.call_user_func($this->getter_name_transformation_function,$property);
+			$getter = $this->getter_prefix.call_user_func($this->getter_name_transformation_function, $property);
             // Use is_callable, instead of method_exists, to deal with __call magic method
-            if(!is_callable([$propertyValue,$getter])) {
+            if (!is_callable([$propertyValue, $getter])) {
                 throw new \InvalidArgumentException('There is no getter for the "'.$attribute->getProperty().'" attribute for object "'.get_class($propertyValue).'" with getter "'.$getter.'"');
             }
-			if ( ( $propertyValue = call_user_func_array( [
+			if (($propertyValue = call_user_func_array([
 					$propertyValue,
 					$getter,
-				], isset( $getter_params[ $property ] ) ? $getter_params[ $property ] : [] ) ) === null
+				], isset($getter_params[$property]) ? $getter_params[$property] : [])) === null
 			) {
 				return null;
 			}