Update test suite

terminal42 · Apr 4, 2021 · d5c290a · d5c290a
1 parent 041f0ba
commit d5c290a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "source": "https://github.com/terminal42/contao-url-rewrite"
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.2",
         "codefog/contao-haste": "^4.20",
         "contao/core-bundle": "^4.4",
         "symfony/config": "^3.3 || ^4.0 || ^5.0",
@@ -31,9 +31,9 @@
         "contao/calendar-bundle": "^4.4",
         "contao/faq-bundle": "^4.4",
         "contao/news-bundle": "^4.4",
-        "contao/test-case": "^2.0",
+        "contao/test-case": "^4.0",
         "friendsofphp/php-cs-fixer": "^2.2",
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^8.0",
         "php-coveralls/php-coveralls": "^2.4",
         "symfony-cmf/routing": "^2.1"
     },

diff --git a/tests/ConfigProvider/BundleConfigProviderTest.php b/tests/ConfigProvider/BundleConfigProviderTest.php
@@ -19,7 +19,7 @@ class BundleConfigProviderTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->provider = new BundleConfigProvider([
             // Invalid entry

diff --git a/tests/Controller/RewriteControllerTest.php b/tests/Controller/RewriteControllerTest.php
@@ -144,7 +144,7 @@ private function mockContaoFramework()
         $insertTags = $this
             ->getMockBuilder(Adapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['replace'])
+            ->addMethods(['replace'])
             ->getMock()
         ;
 
@@ -187,7 +187,7 @@ private function mockRequest($urlRewrite = null, $routeParams = [], $query = [])
                 [],
                 $attributes
             ])
-            ->setMethods(['getSchemeAndHttpHost', 'getBasePath'])
+            ->onlyMethods(['getSchemeAndHttpHost', 'getBasePath'])
             ->getMock()
         ;
 

diff --git a/tests/DependencyInjection/Compiler/ConfigProviderPassTest.php b/tests/DependencyInjection/Compiler/ConfigProviderPassTest.php
@@ -17,7 +17,7 @@ class ConfigProviderPassTest extends TestCase
      */
     private $pass;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->pass = new ConfigProviderPass('alias', 'chain', 'tag');
     }

diff --git a/tests/EventListener/AbstractContainerListenerTest.php b/tests/EventListener/AbstractContainerListenerTest.php
@@ -39,7 +39,7 @@ abstract class AbstractContainerListenerTest extends ContaoTestCase
      */
     private $inputAdapter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cacheDir = __DIR__ . '/tmp';
 
@@ -56,7 +56,7 @@ protected function setUp()
 
     abstract protected function getRouter();
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->fs->remove($this->cacheDir);
     }

diff --git a/tests/EventListener/InsertTagsListenerTest.php b/tests/EventListener/InsertTagsListenerTest.php
@@ -202,7 +202,7 @@ public function testOnInsertFlagsEventUrl($provided, $expected)
         $listener = $this
             ->getMockBuilder(InsertTagsListener::class)
             ->setConstructorArgs([$this->createFrameworkMock($provided[0])])
-            ->setMethods(['classExists'])
+            ->onlyMethods(['classExists'])
             ->getMock()
         ;
 
@@ -339,7 +339,7 @@ public function testOnInsertFlagsFaqUrl($provided, $expected)
         $listener = $this
             ->getMockBuilder(InsertTagsListener::class)
             ->setConstructorArgs([$this->createFrameworkMock($provided[0])])
-            ->setMethods(['classExists'])
+            ->onlyMethods(['classExists'])
             ->getMock()
         ;
 
@@ -423,7 +423,7 @@ public function testOnInsertFlagsNewsUrl($provided, $expected)
         $listener = $this
             ->getMockBuilder(InsertTagsListener::class)
             ->setConstructorArgs([$this->createFrameworkMock($provided[0])])
-            ->setMethods(['classExists'])
+            ->onlyMethods(['classExists'])
             ->getMock()
         ;
 
@@ -575,7 +575,7 @@ private function createAdapterMock(array $methods = [])
         return $this
             ->getMockBuilder(Adapter::class)
             ->disableOriginalConstructor()
-            ->setMethods($methods)
+            ->addMethods($methods)
             ->getMock()
         ;
     }