@@ -128,7 +128,7 @@ |
||
| 128 | 128 | $table->addColumn(new Text('value')); |
| 129 | 129 | $table->addColumn(new Varchar('context', 255)); |
| 130 | 130 | $table->addConstraint( |
| 131 | - new UniqueKey(['path','context'], 'configuration_uniqueness_index') |
|
| 131 | + new UniqueKey(['path', 'context'], 'configuration_uniqueness_index') |
|
| 132 | 132 | ); |
| 133 | 133 | |
| 134 | 134 | $sql = new Sql($this->adapter); |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Magium\Configuration\Config\InvalidConfigurationLocationException; |
| 6 | 6 | use Magium\Configuration\Config\InvalidDirectoryException; |
| 7 | 7 | use Magium\Configuration\File\AdapterInterface; |
| 8 | -use Magium\Configuration\File\InvalidFileException; |
|
| 9 | 8 | |
| 10 | 9 | class ConfigurationFileRepository implements \ArrayAccess, \Iterator, \Countable |
| 11 | 10 | { |
@@ -43,6 +43,9 @@ |
||
| 43 | 43 | return $this->container[$id]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | + /** |
|
| 47 | + * @param string $type |
|
| 48 | + */ |
|
| 46 | 49 | public function newInstance($type) |
| 47 | 50 | { |
| 48 | 51 | $reflection = new \ReflectionClass($type); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | - * @param ConfigurationRepository|null $config |
|
| 105 | + * @param null|ConfigInterface $config |
|
| 106 | 106 | * @return ConfigurationRepository |
| 107 | 107 | * @throws InvalidConfigurationLocationException |
| 108 | 108 | * @throws InvalidFileException |
@@ -159,6 +159,9 @@ discard block |
||
| 159 | 159 | return $structure; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | + /** |
|
| 163 | + * @param string $callbackString |
|
| 164 | + */ |
|
| 162 | 165 | protected function executeCallback($callbackString, $value) |
| 163 | 166 | { |
| 164 | 167 | if (function_exists($callbackString)) { |
@@ -199,7 +202,7 @@ discard block |
||
| 199 | 202 | |
| 200 | 203 | /** |
| 201 | 204 | * @param \SimpleXMLElement $structure The object representing the merged configuration structure |
| 202 | - * @param \SimpleXmlElement $config An empty config object to be populated |
|
| 205 | + * @param ConfigInterface $config An empty config object to be populated |
|
| 203 | 206 | * @param string $context The name of the context |
| 204 | 207 | * @return ConfigurationRepository The resulting configuration object |
| 205 | 208 | */ |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | interface ConfigInterface |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - const ALLOWED_TRUES = [ |
|
| 8 | + const ALLOWED_TRUES = [ |
|
| 9 | 9 | true, 'true', 1, '1', 'on', 'yes' |
| 10 | 10 | ]; |
| 11 | 11 | |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | namespace Magium\Configuration\View; |
| 10 | 10 | |
| 11 | 11 | use Zend\Form\Element; |
| 12 | -use Zend\Form\View\Helper\FormElement; |
|
| 13 | 12 | use Zend\Form\View\Helper\FormInput; |
| 14 | 13 | use Zend\View\Helper\AbstractHelper; |
| 15 | 14 | |
@@ -25,7 +25,6 @@ discard block |
||
| 25 | 25 | * @param string $layoutFile |
| 26 | 26 | * @param string $viewFile |
| 27 | 27 | * @param boolean $provideWrapperHtml |
| 28 | - * @param boolean $provideJqueryUrl |
|
| 29 | 28 | * @throws InvalidViewConfigurationException |
| 30 | 29 | */ |
| 31 | 30 | public function __construct( |
@@ -56,7 +55,7 @@ discard block |
||
| 56 | 55 | } |
| 57 | 56 | |
| 58 | 57 | /** |
| 59 | - * @param mixed $provideWrapperHtml |
|
| 58 | + * @param boolean $provideWrapperHtml |
|
| 60 | 59 | */ |
| 61 | 60 | public function setProvideWrapperHtml($provideWrapperHtml) |
| 62 | 61 | { |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | public function __construct( |
| 32 | 32 | ServerRequestInterface $request, |
| 33 | 33 | MessageInterface $response, |
| 34 | - $viewDirectory = __DIR__ . '/views' , |
|
| 34 | + $viewDirectory = __DIR__ . '/views', |
|
| 35 | 35 | $layoutFile = 'layout.phtml', |
| 36 | 36 | $viewFile = 'view.phtml', |
| 37 | 37 | $provideWrapperHtml = true, |