Merge pull request #27 from ARCANEDEV/update-laravel_6.0_support

Adding Laravel 6.0 Support

.scrutinizer.yml

@@ -21,7 +21,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 3
+        runs: 2
     php_code_sniffer:
         enabled: true
         config:

.travis.yml

@@ -3,9 +3,8 @@ language: php
 sudo: false
 
 php:
-  - 7.1.3
-  - 7.1
   - 7.2
+  - 7.3
   - nightly
 
 matrix:

composer.json

@@ -13,14 +13,14 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php":                   ">=7.1.3",
-        "illuminate/filesystem": "~5.8.0",
-        "illuminate/support":    "~5.8.0"
+        "php":                   ">=7.2.0",
+        "illuminate/filesystem": "~6.0.0",
+        "illuminate/support":    "~6.0.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.8.0",
-        "phpunit/phpcov":      "~5.0|~6.0",
-        "phpunit/phpunit":     "~7.0|~8.0"
+        "orchestra/testbench": "~4.0.0",
+        "phpunit/phpcov":      "~6.0",
+        "phpunit/phpunit":     "~8.0"
     },
     "autoload": {
         "psr-4": {

src/Bases/Policy.php

@@ -2,6 +2,7 @@
 
 use Arcanedev\Support\Exceptions\MissingPolicyException;
 use Illuminate\Support\Str;
+use ReflectionClass;
 
 /**
  * Class     Policy
@@ -24,7 +25,7 @@ abstract class Policy
     public static function policies()
     {
         $abilities = array_values(
-            (new \ReflectionClass($instance = new static))->getConstants()
+            (new ReflectionClass($instance = new static))->getConstants()
         );
 
         return array_map(function ($constant) use ($instance) {

src/Exceptions/MissingPolicyException.php

@@ -1,9 +1,11 @@
 <?php namespace Arcanedev\Support\Exceptions;
 
+use Exception;
+
 /**
  * Class     MissingPolicyException
  *
  * @package  Arcanedev\Support\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class MissingPolicyException extends \Exception {}
+class MissingPolicyException extends Exception {}

src/Exceptions/PackageException.php

@@ -1,9 +1,11 @@
 <?php namespace Arcanedev\Support\Exceptions;
 
+use Exception;
+
 /**
  * Class     PackageException
  *
  * @package  Arcanedev\Support\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class PackageException extends \Exception {}
+class PackageException extends Exception {}

src/Exceptions/RouteNamespaceUndefinedException.php

@@ -1,9 +1,11 @@
 <?php namespace Arcanedev\Support\Exceptions;
 
+use Exception;
+
 /**
  * Class     RouteNamespaceUndefinedException
  *
  * @package  Arcanedev\Support\Exceptions
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class RouteNamespaceUndefinedException extends \Exception {}
+class RouteNamespaceUndefinedException extends Exception {}

src/Http/Controller.php

@@ -1,6 +1,5 @@
 <?php namespace Arcanedev\Support\Http;
 
-use Arcanedev\Support\Traits\Abortable;
 use Illuminate\Routing\Controller as IlluminateController;
 
 /**
@@ -11,13 +10,6 @@
  */
 abstract class Controller extends IlluminateController
 {
-    /* -----------------------------------------------------------------
-     |  Traits
-     | -----------------------------------------------------------------
-     */
-
-    use Abortable;
-
     /* -----------------------------------------------------------------
      |  Properties
      | -----------------------------------------------------------------

src/Providers/AuthorizationServiceProvider.php

@@ -9,7 +9,7 @@
  * @package  Arcanedev\Support\Providers
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class AuthorizationServiceProvider extends AuthServiceProvider
+abstract class AuthorizationServiceProvider extends AuthServiceProvider
 {
     /* -----------------------------------------------------------------
      |  Main Methods

src/Providers/ViewComposerServiceProvider.php

@@ -9,7 +9,7 @@
  * @package  Arcanedev\Support\Providers
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  */
-class ViewComposerServiceProvider extends ServiceProvider
+abstract class ViewComposerServiceProvider extends ServiceProvider
 {
     /* -----------------------------------------------------------------
      |  Properties

src/ServiceProvider.php

@@ -103,14 +103,13 @@ protected function singleton($abstract, $concrete = null)
      * Register a service provider.
      *
      * @param  \Illuminate\Support\ServiceProvider|string  $provider
-     * @param  array                                       $options
      * @param  bool                                        $force
      *
      * @return \Illuminate\Support\ServiceProvider
      */
-    protected function registerProvider($provider, array $options = [], $force = false)
+    protected function registerProvider($provider, $force = false)
     {
-        return $this->app->register($provider, $options, $force);
+        return $this->app->register($provider, $force);
     }
 
     /**
@@ -129,15 +128,14 @@ protected function registerProviders(array $providers)
      * Register a console service provider.
      *
      * @param  \Illuminate\Support\ServiceProvider|string  $provider
-     * @param  array                                       $options
      * @param  bool                                        $force
      *
      * @return \Illuminate\Support\ServiceProvider|null
      */
-    protected function registerConsoleServiceProvider($provider, array $options = [], $force = false)
+    protected function registerConsoleServiceProvider($provider, $force = false)
     {
         if ($this->app->runningInConsole())
-            return $this->registerProvider($provider, $options, $force);
+            return $this->registerProvider($provider, $force);
 
         return null;
     }

tests/StubTest.php

@@ -1,6 +1,7 @@
 <?php namespace Arcanedev\Support\Tests;
 
 use Arcanedev\Support\Stub;
+use Illuminate\Support\Str;
 
 /**
  * Class     StubTest
@@ -71,8 +72,8 @@ public function it_can_create()
             'PACKAGE'           => 'package',
             'AUTHOR_NAME'       => 'ARCANEDEV',
             'AUTHOR_EMAIL'      => 'arcanedev.maroc@gmail.com',
-            'MODULE_NAMESPACE'  => studly_case('arcanedev'),
-            'STUDLY_NAME'       => studly_case('package'),
+            'MODULE_NAMESPACE'  => Str::studly('arcanedev'),
+            'STUDLY_NAME'       => Str::studly('package'),
         ]);
 
         $this->stub->save('composer.json');

tests/Stubs/DummyController.php

@@ -27,11 +27,9 @@ public function index()
         return 'Dummy';
     }
 
-    public function getOne($slug)
+    public function show($slug)
     {
-        if ($slug !== 'super') {
-            return $this->pageNotFound('Super dummy not found !');
-        }
+        abort_unless($slug === 'super', 404, 'Super dummy not found !');
 
         return 'Super dummy';
     }

tests/TestCase.php

@@ -68,7 +68,7 @@ private function registerRoutes($app)
 
             $router->get('{slug}', [
                 'as'    => 'dummy::get',
-                'uses'  => 'DummyController@getOne'
+                'uses'  => 'DummyController@show'
             ]);
         });