@@ -25,97 +25,97 @@ |
||
25 | 25 | class LoaderFactory |
26 | 26 | { |
27 | 27 | |
28 | - /** |
|
29 | - * Array of fully qualified class names of known loaders. |
|
30 | - * |
|
31 | - * @var array<string> |
|
32 | - * |
|
33 | - * @since 0.4.0 |
|
34 | - */ |
|
35 | - protected static $loaders = [ |
|
36 | - 'BrightNucleus\Config\Loader\PHPLoader', |
|
37 | - ]; |
|
28 | + /** |
|
29 | + * Array of fully qualified class names of known loaders. |
|
30 | + * |
|
31 | + * @var array<string> |
|
32 | + * |
|
33 | + * @since 0.4.0 |
|
34 | + */ |
|
35 | + protected static $loaders = [ |
|
36 | + 'BrightNucleus\Config\Loader\PHPLoader', |
|
37 | + ]; |
|
38 | 38 | |
39 | - /** |
|
40 | - * Array of instantiated loaders. |
|
41 | - * |
|
42 | - * These are lazily instantiated and added as needed. |
|
43 | - * |
|
44 | - * @var LoaderInterface[] |
|
45 | - * |
|
46 | - * @since 0.4.0 |
|
47 | - */ |
|
48 | - protected static $loaderInstances = []; |
|
39 | + /** |
|
40 | + * Array of instantiated loaders. |
|
41 | + * |
|
42 | + * These are lazily instantiated and added as needed. |
|
43 | + * |
|
44 | + * @var LoaderInterface[] |
|
45 | + * |
|
46 | + * @since 0.4.0 |
|
47 | + */ |
|
48 | + protected static $loaderInstances = []; |
|
49 | 49 | |
50 | - /** |
|
51 | - * Create a new Loader from an URI. |
|
52 | - * |
|
53 | - * @since 0.4.0 |
|
54 | - * |
|
55 | - * @param string $uri URI of the resource to create a loader for. |
|
56 | - * |
|
57 | - * @return LoaderInterface Loader that is able to load the given URI. |
|
58 | - * @throws FailedToLoadConfigException If no suitable loader was found. |
|
59 | - */ |
|
60 | - public static function createFromUri($uri) |
|
61 | - { |
|
62 | - foreach (static::$loaders as $loader) { |
|
63 | - if ($loader::canLoad($uri)) { |
|
64 | - return static::getLoader($loader); |
|
65 | - } |
|
66 | - } |
|
50 | + /** |
|
51 | + * Create a new Loader from an URI. |
|
52 | + * |
|
53 | + * @since 0.4.0 |
|
54 | + * |
|
55 | + * @param string $uri URI of the resource to create a loader for. |
|
56 | + * |
|
57 | + * @return LoaderInterface Loader that is able to load the given URI. |
|
58 | + * @throws FailedToLoadConfigException If no suitable loader was found. |
|
59 | + */ |
|
60 | + public static function createFromUri($uri) |
|
61 | + { |
|
62 | + foreach (static::$loaders as $loader) { |
|
63 | + if ($loader::canLoad($uri)) { |
|
64 | + return static::getLoader($loader); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | |
68 | - throw new FailedToLoadConfigException( |
|
69 | - sprintf( |
|
70 | - _('Could not find a suitable loader for URI "%1$s".'), |
|
71 | - $uri |
|
72 | - ) |
|
73 | - ); |
|
74 | - } |
|
68 | + throw new FailedToLoadConfigException( |
|
69 | + sprintf( |
|
70 | + _('Could not find a suitable loader for URI "%1$s".'), |
|
71 | + $uri |
|
72 | + ) |
|
73 | + ); |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * Get an instance of a specific loader. |
|
78 | - * |
|
79 | - * The loader is lazily instantiated if needed. |
|
80 | - * |
|
81 | - * @since 0.4.0 |
|
82 | - * |
|
83 | - * @param string $loaderClass Fully qualified class name of the loader to get. |
|
84 | - * |
|
85 | - * @return LoaderInterface Instance of the requested loader. |
|
86 | - * @throws FailedToLoadConfigException If the loader class could not be instantiated. |
|
87 | - */ |
|
88 | - public static function getLoader($loaderClass) |
|
89 | - { |
|
90 | - try { |
|
91 | - if (! array_key_exists($loaderClass, static::$loaderInstances)) { |
|
92 | - static::$loaderInstances[$loaderClass] = new $loaderClass; |
|
93 | - } |
|
76 | + /** |
|
77 | + * Get an instance of a specific loader. |
|
78 | + * |
|
79 | + * The loader is lazily instantiated if needed. |
|
80 | + * |
|
81 | + * @since 0.4.0 |
|
82 | + * |
|
83 | + * @param string $loaderClass Fully qualified class name of the loader to get. |
|
84 | + * |
|
85 | + * @return LoaderInterface Instance of the requested loader. |
|
86 | + * @throws FailedToLoadConfigException If the loader class could not be instantiated. |
|
87 | + */ |
|
88 | + public static function getLoader($loaderClass) |
|
89 | + { |
|
90 | + try { |
|
91 | + if (! array_key_exists($loaderClass, static::$loaderInstances)) { |
|
92 | + static::$loaderInstances[$loaderClass] = new $loaderClass; |
|
93 | + } |
|
94 | 94 | |
95 | - return static::$loaderInstances[$loaderClass]; |
|
96 | - } catch (Exception $exception) { |
|
97 | - throw new FailedToLoadConfigException( |
|
98 | - sprintf( |
|
99 | - _('Could not instantiate the requested loader class "%1$s".'), |
|
100 | - $loaderClass |
|
101 | - ) |
|
102 | - ); |
|
103 | - } |
|
104 | - } |
|
95 | + return static::$loaderInstances[$loaderClass]; |
|
96 | + } catch (Exception $exception) { |
|
97 | + throw new FailedToLoadConfigException( |
|
98 | + sprintf( |
|
99 | + _('Could not instantiate the requested loader class "%1$s".'), |
|
100 | + $loaderClass |
|
101 | + ) |
|
102 | + ); |
|
103 | + } |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * Register a new loader. |
|
108 | - * |
|
109 | - * @since 0.4.0 |
|
110 | - * |
|
111 | - * @param string $loader Fully qualified class name of a loader implementing LoaderInterface. |
|
112 | - */ |
|
113 | - public static function registerLoader($loader) |
|
114 | - { |
|
115 | - if (in_array($loader, static::$loaders, true)) { |
|
116 | - return; |
|
117 | - } |
|
106 | + /** |
|
107 | + * Register a new loader. |
|
108 | + * |
|
109 | + * @since 0.4.0 |
|
110 | + * |
|
111 | + * @param string $loader Fully qualified class name of a loader implementing LoaderInterface. |
|
112 | + */ |
|
113 | + public static function registerLoader($loader) |
|
114 | + { |
|
115 | + if (in_array($loader, static::$loaders, true)) { |
|
116 | + return; |
|
117 | + } |
|
118 | 118 | |
119 | - static::$loaders [] = $loader; |
|
120 | - } |
|
119 | + static::$loaders [] = $loader; |
|
120 | + } |
|
121 | 121 | } |
@@ -88,7 +88,7 @@ |
||
88 | 88 | public static function getLoader($loaderClass) |
89 | 89 | { |
90 | 90 | try { |
91 | - if (! array_key_exists($loaderClass, static::$loaderInstances)) { |
|
91 | + if ( ! array_key_exists($loaderClass, static::$loaderInstances)) { |
|
92 | 92 | static::$loaderInstances[$loaderClass] = new $loaderClass; |
93 | 93 | } |
94 | 94 |
@@ -25,20 +25,20 @@ |
||
25 | 25 | class Loader |
26 | 26 | { |
27 | 27 | |
28 | - /** |
|
29 | - * Static convenience function to load a configuration from an URI. |
|
30 | - * |
|
31 | - * @since 0.4.0 |
|
32 | - * |
|
33 | - * @param string $uri URI of the resource to load. |
|
34 | - * |
|
35 | - * @return array|null Parsed data loaded from the resource. |
|
36 | - * @throws FailedToLoadConfigException If the configuration could not be loaded. |
|
37 | - */ |
|
38 | - public static function load($uri) |
|
39 | - { |
|
40 | - $loader = LoaderFactory::createFromUri($uri); |
|
28 | + /** |
|
29 | + * Static convenience function to load a configuration from an URI. |
|
30 | + * |
|
31 | + * @since 0.4.0 |
|
32 | + * |
|
33 | + * @param string $uri URI of the resource to load. |
|
34 | + * |
|
35 | + * @return array|null Parsed data loaded from the resource. |
|
36 | + * @throws FailedToLoadConfigException If the configuration could not be loaded. |
|
37 | + */ |
|
38 | + public static function load($uri) |
|
39 | + { |
|
40 | + $loader = LoaderFactory::createFromUri($uri); |
|
41 | 41 | |
42 | - return $loader->load($uri); |
|
43 | - } |
|
42 | + return $loader->load($uri); |
|
43 | + } |
|
44 | 44 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->validator = $validator; |
84 | 84 | |
85 | 85 | // Make sure $config is either a string or array. |
86 | - if (! (is_string($config) || is_array($config))) { |
|
86 | + if ( ! (is_string($config) || is_array($config))) { |
|
87 | 87 | throw new InvalidConfigurationSourceException( |
88 | 88 | sprintf( |
89 | 89 | _('Invalid configuration source: %1$s'), |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | |
115 | 115 | // Finally, validate the resulting config. |
116 | - if (! $this->isValid()) { |
|
116 | + if ( ! $this->isValid()) { |
|
117 | 117 | throw new InvalidConfigException( |
118 | 118 | sprintf( |
119 | 119 | _('ConfigInterface file is not valid: %1$s'), |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function resolveOptions($config) |
154 | 154 | { |
155 | - if (! $this->schema) { |
|
155 | + if ( ! $this->schema) { |
|
156 | 156 | return $config; |
157 | 157 | } |
158 | 158 | |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $defaults = $this->schema->getDefaultOptions(); |
194 | 194 | $required = $this->schema->getRequiredOptions(); |
195 | 195 | |
196 | - if (! $defined && ! $defaults && ! $required) { |
|
196 | + if ( ! $defined && ! $defaults && ! $required) { |
|
197 | 197 | return false; |
198 | 198 | } |
199 | 199 |
@@ -32,188 +32,188 @@ |
||
32 | 32 | class Config extends AbstractConfig |
33 | 33 | { |
34 | 34 | |
35 | - /** |
|
36 | - * The schema of the Config file. |
|
37 | - * |
|
38 | - * @var Schema |
|
39 | - */ |
|
40 | - protected $schema; |
|
41 | - |
|
42 | - /** |
|
43 | - * The Validator class that gets asked to do the validation of the config. |
|
44 | - * |
|
45 | - * @since 0.1.0 |
|
46 | - * |
|
47 | - * @var Validator |
|
48 | - */ |
|
49 | - protected $validator; |
|
50 | - |
|
51 | - /** |
|
52 | - * Instantiate the Config object. |
|
53 | - * |
|
54 | - * It accepts either an array with the configuration settings, or a |
|
55 | - * filename pointing to a PHP file it can include. |
|
56 | - * |
|
57 | - * @since 0.1.0 |
|
58 | - * @since 0.1.6 Accepts a delimiter to parse configuration keys. |
|
59 | - * |
|
60 | - * @param array|string $config Array with settings or filename for the |
|
61 | - * settings file. |
|
62 | - * @param Schema|null $schema Optional. Config that contains default |
|
63 | - * values that can get overwritten. |
|
64 | - * @param Validator|null $validator Optional. Validator class that does the |
|
65 | - * actual validation. |
|
66 | - * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse |
|
67 | - * configuration keys. Defaults to "\", "/" & ".". |
|
68 | - * |
|
69 | - * @throws InvalidConfigurationSourceException If the config source is not a string or array. |
|
70 | - * @throws FailedToInstantiateParentException If the parent class could not be instantiated. |
|
71 | - * @throws FailedToLoadConfigException If loading of the config source failed. |
|
72 | - * @throws FailedToResolveConfigException If the config file could not be resolved. |
|
73 | - * @throws InvalidConfigException If the config file is not valid. |
|
74 | - */ |
|
75 | - public function __construct( |
|
76 | - $config, |
|
77 | - Schema $schema = null, |
|
78 | - Validator $validator = null, |
|
79 | - $delimiter = null |
|
80 | - ) { |
|
81 | - $this->schema = $schema; |
|
82 | - $this->validator = $validator; |
|
83 | - |
|
84 | - // Make sure $config is either a string or array. |
|
85 | - if (! (is_string($config) || is_array($config))) { |
|
86 | - throw new InvalidConfigurationSourceException( |
|
87 | - sprintf( |
|
88 | - _('Invalid configuration source: %1$s'), |
|
89 | - print_r($config, true) |
|
90 | - ) |
|
91 | - ); |
|
92 | - } |
|
93 | - |
|
94 | - if (is_string($config)) { |
|
95 | - $config = Loader::load($config); |
|
96 | - } |
|
97 | - |
|
98 | - // Run the $config through the OptionsResolver. |
|
99 | - $config = $this->resolveOptions($config); |
|
100 | - |
|
101 | - // Instantiate the parent class. |
|
102 | - try { |
|
103 | - parent::__construct($config, $delimiter); |
|
104 | - } catch (Exception $exception) { |
|
105 | - throw new FailedToInstantiateParentException( |
|
106 | - sprintf( |
|
107 | - _('Could not instantiate the configuration through its parent. Reason: %1$s'), |
|
108 | - $exception->getMessage() |
|
109 | - ) |
|
110 | - ); |
|
111 | - } |
|
112 | - |
|
113 | - // Finally, validate the resulting config. |
|
114 | - if (! $this->isValid()) { |
|
115 | - throw new InvalidConfigException( |
|
116 | - sprintf( |
|
117 | - _('ConfigInterface file is not valid: %1$s'), |
|
118 | - print_r($config, true) |
|
119 | - ) |
|
120 | - ); |
|
121 | - } |
|
122 | - } |
|
123 | - |
|
124 | - /** |
|
125 | - * Validate the Config file. |
|
126 | - * |
|
127 | - * @since 0.1.0 |
|
128 | - * |
|
129 | - * @return boolean |
|
130 | - */ |
|
131 | - public function isValid() |
|
132 | - { |
|
133 | - if ($this->validator) { |
|
134 | - return $this->validator->isValid($this); |
|
135 | - } |
|
136 | - |
|
137 | - return true; |
|
138 | - } |
|
139 | - |
|
140 | - /** |
|
141 | - * Process the passed-in defaults and merge them with the new values, while |
|
142 | - * checking that all required options are set. |
|
143 | - * |
|
144 | - * @since 0.1.0 |
|
145 | - * |
|
146 | - * @param array $config Configuration settings to resolve. |
|
147 | - * |
|
148 | - * @return array Resolved configuration settings. |
|
149 | - * @throws FailedToResolveConfigException If there are errors while resolving the options. |
|
150 | - */ |
|
151 | - protected function resolveOptions($config) |
|
152 | - { |
|
153 | - if (! $this->schema) { |
|
154 | - return $config; |
|
155 | - } |
|
156 | - |
|
157 | - try { |
|
158 | - $resolver = new OptionsResolver(); |
|
159 | - if ($this->configureOptions($resolver)) { |
|
160 | - $config = $resolver->resolve($config); |
|
161 | - } |
|
162 | - } catch (Exception $exception) { |
|
163 | - throw new FailedToResolveConfigException( |
|
164 | - sprintf( |
|
165 | - _('Error while resolving config options: %1$s'), |
|
166 | - $exception->getMessage() |
|
167 | - ) |
|
168 | - ); |
|
169 | - } |
|
170 | - |
|
171 | - return $config; |
|
172 | - } |
|
173 | - |
|
174 | - /** |
|
175 | - * Configure the possible and required options for the Config. |
|
176 | - * |
|
177 | - * This should return a bool to let the resolve_options() know whether the |
|
178 | - * actual resolving needs to be done or not. |
|
179 | - * |
|
180 | - * @since 0.1.0 |
|
181 | - * |
|
182 | - * @param OptionsResolver $resolver Reference to the OptionsResolver |
|
183 | - * instance. |
|
184 | - * |
|
185 | - * @return bool Whether to do the resolving. |
|
186 | - * @throws FailedToResolveConfigException If there are errors while processing. |
|
187 | - */ |
|
188 | - protected function configureOptions(OptionsResolver $resolver) |
|
189 | - { |
|
190 | - $defined = $this->schema->getDefinedOptions(); |
|
191 | - $defaults = $this->schema->getDefaultOptions(); |
|
192 | - $required = $this->schema->getRequiredOptions(); |
|
193 | - |
|
194 | - if (! $defined && ! $defaults && ! $required) { |
|
195 | - return false; |
|
196 | - } |
|
197 | - |
|
198 | - try { |
|
199 | - if ($defined) { |
|
200 | - $resolver->setDefined($defined); |
|
201 | - } |
|
202 | - if ($defaults) { |
|
203 | - $resolver->setDefaults($defaults); |
|
204 | - } |
|
205 | - if ($required) { |
|
206 | - $resolver->setRequired($required); |
|
207 | - } |
|
208 | - } catch (Exception $exception) { |
|
209 | - throw new FailedToResolveConfigException( |
|
210 | - sprintf( |
|
211 | - _('Error while processing config options: %1$s'), |
|
212 | - $exception->getMessage() |
|
213 | - ) |
|
214 | - ); |
|
215 | - } |
|
216 | - |
|
217 | - return true; |
|
218 | - } |
|
35 | + /** |
|
36 | + * The schema of the Config file. |
|
37 | + * |
|
38 | + * @var Schema |
|
39 | + */ |
|
40 | + protected $schema; |
|
41 | + |
|
42 | + /** |
|
43 | + * The Validator class that gets asked to do the validation of the config. |
|
44 | + * |
|
45 | + * @since 0.1.0 |
|
46 | + * |
|
47 | + * @var Validator |
|
48 | + */ |
|
49 | + protected $validator; |
|
50 | + |
|
51 | + /** |
|
52 | + * Instantiate the Config object. |
|
53 | + * |
|
54 | + * It accepts either an array with the configuration settings, or a |
|
55 | + * filename pointing to a PHP file it can include. |
|
56 | + * |
|
57 | + * @since 0.1.0 |
|
58 | + * @since 0.1.6 Accepts a delimiter to parse configuration keys. |
|
59 | + * |
|
60 | + * @param array|string $config Array with settings or filename for the |
|
61 | + * settings file. |
|
62 | + * @param Schema|null $schema Optional. Config that contains default |
|
63 | + * values that can get overwritten. |
|
64 | + * @param Validator|null $validator Optional. Validator class that does the |
|
65 | + * actual validation. |
|
66 | + * @param string[]|string|null $delimiter A string or array of strings that are used as delimiters to parse |
|
67 | + * configuration keys. Defaults to "\", "/" & ".". |
|
68 | + * |
|
69 | + * @throws InvalidConfigurationSourceException If the config source is not a string or array. |
|
70 | + * @throws FailedToInstantiateParentException If the parent class could not be instantiated. |
|
71 | + * @throws FailedToLoadConfigException If loading of the config source failed. |
|
72 | + * @throws FailedToResolveConfigException If the config file could not be resolved. |
|
73 | + * @throws InvalidConfigException If the config file is not valid. |
|
74 | + */ |
|
75 | + public function __construct( |
|
76 | + $config, |
|
77 | + Schema $schema = null, |
|
78 | + Validator $validator = null, |
|
79 | + $delimiter = null |
|
80 | + ) { |
|
81 | + $this->schema = $schema; |
|
82 | + $this->validator = $validator; |
|
83 | + |
|
84 | + // Make sure $config is either a string or array. |
|
85 | + if (! (is_string($config) || is_array($config))) { |
|
86 | + throw new InvalidConfigurationSourceException( |
|
87 | + sprintf( |
|
88 | + _('Invalid configuration source: %1$s'), |
|
89 | + print_r($config, true) |
|
90 | + ) |
|
91 | + ); |
|
92 | + } |
|
93 | + |
|
94 | + if (is_string($config)) { |
|
95 | + $config = Loader::load($config); |
|
96 | + } |
|
97 | + |
|
98 | + // Run the $config through the OptionsResolver. |
|
99 | + $config = $this->resolveOptions($config); |
|
100 | + |
|
101 | + // Instantiate the parent class. |
|
102 | + try { |
|
103 | + parent::__construct($config, $delimiter); |
|
104 | + } catch (Exception $exception) { |
|
105 | + throw new FailedToInstantiateParentException( |
|
106 | + sprintf( |
|
107 | + _('Could not instantiate the configuration through its parent. Reason: %1$s'), |
|
108 | + $exception->getMessage() |
|
109 | + ) |
|
110 | + ); |
|
111 | + } |
|
112 | + |
|
113 | + // Finally, validate the resulting config. |
|
114 | + if (! $this->isValid()) { |
|
115 | + throw new InvalidConfigException( |
|
116 | + sprintf( |
|
117 | + _('ConfigInterface file is not valid: %1$s'), |
|
118 | + print_r($config, true) |
|
119 | + ) |
|
120 | + ); |
|
121 | + } |
|
122 | + } |
|
123 | + |
|
124 | + /** |
|
125 | + * Validate the Config file. |
|
126 | + * |
|
127 | + * @since 0.1.0 |
|
128 | + * |
|
129 | + * @return boolean |
|
130 | + */ |
|
131 | + public function isValid() |
|
132 | + { |
|
133 | + if ($this->validator) { |
|
134 | + return $this->validator->isValid($this); |
|
135 | + } |
|
136 | + |
|
137 | + return true; |
|
138 | + } |
|
139 | + |
|
140 | + /** |
|
141 | + * Process the passed-in defaults and merge them with the new values, while |
|
142 | + * checking that all required options are set. |
|
143 | + * |
|
144 | + * @since 0.1.0 |
|
145 | + * |
|
146 | + * @param array $config Configuration settings to resolve. |
|
147 | + * |
|
148 | + * @return array Resolved configuration settings. |
|
149 | + * @throws FailedToResolveConfigException If there are errors while resolving the options. |
|
150 | + */ |
|
151 | + protected function resolveOptions($config) |
|
152 | + { |
|
153 | + if (! $this->schema) { |
|
154 | + return $config; |
|
155 | + } |
|
156 | + |
|
157 | + try { |
|
158 | + $resolver = new OptionsResolver(); |
|
159 | + if ($this->configureOptions($resolver)) { |
|
160 | + $config = $resolver->resolve($config); |
|
161 | + } |
|
162 | + } catch (Exception $exception) { |
|
163 | + throw new FailedToResolveConfigException( |
|
164 | + sprintf( |
|
165 | + _('Error while resolving config options: %1$s'), |
|
166 | + $exception->getMessage() |
|
167 | + ) |
|
168 | + ); |
|
169 | + } |
|
170 | + |
|
171 | + return $config; |
|
172 | + } |
|
173 | + |
|
174 | + /** |
|
175 | + * Configure the possible and required options for the Config. |
|
176 | + * |
|
177 | + * This should return a bool to let the resolve_options() know whether the |
|
178 | + * actual resolving needs to be done or not. |
|
179 | + * |
|
180 | + * @since 0.1.0 |
|
181 | + * |
|
182 | + * @param OptionsResolver $resolver Reference to the OptionsResolver |
|
183 | + * instance. |
|
184 | + * |
|
185 | + * @return bool Whether to do the resolving. |
|
186 | + * @throws FailedToResolveConfigException If there are errors while processing. |
|
187 | + */ |
|
188 | + protected function configureOptions(OptionsResolver $resolver) |
|
189 | + { |
|
190 | + $defined = $this->schema->getDefinedOptions(); |
|
191 | + $defaults = $this->schema->getDefaultOptions(); |
|
192 | + $required = $this->schema->getRequiredOptions(); |
|
193 | + |
|
194 | + if (! $defined && ! $defaults && ! $required) { |
|
195 | + return false; |
|
196 | + } |
|
197 | + |
|
198 | + try { |
|
199 | + if ($defined) { |
|
200 | + $resolver->setDefined($defined); |
|
201 | + } |
|
202 | + if ($defaults) { |
|
203 | + $resolver->setDefaults($defaults); |
|
204 | + } |
|
205 | + if ($required) { |
|
206 | + $resolver->setRequired($required); |
|
207 | + } |
|
208 | + } catch (Exception $exception) { |
|
209 | + throw new FailedToResolveConfigException( |
|
210 | + sprintf( |
|
211 | + _('Error while processing config options: %1$s'), |
|
212 | + $exception->getMessage() |
|
213 | + ) |
|
214 | + ); |
|
215 | + } |
|
216 | + |
|
217 | + return true; |
|
218 | + } |
|
219 | 219 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @since 0.4.2 |
135 | 135 | * |
136 | - * @return ConfigInterface Configuration settings to use. |
|
136 | + * @return Config|null Configuration settings to use. |
|
137 | 137 | */ |
138 | 138 | protected function fetchDefaultConfig() |
139 | 139 | { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * |
152 | 152 | * @since 0.4.2 |
153 | 153 | * |
154 | - * @return ConfigInterface Configuration settings to use. |
|
154 | + * @return Config|null Configuration settings to use. |
|
155 | 155 | */ |
156 | 156 | protected function fetchConfig($configFile) |
157 | 157 | { |
@@ -25,140 +25,140 @@ |
||
25 | 25 | trait ConfigTrait |
26 | 26 | { |
27 | 27 | |
28 | - /** |
|
29 | - * Reference to the Config object. |
|
30 | - * |
|
31 | - * @since 0.1.2 |
|
32 | - * |
|
33 | - * @var ConfigInterface |
|
34 | - */ |
|
35 | - protected $config; |
|
28 | + /** |
|
29 | + * Reference to the Config object. |
|
30 | + * |
|
31 | + * @since 0.1.2 |
|
32 | + * |
|
33 | + * @var ConfigInterface |
|
34 | + */ |
|
35 | + protected $config; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Process the passed-in configuration file. |
|
39 | - * |
|
40 | - * @since 0.1.2 |
|
41 | - * |
|
42 | - * @param ConfigInterface $config The Config to process. |
|
43 | - * @param string ... List of keys. |
|
44 | - * |
|
45 | - * @throws FailedToProcessConfigException If the arguments could not be parsed into a Config. |
|
46 | - */ |
|
47 | - protected function processConfig(ConfigInterface $config) |
|
48 | - { |
|
49 | - if (func_num_args() > 1) { |
|
50 | - try { |
|
51 | - $keys = func_get_args(); |
|
52 | - array_shift($keys); |
|
53 | - $config = $config->getSubConfig($keys); |
|
54 | - } catch (Exception $exception) { |
|
55 | - throw new FailedToProcessConfigException( |
|
56 | - sprintf( |
|
57 | - _('Could not process the config with the arguments "%1$s".'), |
|
58 | - print_r(func_get_args(), true) |
|
59 | - ) |
|
60 | - ); |
|
61 | - } |
|
62 | - } |
|
63 | - $this->config = $config; |
|
64 | - } |
|
37 | + /** |
|
38 | + * Process the passed-in configuration file. |
|
39 | + * |
|
40 | + * @since 0.1.2 |
|
41 | + * |
|
42 | + * @param ConfigInterface $config The Config to process. |
|
43 | + * @param string ... List of keys. |
|
44 | + * |
|
45 | + * @throws FailedToProcessConfigException If the arguments could not be parsed into a Config. |
|
46 | + */ |
|
47 | + protected function processConfig(ConfigInterface $config) |
|
48 | + { |
|
49 | + if (func_num_args() > 1) { |
|
50 | + try { |
|
51 | + $keys = func_get_args(); |
|
52 | + array_shift($keys); |
|
53 | + $config = $config->getSubConfig($keys); |
|
54 | + } catch (Exception $exception) { |
|
55 | + throw new FailedToProcessConfigException( |
|
56 | + sprintf( |
|
57 | + _('Could not process the config with the arguments "%1$s".'), |
|
58 | + print_r(func_get_args(), true) |
|
59 | + ) |
|
60 | + ); |
|
61 | + } |
|
62 | + } |
|
63 | + $this->config = $config; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Check whether the Config has a specific key. |
|
68 | - * |
|
69 | - * To get a value several levels deep, add the keys for each level as a comma-separated list. |
|
70 | - * |
|
71 | - * @since 0.1.2 |
|
72 | - * @since 0.1.5 Accepts list of keys. |
|
73 | - * |
|
74 | - * @param string|array $_ List of keys. |
|
75 | - * |
|
76 | - * @return bool Whether the key is known. |
|
77 | - */ |
|
78 | - protected function hasConfigKey($_) |
|
79 | - { |
|
80 | - $keys = func_get_args(); |
|
66 | + /** |
|
67 | + * Check whether the Config has a specific key. |
|
68 | + * |
|
69 | + * To get a value several levels deep, add the keys for each level as a comma-separated list. |
|
70 | + * |
|
71 | + * @since 0.1.2 |
|
72 | + * @since 0.1.5 Accepts list of keys. |
|
73 | + * |
|
74 | + * @param string|array $_ List of keys. |
|
75 | + * |
|
76 | + * @return bool Whether the key is known. |
|
77 | + */ |
|
78 | + protected function hasConfigKey($_) |
|
79 | + { |
|
80 | + $keys = func_get_args(); |
|
81 | 81 | |
82 | - return $this->config->hasKey($keys); |
|
83 | - } |
|
82 | + return $this->config->hasKey($keys); |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * Get the Config value for a specific key. |
|
87 | - * |
|
88 | - * To get a value several levels deep, add the keys for each level as a comma-separated list. |
|
89 | - * |
|
90 | - * @since 0.1.2 |
|
91 | - * @since 0.1.5 Accepts list of keys. |
|
92 | - * |
|
93 | - * @param string|array $_ List of keys. |
|
94 | - * |
|
95 | - * @return mixed Value of the key. |
|
96 | - */ |
|
97 | - protected function getConfigKey($_) |
|
98 | - { |
|
99 | - $keys = func_get_args(); |
|
85 | + /** |
|
86 | + * Get the Config value for a specific key. |
|
87 | + * |
|
88 | + * To get a value several levels deep, add the keys for each level as a comma-separated list. |
|
89 | + * |
|
90 | + * @since 0.1.2 |
|
91 | + * @since 0.1.5 Accepts list of keys. |
|
92 | + * |
|
93 | + * @param string|array $_ List of keys. |
|
94 | + * |
|
95 | + * @return mixed Value of the key. |
|
96 | + */ |
|
97 | + protected function getConfigKey($_) |
|
98 | + { |
|
99 | + $keys = func_get_args(); |
|
100 | 100 | |
101 | - return $this->config->getKey($keys); |
|
102 | - } |
|
101 | + return $this->config->getKey($keys); |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * Get a (multi-dimensional) array of all the configuration settings. |
|
106 | - * |
|
107 | - * @since 0.1.4 |
|
108 | - * |
|
109 | - * @return array All the configuration settings. |
|
110 | - */ |
|
111 | - protected function getConfigArray() |
|
112 | - { |
|
113 | - return $this->config->getAll(); |
|
114 | - } |
|
104 | + /** |
|
105 | + * Get a (multi-dimensional) array of all the configuration settings. |
|
106 | + * |
|
107 | + * @since 0.1.4 |
|
108 | + * |
|
109 | + * @return array All the configuration settings. |
|
110 | + */ |
|
111 | + protected function getConfigArray() |
|
112 | + { |
|
113 | + return $this->config->getAll(); |
|
114 | + } |
|
115 | 115 | |
116 | - /** |
|
117 | - * Get an array of all the keys that are known by the Config. |
|
118 | - * |
|
119 | - * @since 0.1.2 |
|
120 | - * |
|
121 | - * @return array Array of strings containing all the keys. |
|
122 | - */ |
|
123 | - protected function getConfigKeys() |
|
124 | - { |
|
125 | - return $this->config->getKeys(); |
|
126 | - } |
|
116 | + /** |
|
117 | + * Get an array of all the keys that are known by the Config. |
|
118 | + * |
|
119 | + * @since 0.1.2 |
|
120 | + * |
|
121 | + * @return array Array of strings containing all the keys. |
|
122 | + */ |
|
123 | + protected function getConfigKeys() |
|
124 | + { |
|
125 | + return $this->config->getKeys(); |
|
126 | + } |
|
127 | 127 | |
128 | - /** |
|
129 | - * Get a default configuration in case none was injected into the constructor. |
|
130 | - * |
|
131 | - * The name and path of the configuration needs to be set as a const called DEFAULT_CONFIG within the class |
|
132 | - * containing the trait. The path needs to be relative to the location of the containing class file. |
|
133 | - * |
|
134 | - * @since 0.4.2 |
|
135 | - * |
|
136 | - * @return ConfigInterface Configuration settings to use. |
|
137 | - */ |
|
138 | - protected function fetchDefaultConfig() |
|
139 | - { |
|
140 | - $configFile = method_exists($this, 'getDefaultConfigFile') |
|
141 | - ? $this->getDefaultConfigFile() |
|
142 | - : __DIR__ . '/../config/defaults.php'; |
|
128 | + /** |
|
129 | + * Get a default configuration in case none was injected into the constructor. |
|
130 | + * |
|
131 | + * The name and path of the configuration needs to be set as a const called DEFAULT_CONFIG within the class |
|
132 | + * containing the trait. The path needs to be relative to the location of the containing class file. |
|
133 | + * |
|
134 | + * @since 0.4.2 |
|
135 | + * |
|
136 | + * @return ConfigInterface Configuration settings to use. |
|
137 | + */ |
|
138 | + protected function fetchDefaultConfig() |
|
139 | + { |
|
140 | + $configFile = method_exists($this, 'getDefaultConfigFile') |
|
141 | + ? $this->getDefaultConfigFile() |
|
142 | + : __DIR__ . '/../config/defaults.php'; |
|
143 | 143 | |
144 | - return $this->fetchConfig($configFile); |
|
145 | - } |
|
144 | + return $this->fetchConfig($configFile); |
|
145 | + } |
|
146 | 146 | |
147 | - /** |
|
148 | - * Get a configuration from a specified $file. |
|
149 | - * |
|
150 | - * If file is not accessible or readable, returns an empty Config. |
|
151 | - * |
|
152 | - * @since 0.4.2 |
|
153 | - * |
|
154 | - * @return ConfigInterface Configuration settings to use. |
|
155 | - */ |
|
156 | - protected function fetchConfig($configFile) |
|
157 | - { |
|
158 | - if (is_string($configFile) && ! is_readable($configFile)) { |
|
159 | - $configFile = []; |
|
160 | - } |
|
147 | + /** |
|
148 | + * Get a configuration from a specified $file. |
|
149 | + * |
|
150 | + * If file is not accessible or readable, returns an empty Config. |
|
151 | + * |
|
152 | + * @since 0.4.2 |
|
153 | + * |
|
154 | + * @return ConfigInterface Configuration settings to use. |
|
155 | + */ |
|
156 | + protected function fetchConfig($configFile) |
|
157 | + { |
|
158 | + if (is_string($configFile) && ! is_readable($configFile)) { |
|
159 | + $configFile = []; |
|
160 | + } |
|
161 | 161 | |
162 | - return ConfigFactory::create($configFile); |
|
163 | - } |
|
162 | + return ConfigFactory::create($configFile); |
|
163 | + } |
|
164 | 164 | } |
@@ -139,7 +139,7 @@ |
||
139 | 139 | { |
140 | 140 | $configFile = method_exists($this, 'getDefaultConfigFile') |
141 | 141 | ? $this->getDefaultConfigFile() |
142 | - : __DIR__ . '/../config/defaults.php'; |
|
142 | + : __DIR__.'/../config/defaults.php'; |
|
143 | 143 | |
144 | 144 | return $this->fetchConfig($configFile); |
145 | 145 | } |