brightnucleus / config

src/AbstractConfigSchema.php

Indentation +77 added lines, -77 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Abstract Config Schema Class.
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Abstract Config Schema Class.
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -24,84 +24,84 @@ 
 abstract class AbstractConfigSchema implements ConfigSchemaInterface
 {
 
-    /**
-     * The defined values that are recognized.
-     *
-     * @var ConfigInterface
-     */
-    protected $defined;
+	/**
+	 * The defined values that are recognized.
+	 *
+	 * @var ConfigInterface
+	 */
+	protected $defined;
 
-    /**
-     * The default values that can be overwritten.
-     *
-     * @var ConfigInterface
-     */
-    protected $defaults;
+	/**
+	 * The default values that can be overwritten.
+	 *
+	 * @var ConfigInterface
+	 */
+	protected $defaults;
 
-    /**
-     * The required values that need to be set.
-     *
-     * @var ConfigInterface
-     */
-    protected $required;
+	/**
+	 * The required values that need to be set.
+	 *
+	 * @var ConfigInterface
+	 */
+	protected $required;
 
-    /**
-     * Get the set of defined options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getDefinedOptions()
-    {
-        if ( ! $this->defined) {
-            return null;
-        }
+	/**
+	 * Get the set of defined options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getDefinedOptions()
+	{
+		if ( ! $this->defined) {
+			return null;
+		}
 
-        if ($this->defined instanceof ConfigInterface) {
-            return $this->defined->getArrayCopy();
-        }
+		if ($this->defined instanceof ConfigInterface) {
+			return $this->defined->getArrayCopy();
+		}
 
-        return (array)$this->defined;
-    }
+		return (array)$this->defined;
+	}
 
-    /**
-     * Get the set of default options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getDefaultOptions()
-    {
-        if ( ! $this->defaults) {
-            return null;
-        }
+	/**
+	 * Get the set of default options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getDefaultOptions()
+	{
+		if ( ! $this->defaults) {
+			return null;
+		}
 
-        if ($this->defaults instanceof ConfigInterface) {
-            return $this->defaults->getArrayCopy();
-        }
+		if ($this->defaults instanceof ConfigInterface) {
+			return $this->defaults->getArrayCopy();
+		}
 
-        return (array)$this->defaults;
-    }
+		return (array)$this->defaults;
+	}
 
-    /**
-     * Get the set of required options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getRequiredOptions()
-    {
-        if ( ! $this->required) {
-            return null;
-        }
+	/**
+	 * Get the set of required options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getRequiredOptions()
+	{
+		if ( ! $this->required) {
+			return null;
+		}
 
-        if ($this->required instanceof ConfigInterface) {
-            return $this->required->getArrayCopy();
-        }
+		if ($this->required instanceof ConfigInterface) {
+			return $this->required->getArrayCopy();
+		}
 
-        return (array)$this->required;
-    }
+		return (array)$this->required;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
             return $this->defined->getArrayCopy();
         }
 
-        return (array)$this->defined;
+        return (array) $this->defined;
     }
 
     /**
@@ -82,7 +82,7 @@ 
             return $this->defaults->getArrayCopy();
         }
 
-        return (array)$this->defaults;
+        return (array) $this->defaults;
     }
 
     /**
@@ -102,6 +102,6 @@ 
             return $this->required->getArrayCopy();
         }
 
-        return (array)$this->required;
+        return (array) $this->required;
     }
 }

src/Config.php

Spacing +4 added lines, -4 removed lines

@@ -118,7 +118,7 @@ 
             if ( ! file_exists($config)) {
                 throw new RuntimeException(sprintf(
                     _('Non-existing configuration source: %1$s'),
-                    (string)$config
+                    (string) $config
                 ));
             }
 
@@ -137,13 +137,13 @@ 
             } catch (Exception $exception) {
                 throw new RuntimeException(sprintf(
                     _('Loading from configuration source %1$s failed. Reason: %2$s'),
-                    (string)$configString,
-                    (string)$exception->getMessage()
+                    (string) $configString,
+                    (string) $exception->getMessage()
                 ));
             }
         }
 
-        return (array)$config;
+        return (array) $config;
     }
 
     /**

Indentation +217 added lines, -217 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Generic Config contract implementation
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Generic Config contract implementation
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -30,213 +30,213 @@ 
 class Config extends AbstractConfig
 {
 
-    /**
-     * The schema of the Config file.
-     *
-     * @var Schema
-     */
-    protected $schema;
-
-    /**
-     * The Validator class that gets asked to do the validation of the config.
-     *
-     * @since 0.1.0
-     *
-     * @var Validator
-     */
-    protected $validator;
-
-    /**
-     * Instantiate the Config object.
-     *
-     * It accepts either an array with the configuration settings, or a
-     * filename pointing to a PHP file it can include.
-     *
-     * @since 0.1.0
-     * @since 0.1.6 Accepts a delimiter to parse configuration keys.
-     *
-     * @param array|string         $config    Array with settings or filename for the
-     *                                        settings file.
-     * @param Schema|null          $schema    Optional. Config that contains default
-     *                                        values that can get overwritten.
-     * @param Validator|null       $validator Optional. Validator class that does the
-     *                                        actual validation.
-     * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse
-     *                                        configuration keys. Defaults to "\", "/" & ".".
-     * @throws InvalidArgumentException If the config source is not a string or
-     *                                        array.
-     * @throws RuntimeException         If loading of the config source failed.
-     * @throws UnexpectedValueException If the config file is not valid.
-     */
-    public function __construct(
-        $config,
-        Schema $schema = null,
-        Validator $validator = null,
-        $delimiter = null
-    ) {
-        $this->schema    = $schema;
-        $this->validator = $validator;
-
-        // Make sure $config is either a string or array.
-        if ( ! (is_string($config) || is_array($config))) {
-            throw new InvalidArgumentException(sprintf(
-                _('Invalid configuration source: %1$s'),
-                print_r($config, true)
-            ));
-        }
-
-        if (is_string($config)) {
-            $config = $this->fetchArrayData($config);
-        }
-
-        $config = $this->resolveOptions($config);
-
-        parent::__construct($config, $delimiter);
-
-        // Finally, validate the resulting config.
-        if ( ! $this->isValid()) {
-            throw new UnexpectedValueException(sprintf(
-                _('ConfigInterface file is not valid: %1$s'),
-                print_r($config, true)
-            ));
-        }
-    }
-
-    /**
-     * Fetch array data from a string pointing to a file.
-     *
-     * @since 0.1.0
-     *
-     * @param  string $config           Filename for the settings file.
-     * @return array                    Array with configuration settings.
-     * @throws RuntimeException         If the config source is a non-existing
-     *                                  file.
-     * @throws RuntimeException         If loading of the config source failed.
-     */
-    protected function fetchArrayData($config)
-    {
-        if (is_string($config) && ! ('' === $config)) {
-
-            // $config is a valid string, make sure it is an existing file.
-            if ( ! file_exists($config)) {
-                throw new RuntimeException(sprintf(
-                    _('Non-existing configuration source: %1$s'),
-                    (string)$config
-                ));
-            }
-
-            // Try to load the file through PHP's include().
-            $configString = $config;
-            try {
-                // Make sure we don't accidentally create output.
-                ob_get_contents();
-                $config = include($configString);
-                ob_clean();
-
-                // The included should return an array.
-                if ( ! is_array($config)) {
-                    throw new RuntimeException(_('File inclusion did not return an array.'));
-                }
-            } catch (Exception $exception) {
-                throw new RuntimeException(sprintf(
-                    _('Loading from configuration source %1$s failed. Reason: %2$s'),
-                    (string)$configString,
-                    (string)$exception->getMessage()
-                ));
-            }
-        }
-
-        return (array)$config;
-    }
-
-    /**
-     * Process the passed-in defaults and merge them with the new values, while
-     * checking that all required options are set.
-     *
-     * @since 0.1.0
-     *
-     * @param array $config             Configuration settings to resolve.
-     * @return array                    Resolved configuration settings.
-     * @throws UnexpectedValueException If there are errors while resolving the
-     *                                  options.
-     */
-    protected function resolveOptions($config)
-    {
-        if ( ! $this->schema) {
-            return $config;
-        }
-
-        try {
-            $resolver = new OptionsResolver();
-            if ($this->configureOptions($resolver)) {
-                $config = $resolver->resolve($config);
-            }
-        } catch (Exception $exception) {
-            throw new UnexpectedValueException(sprintf(
-                _('Error while resolving config options: %1$s'),
-                $exception->getMessage()
-            ));
-        }
-
-        return $config;
-    }
-
-    /**
-     * Configure the possible and required options for the Config.
-     *
-     * This should return a bool to let the resolve_options() know whether the
-     * actual resolving needs to be done or not.
-     *
-     * @since 0.1.0
-     *
-     * @param OptionsResolver $resolver Reference to the OptionsResolver
-     *                                  instance.
-     * @return bool Whether to do the resolving.
-     * @throws UnexpectedValueException If there are errors while processing.
-     */
-    protected function configureOptions(OptionsResolver $resolver)
-    {
-        $defined  = $this->schema->getDefinedOptions();
-        $defaults = $this->schema->getDefaultOptions();
-        $required = $this->schema->getRequiredOptions();
-
-        if ( ! $defined && ! $defaults && ! $required) {
-            return false;
-        }
-
-        try {
-            if ($defined) {
-                $resolver->setDefined($defined);
-            }
-            if ($defaults) {
-                $resolver->setDefaults($defaults);
-            }
-            if ($required) {
-                $resolver->setRequired($required);
-            }
-        } catch (Exception $exception) {
-            throw new UnexpectedValueException(sprintf(
-                _('Error while processing config options: %1$s'),
-                $exception->getMessage()
-            ));
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate the Config file.
-     *
-     * @since  0.1.0
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        if ($this->validator) {
-            return $this->validator->isValid($this);
-        }
-
-        return true;
-    }
+	/**
+	 * The schema of the Config file.
+	 *
+	 * @var Schema
+	 */
+	protected $schema;
+
+	/**
+	 * The Validator class that gets asked to do the validation of the config.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @var Validator
+	 */
+	protected $validator;
+
+	/**
+	 * Instantiate the Config object.
+	 *
+	 * It accepts either an array with the configuration settings, or a
+	 * filename pointing to a PHP file it can include.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.6 Accepts a delimiter to parse configuration keys.
+	 *
+	 * @param array|string         $config    Array with settings or filename for the
+	 *                                        settings file.
+	 * @param Schema|null          $schema    Optional. Config that contains default
+	 *                                        values that can get overwritten.
+	 * @param Validator|null       $validator Optional. Validator class that does the
+	 *                                        actual validation.
+	 * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse
+	 *                                        configuration keys. Defaults to "\", "/" & ".".
+	 * @throws InvalidArgumentException If the config source is not a string or
+	 *                                        array.
+	 * @throws RuntimeException         If loading of the config source failed.
+	 * @throws UnexpectedValueException If the config file is not valid.
+	 */
+	public function __construct(
+		$config,
+		Schema $schema = null,
+		Validator $validator = null,
+		$delimiter = null
+	) {
+		$this->schema    = $schema;
+		$this->validator = $validator;
+
+		// Make sure $config is either a string or array.
+		if ( ! (is_string($config) || is_array($config))) {
+			throw new InvalidArgumentException(sprintf(
+				_('Invalid configuration source: %1$s'),
+				print_r($config, true)
+			));
+		}
+
+		if (is_string($config)) {
+			$config = $this->fetchArrayData($config);
+		}
+
+		$config = $this->resolveOptions($config);
+
+		parent::__construct($config, $delimiter);
+
+		// Finally, validate the resulting config.
+		if ( ! $this->isValid()) {
+			throw new UnexpectedValueException(sprintf(
+				_('ConfigInterface file is not valid: %1$s'),
+				print_r($config, true)
+			));
+		}
+	}
+
+	/**
+	 * Fetch array data from a string pointing to a file.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param  string $config           Filename for the settings file.
+	 * @return array                    Array with configuration settings.
+	 * @throws RuntimeException         If the config source is a non-existing
+	 *                                  file.
+	 * @throws RuntimeException         If loading of the config source failed.
+	 */
+	protected function fetchArrayData($config)
+	{
+		if (is_string($config) && ! ('' === $config)) {
+
+			// $config is a valid string, make sure it is an existing file.
+			if ( ! file_exists($config)) {
+				throw new RuntimeException(sprintf(
+					_('Non-existing configuration source: %1$s'),
+					(string)$config
+				));
+			}
+
+			// Try to load the file through PHP's include().
+			$configString = $config;
+			try {
+				// Make sure we don't accidentally create output.
+				ob_get_contents();
+				$config = include($configString);
+				ob_clean();
+
+				// The included should return an array.
+				if ( ! is_array($config)) {
+					throw new RuntimeException(_('File inclusion did not return an array.'));
+				}
+			} catch (Exception $exception) {
+				throw new RuntimeException(sprintf(
+					_('Loading from configuration source %1$s failed. Reason: %2$s'),
+					(string)$configString,
+					(string)$exception->getMessage()
+				));
+			}
+		}
+
+		return (array)$config;
+	}
+
+	/**
+	 * Process the passed-in defaults and merge them with the new values, while
+	 * checking that all required options are set.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param array $config             Configuration settings to resolve.
+	 * @return array                    Resolved configuration settings.
+	 * @throws UnexpectedValueException If there are errors while resolving the
+	 *                                  options.
+	 */
+	protected function resolveOptions($config)
+	{
+		if ( ! $this->schema) {
+			return $config;
+		}
+
+		try {
+			$resolver = new OptionsResolver();
+			if ($this->configureOptions($resolver)) {
+				$config = $resolver->resolve($config);
+			}
+		} catch (Exception $exception) {
+			throw new UnexpectedValueException(sprintf(
+				_('Error while resolving config options: %1$s'),
+				$exception->getMessage()
+			));
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Configure the possible and required options for the Config.
+	 *
+	 * This should return a bool to let the resolve_options() know whether the
+	 * actual resolving needs to be done or not.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param OptionsResolver $resolver Reference to the OptionsResolver
+	 *                                  instance.
+	 * @return bool Whether to do the resolving.
+	 * @throws UnexpectedValueException If there are errors while processing.
+	 */
+	protected function configureOptions(OptionsResolver $resolver)
+	{
+		$defined  = $this->schema->getDefinedOptions();
+		$defaults = $this->schema->getDefaultOptions();
+		$required = $this->schema->getRequiredOptions();
+
+		if ( ! $defined && ! $defaults && ! $required) {
+			return false;
+		}
+
+		try {
+			if ($defined) {
+				$resolver->setDefined($defined);
+			}
+			if ($defaults) {
+				$resolver->setDefaults($defaults);
+			}
+			if ($required) {
+				$resolver->setRequired($required);
+			}
+		} catch (Exception $exception) {
+			throw new UnexpectedValueException(sprintf(
+				_('Error while processing config options: %1$s'),
+				$exception->getMessage()
+			));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Validate the Config file.
+	 *
+	 * @since  0.1.0
+	 *
+	 * @return boolean
+	 */
+	public function isValid()
+	{
+		if ($this->validator) {
+			return $this->validator->isValid($this);
+		}
+
+		return true;
+	}
 }

src/ConfigSchemaInterface.php

Indentation +32 added lines, -32 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Config Schema Interface.
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Config Schema Interface.
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -22,30 +22,30 @@ 
 interface ConfigSchemaInterface
 {
 
-    /**
-     * Get the set of defined options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getDefinedOptions();
+	/**
+	 * Get the set of defined options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getDefinedOptions();
 
-    /**
-     * Get the set of default options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getDefaultOptions();
+	/**
+	 * Get the set of default options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getDefaultOptions();
 
-    /**
-     * Get the set of required options.
-     *
-     * @since 0.1.0
-     *
-     * @return array|null
-     */
-    public function getRequiredOptions();
+	/**
+	 * Get the set of required options.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array|null
+	 */
+	public function getRequiredOptions();
 }

src/ConfigValidatorInterface.php

Indentation +18 added lines, -18 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Config Validator Interface
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Config Validator Interface
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -24,14 +24,14 @@ 
 interface ConfigValidatorInterface
 {
 
-    /**
-     * Check whether the passed-in Config is valid.
-     *
-     * @since 0.1.0
-     *
-     * @param ConfigInterface $config
-     *
-     * @return bool
-     */
-    public function isValid(ConfigInterface $config);
+	/**
+	 * Check whether the passed-in Config is valid.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param ConfigInterface $config
+	 *
+	 * @return bool
+	 */
+	public function isValid(ConfigInterface $config);
 }

src/ConfigSchema.php

Indentation +135 added lines, -135 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Generic Config Schema Class.
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Generic Config Schema Class.
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -25,131 +25,131 @@ 
 class ConfigSchema extends AbstractConfigSchema
 {
 
-    /**
-     * The key that is used in the schema to define a required value.
-     */
-    const REQUIRED_KEY = 'required';
-
-    /**
-     * The key that is used in the schema to define a default value.
-     */
-    const DEFAULT_VALUE = 'default';
-
-    /**
-     * The list of values that are recognized as true in the schema.
-     */
-    const TRUTHY_VALUES = [
-        true,
-        1,
-        'true',
-        'True',
-        'TRUE',
-        'y',
-        'Y',
-        'yes',
-        'Yes',
-        'YES',
-        '√',
-    ];
-
-    /**
-     * Instantiate a ConfigSchema object.
-     *
-     * @since 0.1.0
-     *
-     * @param ConfigInterface|array $schema The schema to parse.
-     * @throws InvalidArgumentException
-     */
-    public function __construct($schema)
-    {
-        if ($schema instanceof ConfigInterface) {
-            $schema = $schema->getArrayCopy();
-        }
-
-        if ( ! is_array($schema)) {
-            throw new InvalidArgumentException(sprintf(
-                _('Invalid schema source: %1$s'),
-                print_r($schema, true)
-            ));
-        }
-
-        array_walk($schema, [$this, 'parseSchema']);
-    }
-
-    /**
-     * Parse a single provided schema entry.
-     *
-     * @since 0.1.0
-     *
-     * @param mixed  $data The data associated with the key.
-     * @param string $key  The key of the schema data.
-     */
-    protected function parseSchema($data, $key)
-    {
-        $this->parseDefined($key);
-
-        if (array_key_exists(self::REQUIRED_KEY, $data)) {
-            $this->parseRequired($key,
-                $data[self::REQUIRED_KEY]);
-        }
-
-        if (array_key_exists(self::DEFAULT_VALUE, $data)) {
-            $this->parseDefault($key,
-                $data[self::DEFAULT_VALUE]);
-        }
-    }
-
-    /**
-     * Parse the set of defined values.
-     *
-     * @since 0.1.0
-     *
-     * @param string $key The key of the schema data.
-     */
-    protected function parseDefined($key)
-    {
-        $this->defined[] = $key;
-    }
-
-    /**
-     * Parse the set of required values.
-     *
-     * @since 0.1.0
-     *
-     * @param string $key  The key of the schema data.
-     * @param mixed  $data The data associated with the key.
-     */
-    protected function parseRequired($key, $data)
-    {
-        if ($this->isTruthy($data)) {
-            $this->required[] = $key;
-        }
-    }
-
-    /**
-     * Parse the set of default values.
-     *
-     * @since 0.1.0
-     *
-     * @param string $key  The key of the schema data.
-     * @param mixed  $data The data associated with the key.
-     */
-    protected function parseDefault($key, $data)
-    {
-        $this->defaults[$key] = $data;
-    }
-
-    /**
-     * Return a boolean true or false for an arbitrary set of data. Recognizes
-     * several different string values that should be valued as true.
-     *
-     * @since 0.1.0
-     *
-     * @param mixed $data The data to evaluate.
-     * @return bool
-     */
-    protected function isTruthy($data)
-    {
-        return in_array($data, self::TRUTHY_VALUES, true);
-    }
+	/**
+	 * The key that is used in the schema to define a required value.
+	 */
+	const REQUIRED_KEY = 'required';
+
+	/**
+	 * The key that is used in the schema to define a default value.
+	 */
+	const DEFAULT_VALUE = 'default';
+
+	/**
+	 * The list of values that are recognized as true in the schema.
+	 */
+	const TRUTHY_VALUES = [
+		true,
+		1,
+		'true',
+		'True',
+		'TRUE',
+		'y',
+		'Y',
+		'yes',
+		'Yes',
+		'YES',
+		'√',
+	];
+
+	/**
+	 * Instantiate a ConfigSchema object.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param ConfigInterface|array $schema The schema to parse.
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($schema)
+	{
+		if ($schema instanceof ConfigInterface) {
+			$schema = $schema->getArrayCopy();
+		}
+
+		if ( ! is_array($schema)) {
+			throw new InvalidArgumentException(sprintf(
+				_('Invalid schema source: %1$s'),
+				print_r($schema, true)
+			));
+		}
+
+		array_walk($schema, [$this, 'parseSchema']);
+	}
+
+	/**
+	 * Parse a single provided schema entry.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param mixed  $data The data associated with the key.
+	 * @param string $key  The key of the schema data.
+	 */
+	protected function parseSchema($data, $key)
+	{
+		$this->parseDefined($key);
+
+		if (array_key_exists(self::REQUIRED_KEY, $data)) {
+			$this->parseRequired($key,
+				$data[self::REQUIRED_KEY]);
+		}
+
+		if (array_key_exists(self::DEFAULT_VALUE, $data)) {
+			$this->parseDefault($key,
+				$data[self::DEFAULT_VALUE]);
+		}
+	}
+
+	/**
+	 * Parse the set of defined values.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param string $key The key of the schema data.
+	 */
+	protected function parseDefined($key)
+	{
+		$this->defined[] = $key;
+	}
+
+	/**
+	 * Parse the set of required values.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param string $key  The key of the schema data.
+	 * @param mixed  $data The data associated with the key.
+	 */
+	protected function parseRequired($key, $data)
+	{
+		if ($this->isTruthy($data)) {
+			$this->required[] = $key;
+		}
+	}
+
+	/**
+	 * Parse the set of default values.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param string $key  The key of the schema data.
+	 * @param mixed  $data The data associated with the key.
+	 */
+	protected function parseDefault($key, $data)
+	{
+		$this->defaults[$key] = $data;
+	}
+
+	/**
+	 * Return a boolean true or false for an arbitrary set of data. Recognizes
+	 * several different string values that should be valued as true.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @param mixed $data The data to evaluate.
+	 * @return bool
+	 */
+	protected function isTruthy($data)
+	{
+		return in_array($data, self::TRUTHY_VALUES, true);
+	}
 }

src/ConfigInterface.php

Indentation +69 added lines, -69 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Config Interface
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Config Interface
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -27,70 +27,70 @@ 
 interface ConfigInterface extends IteratorAggregate, ArrayAccess, Serializable, Countable
 {
 
-    /**
-     * Creates a copy of the ArrayObject.
-     *
-     * Returns a copy of the array. When the ArrayObject refers to an object an
-     * array of the public properties of that object will be returned.
-     * This is implemented by \ArrayObject.
-     *
-     * @since 0.1.0
-     *
-     * @return array Copy of the array.
-     */
-    public function getArrayCopy();
+	/**
+	 * Creates a copy of the ArrayObject.
+	 *
+	 * Returns a copy of the array. When the ArrayObject refers to an object an
+	 * array of the public properties of that object will be returned.
+	 * This is implemented by \ArrayObject.
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return array Copy of the array.
+	 */
+	public function getArrayCopy();
 
-    /**
-     * Check whether the Config has a specific key.
-     *
-     * To check a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.0
-     * @since 0.1.4 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     * @return bool
-     */
-    public function hasKey();
+	/**
+	 * Check whether the Config has a specific key.
+	 *
+	 * To check a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.4 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 * @return bool
+	 */
+	public function hasKey();
 
-    /**
-     * Get the value of a specific key.
-     *
-     * To get a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.0
-     * @since 0.1.4 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     *
-     * @return mixed
-     */
-    public function getKey();
+	/**
+	 * Get the value of a specific key.
+	 *
+	 * To get a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.4 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 *
+	 * @return mixed
+	 */
+	public function getKey();
 
-    /**
-     * Get a (multi-dimensional) array of all the configuration settings.
-     *
-     * @since 0.1.4
-     *
-     * @return array
-     */
-    public function getAll();
+	/**
+	 * Get a (multi-dimensional) array of all the configuration settings.
+	 *
+	 * @since 0.1.4
+	 *
+	 * @return array
+	 */
+	public function getAll();
 
-    /**
-     * Get the an array with all the keys
-     *
-     * @since 0.1.0
-     *
-     * @return mixed
-     */
-    public function getKeys();
+	/**
+	 * Get the an array with all the keys
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return mixed
+	 */
+	public function getKeys();
 
-    /**
-     * Is the Config valid?
-     *
-     * @since 0.1.0
-     *
-     * @return boolean
-     */
-    public function isValid();
+	/**
+	 * Is the Config valid?
+	 *
+	 * @since 0.1.0
+	 *
+	 * @return boolean
+	 */
+	public function isValid();
 }

src/ConfigTrait.php

Indentation +81 added lines, -81 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * Config Trait
- *
- * @package   BrightNucleus\Config
- * @author    Alain Schlesser <alain.schlesser@gmail.com>
- * @license   GPL-2.0+
- * @link      http://www.brightnucleus.com/
- * @copyright 2016 Alain Schlesser, Bright Nucleus
- */
+	 * Config Trait
+	 *
+	 * @package   BrightNucleus\Config
+	 * @author    Alain Schlesser <alain.schlesser@gmail.com>
+	 * @license   GPL-2.0+
+	 * @link      http://www.brightnucleus.com/
+	 * @copyright 2016 Alain Schlesser, Bright Nucleus
+	 */
 
 namespace BrightNucleus\Config;
 
@@ -16,84 +16,84 @@ 
 trait ConfigTrait
 {
 
-    /**
-     * Reference to the Config object.
-     *
-     * @since 0.1.2
-     *
-     * @var ConfigInterface
-     */
-    protected $config;
+	/**
+	 * Reference to the Config object.
+	 *
+	 * @since 0.1.2
+	 *
+	 * @var ConfigInterface
+	 */
+	protected $config;
 
-    /**
-     * Process the passed-in configuration file.
-     *
-     * @since 0.1.2
-     *
-     * @param ConfigInterface $config The Config to process.
-     */
-    protected function processConfig(ConfigInterface $config)
-    {
-        $this->config = $config;
-    }
+	/**
+	 * Process the passed-in configuration file.
+	 *
+	 * @since 0.1.2
+	 *
+	 * @param ConfigInterface $config The Config to process.
+	 */
+	protected function processConfig(ConfigInterface $config)
+	{
+		$this->config = $config;
+	}
 
-    /**
-     * Check whether the Config has a specific key.
-     *
-     * To get a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.2
-     * @since 0.1.5 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     * @return bool Whether the key is known.
-     */
-    protected function hasConfigKey()
-    {
-        $keys = func_get_args();
+	/**
+	 * Check whether the Config has a specific key.
+	 *
+	 * To get a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.2
+	 * @since 0.1.5 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 * @return bool Whether the key is known.
+	 */
+	protected function hasConfigKey()
+	{
+		$keys = func_get_args();
 
-        return call_user_func_array([$this->config, 'hasKey'], $keys);
-    }
+		return call_user_func_array([$this->config, 'hasKey'], $keys);
+	}
 
-    /**
-     * Get the Config value for a specific key.
-     *
-     * To get a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.2
-     * @since 0.1.5 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     * @return mixed Value of the key.
-     */
-    protected function getConfigKey()
-    {
-        $keys = func_get_args();
+	/**
+	 * Get the Config value for a specific key.
+	 *
+	 * To get a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.2
+	 * @since 0.1.5 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 * @return mixed Value of the key.
+	 */
+	protected function getConfigKey()
+	{
+		$keys = func_get_args();
 
-        return call_user_func_array([$this->config, 'getKey'], $keys);
-    }
+		return call_user_func_array([$this->config, 'getKey'], $keys);
+	}
 
-    /**
-     * Get a (multi-dimensional) array of all the configuration settings.
-     *
-     * @since 0.1.4
-     *
-     * @return array All the configuration settings.
-     */
-    protected function getConfigArray()
-    {
-        return $this->config->getAll();
-    }
+	/**
+	 * Get a (multi-dimensional) array of all the configuration settings.
+	 *
+	 * @since 0.1.4
+	 *
+	 * @return array All the configuration settings.
+	 */
+	protected function getConfigArray()
+	{
+		return $this->config->getAll();
+	}
 
-    /**
-     * Get an array of all the keys that are known by the Config.
-     *
-     * @since 0.1.2
-     *
-     * @return array Array of strings containing all the keys.
-     */
-    protected function getConfigKeys()
-    {
-        return $this->config->getKeys();
-    }
+	/**
+	 * Get an array of all the keys that are known by the Config.
+	 *
+	 * @since 0.1.2
+	 *
+	 * @return array Array of strings containing all the keys.
+	 */
+	protected function getConfigKeys()
+	{
+		return $this->config->getKeys();
+	}
 }

src/AbstractConfig.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
         parent::__construct($config, ArrayObject::ARRAY_AS_PROPS);
 
         if (null !== $delimiter) {
-            $this->delimiter = (array)$delimiter;
+            $this->delimiter = (array) $delimiter;
         }
     }
 
@@ -136,7 +136,7 @@ 
      */
     public function getKeys()
     {
-        return array_keys((array)$this);
+        return array_keys((array) $this);
     }
 
     /**
@@ -180,7 +180,7 @@ 
         // Replace all of the configured delimiters by the first one, so that we can then use explode().
         $normalizedString = str_replace($this->delimiter, $this->delimiter[0], $keyString);
 
-        return (array)explode($this->delimiter[0], $normalizedString);
+        return (array) explode($this->delimiter[0], $normalizedString);
     }
 
     /**

Indentation +166 added lines, -166 removed lines

@@ -28,170 +28,170 @@
 abstract class AbstractConfig extends ArrayObject implements ConfigInterface
 {
 
-    /**
-     * Array of strings that are used as delimiters to parse configuration keys.
-     *
-     * @since 0.1.6
-     *
-     * @var array
-     */
-    protected $delimiter = ['\\', '/', '.'];
-
-    /**
-     * Instantiate the AbstractConfig object.
-     *
-     * @since 0.1.0
-     * @since 0.1.6 Accepts a delimiter to parse configuration keys.
-     *
-     * @param array                $config    Array with settings.
-     * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse
-     *                                        configuration keys. Defaults to "\", "/" & ".".
-     */
-    public function __construct(array $config, $delimiter = null)
-    {
-        // Make sure the config entries can be accessed as properties.
-        parent::__construct($config, ArrayObject::ARRAY_AS_PROPS);
-
-        if (null !== $delimiter) {
-            $this->delimiter = (array)$delimiter;
-        }
-    }
-
-    /**
-     * Check whether the Config has a specific key.
-     *
-     * To check a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.0
-     * @since 0.1.4 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     * @return bool
-     */
-    public function hasKey()
-    {
-        try {
-            $keys = array_reverse($this->getKeyArguments(func_get_args()));
-
-            $array = $this->getArrayCopy();
-            while (count($keys) > 0) {
-                $key = array_pop($keys);
-                if ( ! array_key_exists($key, $array)) {
-                    return false;
-                }
-                $array = $array[$key];
-            }
-        } catch (Exception $exception) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the value of a specific key.
-     *
-     * To get a value several levels deep, add the keys for each level as a comma-separated list.
-     *
-     * @since 0.1.0
-     * @since 0.1.4 Accepts list of keys.
-     *
-     * @param string ... List of keys.
-     * @return mixed
-     * @throws BadMethodCallException If no argument was provided.
-     * @throws OutOfRangeException If an unknown key is requested.
-     */
-    public function getKey()
-    {
-        $keys = $this->getKeyArguments(func_get_args());
-
-        if ( ! $this->hasKey($keys)) {
-            throw new OutOfRangeException(sprintf(_('The configuration key %1$s does not exist.'),
-                implode('->', $keys)));
-        }
-
-        $keys  = array_reverse($keys);
-        $array = $this->getArrayCopy();
-        while (count($keys) > 0) {
-            $key   = array_pop($keys);
-            $array = $array[$key];
-        }
-
-        return $array;
-    }
-
-    /**
-     * Get a (multi-dimensional) array of all the configuration settings.
-     *
-     * @since 0.1.4
-     *
-     * @return array
-     */
-    public function getAll()
-    {
-        return $this->getArrayCopy();
-    }
-
-    /**
-     * Get the an array with all the keys
-     *
-     * @since 0.1.0
-     * @return array
-     */
-    public function getKeys()
-    {
-        return array_keys((array)$this);
-    }
-
-    /**
-     * Extract the configuration key arguments from an arbitrary array.
-     *
-     * @since 0.1.6
-     *
-     * @param array $arguments Array as fetched through get_func_args().
-     * @return array Array of strings.
-     * @throws BadMethodCallException If no argument was provided.
-     */
-    protected function getKeyArguments($arguments)
-    {
-        if (count($arguments) < 1) {
-            throw new BadMethodCallException(_('No configuration key was provided.'));
-        }
-
-        $keys = [];
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $keys = array_merge($keys, $this->getKeyArguments($argument));
-            }
-            if (is_string($argument)) {
-                $keys = array_merge($keys, $this->parseKeysString($argument));
-            }
-        }
-
-        return $keys;
-    }
-
-    /**
-     * Extract individual keys from a delimited string.
-     *
-     * @since 0.1.6
-     *
-     * @param string $keyString Delimited string of keys.
-     * @return array Array of key strings.
-     */
-    protected function parseKeysString($keyString)
-    {
-        // Replace all of the configured delimiters by the first one, so that we can then use explode().
-        $normalizedString = str_replace($this->delimiter, $this->delimiter[0], $keyString);
-
-        return (array)explode($this->delimiter[0], $normalizedString);
-    }
-
-    /**
-     * Validate the Config file.
-     *
-     * @since  0.1.0
-     * @return boolean
-     */
-    abstract public function isValid();
+	/**
+	 * Array of strings that are used as delimiters to parse configuration keys.
+	 *
+	 * @since 0.1.6
+	 *
+	 * @var array
+	 */
+	protected $delimiter = ['\\', '/', '.'];
+
+	/**
+	 * Instantiate the AbstractConfig object.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.6 Accepts a delimiter to parse configuration keys.
+	 *
+	 * @param array                $config    Array with settings.
+	 * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse
+	 *                                        configuration keys. Defaults to "\", "/" & ".".
+	 */
+	public function __construct(array $config, $delimiter = null)
+	{
+		// Make sure the config entries can be accessed as properties.
+		parent::__construct($config, ArrayObject::ARRAY_AS_PROPS);
+
+		if (null !== $delimiter) {
+			$this->delimiter = (array)$delimiter;
+		}
+	}
+
+	/**
+	 * Check whether the Config has a specific key.
+	 *
+	 * To check a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.4 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 * @return bool
+	 */
+	public function hasKey()
+	{
+		try {
+			$keys = array_reverse($this->getKeyArguments(func_get_args()));
+
+			$array = $this->getArrayCopy();
+			while (count($keys) > 0) {
+				$key = array_pop($keys);
+				if ( ! array_key_exists($key, $array)) {
+					return false;
+				}
+				$array = $array[$key];
+			}
+		} catch (Exception $exception) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the value of a specific key.
+	 *
+	 * To get a value several levels deep, add the keys for each level as a comma-separated list.
+	 *
+	 * @since 0.1.0
+	 * @since 0.1.4 Accepts list of keys.
+	 *
+	 * @param string ... List of keys.
+	 * @return mixed
+	 * @throws BadMethodCallException If no argument was provided.
+	 * @throws OutOfRangeException If an unknown key is requested.
+	 */
+	public function getKey()
+	{
+		$keys = $this->getKeyArguments(func_get_args());
+
+		if ( ! $this->hasKey($keys)) {
+			throw new OutOfRangeException(sprintf(_('The configuration key %1$s does not exist.'),
+				implode('->', $keys)));
+		}
+
+		$keys  = array_reverse($keys);
+		$array = $this->getArrayCopy();
+		while (count($keys) > 0) {
+			$key   = array_pop($keys);
+			$array = $array[$key];
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Get a (multi-dimensional) array of all the configuration settings.
+	 *
+	 * @since 0.1.4
+	 *
+	 * @return array
+	 */
+	public function getAll()
+	{
+		return $this->getArrayCopy();
+	}
+
+	/**
+	 * Get the an array with all the keys
+	 *
+	 * @since 0.1.0
+	 * @return array
+	 */
+	public function getKeys()
+	{
+		return array_keys((array)$this);
+	}
+
+	/**
+	 * Extract the configuration key arguments from an arbitrary array.
+	 *
+	 * @since 0.1.6
+	 *
+	 * @param array $arguments Array as fetched through get_func_args().
+	 * @return array Array of strings.
+	 * @throws BadMethodCallException If no argument was provided.
+	 */
+	protected function getKeyArguments($arguments)
+	{
+		if (count($arguments) < 1) {
+			throw new BadMethodCallException(_('No configuration key was provided.'));
+		}
+
+		$keys = [];
+		foreach ($arguments as $argument) {
+			if (is_array($argument)) {
+				$keys = array_merge($keys, $this->getKeyArguments($argument));
+			}
+			if (is_string($argument)) {
+				$keys = array_merge($keys, $this->parseKeysString($argument));
+			}
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * Extract individual keys from a delimited string.
+	 *
+	 * @since 0.1.6
+	 *
+	 * @param string $keyString Delimited string of keys.
+	 * @return array Array of key strings.
+	 */
+	protected function parseKeysString($keyString)
+	{
+		// Replace all of the configured delimiters by the first one, so that we can then use explode().
+		$normalizedString = str_replace($this->delimiter, $this->delimiter[0], $keyString);
+
+		return (array)explode($this->delimiter[0], $normalizedString);
+	}
+
+	/**
+	 * Validate the Config file.
+	 *
+	 * @since  0.1.0
+	 * @return boolean
+	 */
+	abstract public function isValid();
 }