Merge branch 'hotfix/19'

Close #19
zfcampus · Aug 13, 2016 · 5123186 · 5123186
2 parents 6c84f55 + d6a18a1
commit 5123186
Show file tree

Hide file tree

Showing 14 changed files with 321 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.2.1 - TBD
+## 1.2.1 - 2016-08-13
 
 ### Added
 
-- Nothing.
+- [#19](https://github.com/zfcampus/zf-configuration/pull/19) adds the ability
+  to enable usage of `::class` notation in generated configuration via a
+  configuration setting, `zf-configuration.class_name_scalars`.
 
 ### Deprecated
 
@@ -18,7 +20,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#19](https://github.com/zfcampus/zf-configuration/pull/19) fixes a syntax
+  error in the `ConfigResourceFactory`.
 
 ## 1.2.0 - 2016-07-13
 

diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ The top-level configuration key for user configuration of this module is `zf-con
 'zf-configuration' => [
     'config_file' => 'config/autoload/development.php',
     'enable_short_array' => false,
+    'class_name_scalars' => false,
 ],
 ```
 
@@ -71,6 +72,12 @@ The top-level configuration key for user configuration of this module is `zf-con
 Set this value to a boolean `true` if you want to use PHP 5.4's square bracket (aka "short") array
 syntax.
 
+#### Key: `class_name_scalars`
+
+- Since 1.2.1
+
+Set this value to a boolean `true` if you want to use PHP 5.5's class name scalars (`::class` notation).
+
 ZF2 Events
 ----------
 

diff --git a/composer.json b/composer.json
@@ -33,8 +33,9 @@
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0",
-        "squizlabs/php_codesniffer": "^2.3.1"
+        "phpunit/phpunit": "^4.8 || ^5.5",
+        "squizlabs/php_codesniffer": "^2.6.2",
+        "container-interop/container-interop": "^1.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/module.config.php b/config/module.config.php
@@ -9,18 +9,20 @@
 return [
     'zf-configuration' => [
         'config_file' => 'config/autoload/development.php',
-        /* set the following flag if you wish to use short array syntax
-         * in configuration files manipulated by the ConfigWriter:
-         *
-         * 'enable_short_array' => true,
-         */
+        // set the following flag if you wish to use short array syntax
+        // in configuration files manipulated by the ConfigWriter:
+        // 'enable_short_array' => true,
+
+        // class_name_scalars defines whether configuration files
+        // manipulated by the ConfigWriter should use ::class notation
+        // 'class_name_scalars' => true,
     ],
     'service_manager' => [
         'factories' => [
             ConfigResource::class        => Factory\ConfigResourceFactory::class,
             ConfigResourceFactory::class => Factory\ResourceFactoryFactory::class,
             ConfigWriter::class          => Factory\ConfigWriterFactory::class,
             ModuleUtils::class           => Factory\ModuleUtilsFactory::class,
-        ]
+        ],
     ],
 ];
diff --git a/phpcs.xml b/phpcs.xml
@@ -9,6 +9,12 @@
     <!-- inherit rules from: -->
     <rule ref="PSR2"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="ZFConfiguration Module Tests">