Updated dependencies

- PHPUnit 5, 6 and 7 + config - zend-coding-standard + config + cs fixes - zendframework/zend-mvc to v2.7.15 || ^3.0.4
zfcampus · May 7, 2018 · d825a29 · d825a29
1 parent ee7c5b7
commit d825a29
Show file tree

Hide file tree

Showing 8 changed files with 823 additions and 682 deletions.
diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
         "zendframework/zend-filter": "^2.7.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-inputfilter": "^2.7.3",
-        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.15 || ^3.0.4",
         "zendframework/zend-servicemanager": "^2.7.6 || ^3.1",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
         "zendframework/zend-validator": "^2.8.1",
         "zfcampus/zf-api-problem": "^1.2.1",
         "zfcampus/zf-content-negotiation": "^1.2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0",
-        "squizlabs/php_codesniffer": "^2.6.2",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-db": "^2.8.1"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,25 +1,6 @@
 <?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>config</file>

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,16 @@
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
         <testsuite name="ZFContentValidation Module Tests">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
 
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+        <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>

diff --git a/test/ContentValidationListenerTest.php b/test/ContentValidationListenerTest.php
@@ -6,7 +6,7 @@
 
 namespace ZFTest\ContentValidation;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Http\Request as HttpRequest;

diff --git a/test/InputFilter/InputFilterPluginTest.php b/test/InputFilter/InputFilterPluginTest.php
@@ -6,7 +6,7 @@
 
 namespace ZFTest\ContentValidation\InputFilter;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\InputFilter\InputFilterInterface;
 use Zend\Mvc\Controller\AbstractController;
 use Zend\Mvc\MvcEvent;

diff --git a/test/Validator/Db/NoRecordExistsFactoryTest.php b/test/Validator/Db/NoRecordExistsFactoryTest.php
@@ -6,12 +6,13 @@
 
 namespace ZFTest\ContentValidation\Validator\Db;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Db\Adapter\Adapter;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Validator\Db\NoRecordExists;
 use Zend\Validator\ValidatorPluginManager;
 
-class NoRecordExistsFactoryTest extends \PHPUnit_Framework_TestCase
+class NoRecordExistsFactoryTest extends TestCase
 {
     protected $validators;
 

diff --git a/test/Validator/Db/RecordExistsFactoryTest.php b/test/Validator/Db/RecordExistsFactoryTest.php
@@ -6,12 +6,13 @@
 
 namespace ZFTest\ContentValidation\Validator\Db;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Db\Adapter\Adapter;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Validator\Db\RecordExists;
 use Zend\Validator\ValidatorPluginManager;
 
-class RecordExistsFactoryTest extends \PHPUnit_Framework_TestCase
+class RecordExistsFactoryTest extends TestCase
 {
     protected $validators;