Merge branch 'hotfix/166' into develop

Conflicts:
	.travis.yml
	composer.json
	phpcs.xml

Author: weierophinney

.travis.yml

@@ -31,6 +31,7 @@ matrix:
     - php: 7
       env:
         - CS_CHECK=true
+    - php: 7.1
     - php: hhvm 
   allow_failures:
     - php: hhvm

composer.json

@@ -19,11 +19,11 @@
         "zendframework/zend-stdlib": "^3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.6 || ^5.2.10",
         "ocramius/proxy-manager": "^1.0 || ^2.0",
-        "squizlabs/php_codesniffer": "^2.5.1",
         "phpbench/phpbench": "^0.10.0",
-        "mikey179/vfsStream": "^1.6"
+        "phpunit/phpunit": "^4.6 || ^5.2.10",
+        "mikey179/vfsStream": "^1.6",
+        "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
         "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services",
@@ -51,8 +51,12 @@
         "bin/generate-factory-for-class"
     ],
     "scripts": {
-        "cs-check": "phpcs --colors",
-        "cs-fix": "phpcbf --colors",
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "upload-coverage": "coveralls -v"

phpcs.xml

@@ -1,29 +1,12 @@
 <?xml version="1.0"?>
 <ruleset name="Zend Framework coding standard">
-    <description>Zend Framework coding standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- 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"/>
-        </properties>
-    </rule>
+    <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
 
     <!-- Paths to check -->
     <file>bin</file>
     <file>src</file>
     <file>test</file>
-    <exclude-pattern>*/test/log/*</exclude-pattern>
+    <file>benchmarks</file>
+
+    <exclude-pattern>test/log/</exclude-pattern>
 </ruleset>