Merge 2e54a45 into a5351ff

zendframework · Dec 11, 2018 · ed71238 · ed71238
2 parents a5351ff + 2e54a45
commit ed71238
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 /vendor/
 /zf-mkdoc-theme.tgz
 /zf-mkdoc-theme/
+/.phpcs-cache
diff --git a/composer.json b/composer.json
@@ -27,8 +27,9 @@
         "container-interop/container-interop": "^1.2.0",
         "mikey179/vfsStream": "^1.6",
         "phpunit/phpunit": "^7.3",
-        "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-servicemanager": "^3.0"
+        "zendframework/zend-coding-standard": "dev-develop as 2.0.0",
+        "zendframework/zend-servicemanager": "^3.0",
+        "webimpress/coding-standard": "dev-master"
     },
     "conflict": {
         "zendframework/zend-servicemanager-di": "*"
@@ -65,8 +66,8 @@
             "@analyse",
             "@test"
         ],
-        "cs-check": "phpcs",
-        "cs-fix": "phpcbf",
+        "cs-check": "phpcs -sp",
+        "cs-fix": "phpcbf -sp",
         "analyse": "phpstan analyse --no-progress -c phpstan.neon",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"