Merge pull request #13 from kokspflanze/php_tests

tests phpunit update
kokspflanze · Jan 7, 2020 · fa84a32 · fa84a32
2 parents be0b1c4 + 553a594
commit fa84a32
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 67 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,4 +53,4 @@ install:
   - COLUMNS=120 composer show
 
 script:
- - php ./vendor/bin/phpunit --configuration phpunit.xml.dist
+  - composer test
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "laminas/laminas-cache":           "^2.8.2"
     },
     "require-dev": {
-        "phpunit/phpunit":                 "^7.5.18",
+        "phpunit/phpunit":                 "^8.4",
         "laminas/laminas-console":         "^2.8",
         "laminas/laminas-db":              "^2.5",
         "doctrine/common":                 "^2.10",
@@ -59,5 +59,8 @@
         "psr-4": {
             "BjyAuthorizeTest\\": "tests/BjyAuthorizeTest"
         }
+    },
+    "scripts": {
+        "test": "phpunit --colors=always --configuration phpunit.xml.dist"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/tests/BjyAuthorizeTest/Collector/RoleCollectorTest.php b/tests/BjyAuthorizeTest/Collector/RoleCollectorTest.php
@@ -33,7 +33,7 @@ class RoleCollectorTest extends TestCase
      *
      * @covers \BjyAuthorize\Collector\RoleCollector::__construct
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->identityProvider = $this->createMock('BjyAuthorize\\Provider\\Identity\\ProviderInterface');
         $this->collector        = new RoleCollector($this->identityProvider);

diff --git a/tests/BjyAuthorizeTest/Guard/ControllerTest.php b/tests/BjyAuthorizeTest/Guard/ControllerTest.php
@@ -41,7 +41,7 @@ class ControllerTest extends TestCase
      *
      * @covers \BjyAuthorize\Guard\Controller::__construct
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/BjyAuthorizeTest/Guard/RouteTest.php b/tests/BjyAuthorizeTest/Guard/RouteTest.php
@@ -40,7 +40,7 @@ class RouteTest extends TestCase
      *
      * @covers \BjyAuthorize\Guard\Route::__construct
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/BjyAuthorizeTest/Provider/Identity/AuthenticationIdentityProviderTest.php b/tests/BjyAuthorizeTest/Provider/Identity/AuthenticationIdentityProviderTest.php
@@ -33,7 +33,7 @@ class AuthenticationIdentityProviderTest extends TestCase
      *
      * @covers \BjyAuthorize\Provider\Identity\AuthenticationIdentityProvider::__construct
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->authService = $this->createMock('Laminas\Authentication\AuthenticationService');
         $this->provider    = new AuthenticationIdentityProvider($this->authService);

diff --git a/tests/BjyAuthorizeTest/Provider/Identity/ZfcUserZendDbTest.php b/tests/BjyAuthorizeTest/Provider/Identity/ZfcUserZendDbTest.php
@@ -43,7 +43,7 @@ class ZfcUserZendDbTest extends TestCase
      *
      * @covers \BjyAuthorize\Provider\Identity\ZfcUserZendDb::__construct
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->authService  = $this->createMock('Laminas\Authentication\AuthenticationService');
         $this->userService  = $this->getMockBuilder('ZfcUser\Service\User')->setMethods(['getAuthService'])->getMock();

diff --git a/tests/BjyAuthorizeTest/Provider/Role/ObjectRepositoryProviderTest.php b/tests/BjyAuthorizeTest/Provider/Role/ObjectRepositoryProviderTest.php
@@ -32,7 +32,7 @@ class ObjectRepositoryProviderTest extends TestCase
     /**
      * @covers \BjyAuthorize\Provider\Role\ObjectRepositoryProvider::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->repository = $this->createMock('Doctrine\Common\Persistence\ObjectRepository');
         $this->provider = new ObjectRepositoryProvider($this->repository);

diff --git a/tests/BjyAuthorizeTest/Provider/Role/ZendDbTest.php b/tests/BjyAuthorizeTest/Provider/Role/ZendDbTest.php
@@ -37,7 +37,7 @@ class ZendDbTest extends TestCase
     /**
      * @covers \BjyAuthorize\Provider\Role\ZendDb::__construct
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->serviceLocator = $this->createMock('Laminas\ServiceManager\ServiceLocatorInterface');
         $this->provider       = new ZendDb([], $this->serviceLocator);