Merge pull request #394 from basz/minor-tweak

Minor tweak
LM-Commons · Jan 17, 2020 · 3bd3fdb · 3bd3fdb
2 parents 5473608 + 031a312
commit 3bd3fdb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 .idea
 .php_cs.cache
 build
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -7,18 +7,24 @@ cache:
 
 matrix:
   include:
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPENDENCIES=""
         - EXECUTE_CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
-    - php: 7.2
+    - php: 7.3
       env:
         - DEPENDENCIES=""
-    - php: 7.2
+    - php: 7.3
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - php: 7.4
+      env:
+        - DEPENDENCIES=""
+    - php: 7.4
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
 

diff --git a/composer.json b/composer.json
@@ -35,13 +35,14 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.2",
     "zendframework/zend-servicemanager": "^3.3",
     "zendframework/zend-stdlib": "^3.1"
   },
   "require-dev": {
     "malukenho/docheader": "^0.1.7",
-    "phpunit/phpunit": "^7.5.6",
+    "phpunit/phpunit": "^8.5.2",
+    "phpspec/prophecy": "^1.10",
     "friendsofphp/php-cs-fixer": "^2.9.3",
     "doctrine/common": "^2.4",
     "satooshi/php-coveralls": "^2.0"

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -28,7 +28,7 @@
  */
 final class ConfigProvider
 {
-    public function __invoke()
+    public function __invoke(): array
     {
         return [
             'dependencies' => $this->getDependencyConfig(),

diff --git a/src/Module.php b/src/Module.php
@@ -26,7 +26,7 @@ final class Module
     /**
      * Return default ZfcRbac configuration for zend-mvc applications.
      */
-    public function getConfig()
+    public function getConfig(): array
     {
         $provider = new ConfigProvider();
 

diff --git a/test/Options/ModuleOptionsTest.php b/test/Options/ModuleOptionsTest.php
@@ -35,8 +35,8 @@ public function testAssertModuleDefaultOptions(): void
         $moduleOptions = new \ZfcRbac\Options\ModuleOptions();
 
         $this->assertEquals('guest', $moduleOptions->getGuestRole());
-        $this->assertInternalType('array', $moduleOptions->getRoleProvider());
-        $this->assertInternalType('array', $moduleOptions->getAssertionMap());
+        $this->assertIsArray($moduleOptions->getRoleProvider());
+        $this->assertIsArray($moduleOptions->getAssertionMap());
     }
 
     public function testSettersAndGetters(): void
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ composer.lock @@
     .idea
     .php_cs.cache
     build
+    .phpunit.result.cache