add laravel 5.4 compatibility

spekkionu · spekkionu · commit 075410462663 · 2017-01-30T10:08:22.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,11 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+
+matrix:
+  allow_failures:
+    - php: 7.2
 
 before_script:
   - curl -s http://getcomposer.org/installer | php
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Add the following line to the `require` section of `composer.json`:
 
 1. Add `'Spekkionu\ZendAcl\ZendAclServiceProvider',` to the service provider list in `config/app.php`.
 2. Add `'Acl' => 'Spekkionu\ZendAcl\Facades\Acl',` to the list of aliases in `config/app.php`.
-3. Run `php artisan vendor:publish --provider=Spekkionu\ZendAcl\ZendAclServiceProvider`
+3. Run `php artisan vendor:publish --provider="Spekkionu\ZendAcl\ZendAclServiceProvider"`
 
 After publishing the permissions will be defined in `app/Http/acl.php`.
 
diff --git a/composer.json b/composer.json
@@ -12,10 +12,10 @@
     "require": {
         "php": ">=5.5.9",
         "zendframework/zend-permissions-acl": "2.6.*",
-        "illuminate/support": "5.1.*|5.2.*|5.3.*"
+        "illuminate/support": "5.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.31",
+        "phpunit/phpunit": "~5.0",
         "mockery/mockery": "~0.9.7"
     },
     "autoload": {
diff --git a/src/Spekkionu/ZendAcl/ZendAclLumenServiceProvider.php b/src/Spekkionu/ZendAcl/ZendAclLumenServiceProvider.php
@@ -34,7 +34,7 @@ public function register()
     {
         $this->app->configure('zendacl');
 
-        $this->app['acl'] = $this->app->share(function (Application $app) {
+        $this->app['acl'] = $this->app->singleton(function (Application $app) {
             $acl = new Acl;
             if (file_exists(base_path('app/Http/acl.php'))) {
                 include base_path('app/Http/acl.php');
diff --git a/src/Spekkionu/ZendAcl/ZendAclServiceProvider.php b/src/Spekkionu/ZendAcl/ZendAclServiceProvider.php
@@ -41,9 +41,9 @@ public function register()
         $this->mergeConfigFrom(
             dirname(dirname(__DIR__)) . '/config/zendacl.php',
             'zendacl'
-        );      
+        );
 
-        $this->app['acl'] = $this->app->share(function (Application $app) {
+        $this->app->singleton('acl', function (Application $app) {
             $acl = new Acl;
             if (file_exists(app_path('Http/acl.php'))) {
                 include app_path('Http/acl.php');

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function register()`
`34`	`34`	`{`
`35`	`35`	`$this->app->configure('zendacl');`
`36`	`36`
`37`		`- $this->app['acl'] = $this->app->share(function (Application $app) {`
	`37`	`+ $this->app['acl'] = $this->app->singleton(function (Application $app) {`
`38`	`38`	`$acl = new Acl;`
`39`	`39`	`if (file_exists(base_path('app/Http/acl.php'))) {`
`40`	`40`	`include base_path('app/Http/acl.php');`