Merge pull request #800 from laravel/laravel8

[6.x] Support Laravel 8

Author: driesvints

.github/workflows/tests.yml

@@ -14,11 +14,13 @@ jobs:
       fail-fast: true
       matrix:
         php: [7.2, 7.3, 7.4]
-        laravel: [^6.0, ^7.0]
+        laravel: [^6.0, ^7.0, ^8.0]
         phpunit: [^7.5, ^8.0, ^9.0]
         exclude:
           - php: 7.2
             phpunit: ^9.0
+          - php: 7.2
+            laravel: ^8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - U${{ matrix.phpunit }}
 

composer.json

@@ -15,8 +15,8 @@
         "ext-zip": "*",
         "php-webdriver/webdriver": "^1.8.1",
         "nesbot/carbon": "^2.0",
-        "illuminate/console": "^6.0|^7.0",
-        "illuminate/support": "^6.0|^7.0",
+        "illuminate/console": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0",
         "symfony/console": "^4.3|^5.0",
         "symfony/finder": "^4.3|^5.0",
         "symfony/process": "^4.3|^5.0",

tests/ComponentTest.php

@@ -35,10 +35,10 @@ public function test_resolver_prefix()
         $driver = m::mock(stdClass::class);
         $browser = new Browser($driver);
 
-        $browser->within($component = new TestComponent, function ($browser) use ($component) {
+        $browser->within($component = new TestComponent, function ($browser) {
             $this->assertEquals('body #component-root', $browser->resolver->prefix);
 
-            $browser->within($nested = new TestNestedComponent, function ($browser) use ($nested) {
+            $browser->within($nested = new TestNestedComponent, function ($browser) {
                 $this->assertEquals('body #component-root #nested-root', $browser->resolver->prefix);
 
                 $browser->with('prefix', function ($browser) {
@@ -75,7 +75,7 @@ public function test_component_elements()
                 '@overridden-alias' => '#not-overridden',
             ], $browser->resolver->elements);
 
-            $browser->within($nested = new TestNestedComponent, function ($browser) use ($nested) {
+            $browser->within($nested = new TestNestedComponent, function ($browser) {
                 $this->assertEquals([
                     '@nested-alias' => '#nested-alias',
                     '@overridden-alias' => '#overridden',