add support for laravel 5.5

spekkionu · spekkionu · commit 14a91d094772 · 2017-08-31T10:41:37.000-07:00
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -8,7 +8,7 @@ checks:
 build:
     environment:
         php:
-            version: 5.6
+            version: 7.1
     tests:
         override:
             -
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
@@ -14,4 +13,4 @@ before_script:
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev
 
-script: phpunit --configuration phpunit.travis.xml --coverage-text
+script: ./vendor/bin/phpunit --configuration phpunit.travis.xml --coverage-text
diff --git a/composer.json b/composer.json
@@ -10,17 +10,27 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=7.0",
         "zendframework/zend-permissions-acl": "2.6.*",
-        "illuminate/support": "5.*"
+        "illuminate/support": "5.5.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0",
-        "mockery/mockery": "~0.9.7"
+        "phpunit/phpunit": "~6.0",
+        "mockery/mockery": "~0.9.9"
     },
     "autoload": {
         "psr-4": {
             "Spekkionu\\ZendAcl\\": "src/Spekkionu/ZendAcl"
         }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Spekkionu\\ZendAcl\\ZendAclServiceProvider"
+            ],
+            "aliases": {
+                "Acl": "Spekkionu\\ZendAcl\\Facades\\Acl"
+            }
+        }
     }
 }
diff --git a/phpunit.travis.xml b/phpunit.travis.xml
@@ -6,6 +6,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         beStrictAboutTestsThatDoNotTestAnything="false"
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
diff --git a/phpunit.xml b/phpunit.xml
@@ -6,6 +6,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         beStrictAboutTestsThatDoNotTestAnything="false"
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
diff --git a/tests/AclRouteMiddlewareTest.php b/tests/AclRouteMiddlewareTest.php
@@ -1,6 +1,6 @@
 <?php namespace Spekkionu\ZendAcl;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Spekkionu\ZendAcl\AclMiddleware;
 use \Mockery as m;
 use Closure;
@@ -17,7 +17,7 @@ function response($body = null, $status = null) {
     return AclRouteMiddlewareTest::$functions->response($body, $status);
 }
 
-class AclRouteMiddlewareTest extends PHPUnit_Framework_TestCase
+class AclRouteMiddlewareTest extends TestCase
 {
 
     public static $functions;
@@ -47,7 +47,7 @@ public function testFilter()
         $acl->shouldReceive('isAllowed')->once()->with('member', $resource, $permission)->andReturn(true);
 
         $closure = function($request){};
-        
+
         $request = m::mock('Illuminate\Http\Request');
 
         $filter = new AclMiddleware($auth, $acl, $config);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ checks:`
`8`	`8`	`build:`
`9`	`9`	`environment:`
`10`	`10`	`php:`
`11`		`- version: 5.6`
	`11`	`+ version: 7.1`
`12`	`12`	`tests:`
`13`	`13`	`override:`
`14`	`14`	`-`