Merge pull request #70 from EmanueleCoppola/master

Laravel 6 support
BKWLD · Sep 5, 2019 · e2787f5 · e2787f5
2 parents e3a7f90 + 42da19a
commit e2787f5
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,25 +3,35 @@ language: php
 git:
   depth: 5
 
+cache:
+  apt: true
+  directories:
+    - $HOME/.composer/cache
+
 matrix:
   include:
     - php: 5.4
+      dist: trusty
       env:
         - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^2.7'
     - php: 5.5
+      dist: trusty
       env:
         - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^2.7'
     - php: 5.5
+      dist: trusty
       env:
         - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^3.0'
     - php: 5.5
+      dist: trusty
       env:
         - LARAVEL_VERSION='5.2.*'
         - PUG_VERSION='^2.7'
     - php: 5.5
+      dist: trusty
       env:
         - LARAVEL_VERSION='5.2.*'
         - PUG_VERSION='^3.0'
@@ -67,108 +77,86 @@ matrix:
         - PUG_VERSION='^3.0'
     - php: 7.1
       env:
-        - LARAVEL_VERSION='4.2.*'
+        - LARAVEL_VERSION='5.4.*'
         - PUG_VERSION='^2.7'
     - php: 7.1
       env:
-        - LARAVEL_VERSION='4.2.*'
+        - LARAVEL_VERSION='5.5.*'
         - PUG_VERSION='^3.0'
-    - php: 7.1
+    - php: 7.2
       env:
-        - LARAVEL_VERSION='5.4.*'
+        - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^2.7'
-    - php: 7.1
+    - php: 7.2
       env:
         - LARAVEL_VERSION='5.4.*'
         - PUG_VERSION='^3.0'
-    - php: 7.1
+    - php: 7.2
       env:
         - LARAVEL_VERSION='5.5.*'
         - PUG_VERSION='^2.7'
-    - php: 7.1
-      env:
-        - LARAVEL_VERSION='5.5.*'
-        - PUG_VERSION='^3.0'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^2.7'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='4.2.*'
         - PUG_VERSION='^3.0'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='5.4.*'
         - PUG_VERSION='^2.7'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='5.4.*'
         - PUG_VERSION='^3.0'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='5.5.*'
         - PUG_VERSION='^2.7'
-    - php: 7.2
+    - php: 7.3
       env:
         - LARAVEL_VERSION='5.5.*'
         - PUG_VERSION='^3.0'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='4.2.*'
-      - PUG_VERSION='^2.7'
-    - php: 7.3
-      env:
-      - LARAVEL_VERSION='4.2.*'
-      - PUG_VERSION='^3.0'
-    - php: 7.3
-      env:
-      - LARAVEL_VERSION='5.4.*'
-      - PUG_VERSION='^2.7'
-    - php: 7.3
-      env:
-      - LARAVEL_VERSION='5.4.*'
-      - PUG_VERSION='^3.0'
-    - php: 7.3
-      env:
-      - LARAVEL_VERSION='5.5.*'
-      - PUG_VERSION='^2.7'
-    - php: 7.3
-      env:
-      - LARAVEL_VERSION='5.5.*'
-      - PUG_VERSION='^3.0'
+        - LARAVEL_VERSION='5.6.*'
+        - PUG_VERSION='^2.7'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.6.*'
-      - PUG_VERSION='^2.7'
+        - LARAVEL_VERSION='5.6.*'
+        - PUG_VERSION='^3.0'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.6.*'
-      - PUG_VERSION='^3.0'
+        - LARAVEL_VERSION='5.7.*'
+        - PUG_VERSION='^2.7'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.7.*'
-      - PUG_VERSION='^2.7'
+        - LARAVEL_VERSION='5.7.*'
+        - PUG_VERSION='^3.0'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.7.*'
-      - PUG_VERSION='^3.0'
+        - LARAVEL_VERSION='5.8.*'
+        - PUG_VERSION='^2.7'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.8.*'
-      - PUG_VERSION='^2.7'
+        - LARAVEL_VERSION='5.8.*'
+        - PUG_VERSION='^3.0'
     - php: 7.3
       env:
