PHPUnit update

composer.json

@@ -20,7 +20,7 @@
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
         "zendframework/zend-cache": "^2.6.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6",

test/Filter/AlnumTest.php

@@ -49,7 +49,7 @@ class AlnumTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/Filter/AlphaTest.php

@@ -49,7 +49,7 @@ class AlphaTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/Filter/NumberFormatTest.php

@@ -13,7 +13,7 @@
 
 class NumberFormatTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/Filter/NumberParseTest.php

@@ -13,7 +13,7 @@
 
 class NumberParseTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/ModuleTest.php

@@ -13,7 +13,7 @@
 
 class ModuleTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->module = new Module();
     }

test/Translator/Loader/GettextTest.php

@@ -17,7 +17,7 @@ class GettextTest extends TestCase
     protected $originalLocale;
     protected $originalIncludePath;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -32,7 +32,7 @@ public function setUp()
         set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->originalLocale);

test/Translator/Loader/IniTest.php

@@ -16,15 +16,15 @@ class IniTest extends TestCase
     protected $originalLocale;
     protected $originalIncludePath;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
         set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         set_include_path($this->originalIncludePath);
     }

test/Translator/Loader/PhpArrayTest.php

@@ -17,7 +17,7 @@ class PhpArrayTest extends TestCase
     protected $originalLocale;
     protected $originalIncludePath;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -32,7 +32,7 @@ public function setUp()
         set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->originalLocale);

test/Translator/Loader/PhpMemoryArrayTest.php

@@ -17,7 +17,7 @@ class PhpMemoryArrayTest extends TestCase
     protected $originalLocale;
     protected $originalIncludePath;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -29,7 +29,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files/phpmemoryarray');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->originalLocale);

test/Translator/TranslatorTest.php

@@ -33,7 +33,7 @@ class TranslatorTest extends TestCase
      */
     protected $testFilesDir;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -47,7 +47,7 @@ public function setUp()
         $this->testFilesDir = __DIR__ . '/_files';
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->originalLocale);

test/Validator/AlnumTest.php

@@ -25,7 +25,7 @@ class AlnumTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/Validator/AlphaTest.php

@@ -20,7 +20,7 @@ class AlphaTest extends TestCase
      */
     protected $validator;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/Validator/DateTimeTest.php

@@ -30,7 +30,7 @@ class DateTimeTest extends TestCase
      */
     protected $timezone;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -45,7 +45,7 @@ public function setUp()
         ]);
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->locale);

test/Validator/FloatTest.php

@@ -26,7 +26,7 @@ class FloatTest extends TestCase
      */
     protected $locale;
 
-    public function setUp()
+    protected function setUp()
     {
         if (version_compare(PHP_VERSION, '7.0', '>=')) {
             $this->markTestSkipped('Cannot test Float validator under PHP 7; reserved keyword');
@@ -39,7 +39,7 @@ public function setUp()
         $this->locale = Locale::getDefault();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->locale);
@@ -48,7 +48,7 @@ public function tearDown()
 
     public function testConstructorRaisesDeprecationNotice()
     {
-        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        $this->expectException('PHPUnit_Framework_Error_Deprecated');
         new FloatValidator();
     }
 }

test/Validator/IntTest.php

@@ -26,7 +26,7 @@ class IntTest extends TestCase
      */
     protected $locale;
 
-    public function setUp()
+    protected function setUp()
     {
         if (version_compare(PHP_VERSION, '7.0', '>=')) {
             $this->markTestSkipped('Cannot test Int validator under PHP 7; reserved keyword');
@@ -39,7 +39,7 @@ public function setUp()
         $this->locale = Locale::getDefault();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->locale);
@@ -48,7 +48,7 @@ public function tearDown()
 
     public function testConstructorRaisesDeprecationNotice()
     {
-        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        $this->expectException('PHPUnit_Framework_Error_Deprecated');
         new IntValidator();
     }
 }

test/Validator/IsFloatTest.php

@@ -27,7 +27,7 @@ class IsFloatTest extends TestCase
      */
     protected $locale;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -37,7 +37,7 @@ public function setUp()
         $this->validator = new IsFloatValidator(['locale' => 'en']);
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->locale);

test/Validator/IsIntTest.php

@@ -27,7 +27,7 @@ class IsIntTest extends TestCase
      */
     protected $locale;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -37,7 +37,7 @@ public function setUp()
         $this->validator = new IsIntValidator();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if (extension_loaded('intl')) {
             Locale::setDefault($this->locale);

test/Validator/PhoneNumberTest.php

@@ -3049,7 +3049,7 @@ class PhoneNumberTest extends TestCase
         ],
     ];
 
-    public function setUp()
+    protected function setUp()
     {
         $this->validator = new PhoneNumber();
     }

test/Validator/PostCodeTest.php

@@ -25,7 +25,7 @@ class PostCodeTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/View/Helper/CurrencyFormatTest.php

@@ -28,7 +28,7 @@ class CurrencyFormatTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/View/Helper/DateFormatTest.php

@@ -32,7 +32,7 @@ class DateFormatTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! interface_exists('Zend\View\Helper\HelperInterface')) {
             $this->markTestSkipped(
@@ -54,7 +54,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    protected function tearDown()
     {
         unset($this->helper);
     }

test/View/Helper/NumberFormatTest.php

@@ -31,7 +31,7 @@ class NumberFormatTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');
@@ -46,7 +46,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    protected function tearDown()
     {
         unset($this->helper);
     }

test/View/Helper/PluralTest.php

@@ -26,7 +26,7 @@ class PluralTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         if (! extension_loaded('intl')) {
             $this->markTestSkipped('ext/intl not enabled');

test/View/Helper/TranslatePluralTest.php

@@ -27,7 +27,7 @@ class TranslatePluralTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->helper = new TranslatePluralHelper();
     }
@@ -38,7 +38,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    protected function tearDown()
     {
         unset($this->helper);
     }

test/View/Helper/TranslateTest.php

@@ -27,7 +27,7 @@ class TranslateTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->helper = new TranslateHelper();
     }
@@ -38,7 +38,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    protected function tearDown()
     {
         unset($this->helper);
     }