-      - LARAVEL_VERSION='5.8.*'
-      - PUG_VERSION='^3.0'
+        - LARAVEL_VERSION='6.0.*'
+        - PUG_VERSION='^3.0'
 
 install:
+  - if [[ $LARAVEL_VERSION != "5.4.*" || $PUG_VERSION != "^3.0" || ${TRAVIS_PHP_VERSION:0:3} != "5.6" ]]; then phpenv config-rm xdebug.ini || echo 'XDebug already disabled'; fi;
   - travis_retry composer self-update
   - travis_retry php tests/setDependenciesVersions.php $LARAVEL_VERSION $PUG_VERSION
   - travis_wait 30 travis_retry composer update --no-interaction
 
 script:
-  - vendor/bin/phpunit --verbose --coverage-text --coverage-clover=coverage.xml
+  - if [[ $LARAVEL_VERSION == "5.4.*" && $PUG_VERSION == "^3.0" && ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then vendor/bin/phpunit --verbose --coverage-text --coverage-clover=coverage.xml; fi;
+  - if [[ $LARAVEL_VERSION != "5.4.*" || $PUG_VERSION != "^3.0" || ${TRAVIS_PHP_VERSION:0:3} != "5.6" ]]; then vendor/bin/phpunit --verbose --no-coverage; fi;
 
 after_script:
   - if [[ $LARAVEL_VERSION == "5.4.*" && $PUG_VERSION == "^3.0" && ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then vendor/bin/test-reporter --coverage-report coverage.xml; fi;

diff --git a/composer.json b/composer.json
@@ -4,8 +4,8 @@
     "type": "composer-plugin",
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "4 - 5",
-        "illuminate/view": "4 - 5",
+        "illuminate/support": "4 - 6",
+        "illuminate/view": "4 - 6",
         "pug-php/pug-assets": "^1.0.1",
         "pug/installer": "^0.1.3",
         "composer-plugin-api": "^1.0"

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -179,7 +179,8 @@ public function boot()
         // Version specific booting
         switch ($this->version()) {
             case 4: $this->bootLaravel4(); break;
-            case 5: $this->bootLaravel5(); break;
+            case 5: $this->bootLaravel5And6(); break;
+            case 6: $this->bootLaravel5And6(); break;
             default: throw new Exception('Unsupported Laravel version.');
         }
 
@@ -200,12 +201,12 @@ public function bootLaravel4()
     }
 
     /**
-     * Boot specific logic for Laravel 5. Registers the config file for publishing
+     * Boot specific logic for Laravel 5 and 6. Registers the config file for publishing
      * to app directory.
      *
      * @return void
      */
-    public function bootLaravel5()
+    public function bootLaravel5And6()
     {
         if (function_exists('config_path')) {
             $this->publishes(array(

diff --git a/tests/LaravelTestApp.php b/tests/LaravelTestApp.php
@@ -30,7 +30,7 @@ public function setUseSysTempDir($useSysTempDir)
         $this->useSysTempDir = $useSysTempDir;
     }
 
-    public function basePath()
+    public function basePath($path = '')
     {
         return __DIR__;
     }
@@ -304,4 +304,8 @@ public function addContextualBinding($concrete, $abstract, $implementation)
     public function flush()
     {
     }
+
+    public function singletonIf($abstract, $concrete = null)
+    {
+    }
 }
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -329,7 +329,7 @@ public function testProvides()
     /**
      * @covers ::boot
      * @covers ::bootLaravel4
-     * @covers ::bootLaravel5
+     * @covers ::bootLaravel5And6
      * @covers ::registerPugCompiler
      * @covers ::registerPugBladeCompiler
      * @covers ::getEngineResolver