Backport PHP 7.4 Support (#29842)

Co-authored-by: Dries Vints <[email protected]>

.travis.yml

@@ -17,6 +17,7 @@ matrix:
     - php: 7.3
     - php: 7.3
       env: SETUP=lowest
+    - php: 7.4snapshot
 
 cache:
   directories:

src/Illuminate/Http/Resources/DelegatesToResource.php

@@ -50,7 +50,7 @@ public function resolveRouteBinding($value)
      */
     public function offsetExists($offset)
     {
-        return array_key_exists($offset, $this->resource);
+        return isset($this->resource[$offset]);
     }
 
     /**

src/Illuminate/Support/Facades/Facade.php

@@ -172,7 +172,9 @@ protected static function resolveFacadeInstance($name)
             return static::$resolvedInstance[$name];
         }
 
-        return static::$resolvedInstance[$name] = static::$app[$name];
+        if (static::$app) {
+            return static::$resolvedInstance[$name] = static::$app[$name];
+        }
     }
 
     /**

src/Illuminate/Support/Traits/Macroable.php

@@ -80,11 +80,13 @@ public static function __callStatic($method, $parameters)
             ));
         }
 
-        if (static::$macros[$method] instanceof Closure) {
-            return call_user_func_array(Closure::bind(static::$macros[$method], null, static::class), $parameters);
+        $macro = static::$macros[$method];
+
+        if ($macro instanceof Closure) {
+            return call_user_func_array(Closure::bind($macro, null, static::class), $parameters);
         }
 
-        return call_user_func_array(static::$macros[$method], $parameters);
+        return $macro(...$parameters);
     }
 
     /**
@@ -110,6 +112,6 @@ public function __call($method, $parameters)
             return call_user_func_array($macro->bindTo($this, static::class), $parameters);
         }
 
-        return call_user_func_array($macro, $parameters);
+        return $macro(...$parameters);
     }
 }

tests/Integration/Migration/MigratorTest.php

@@ -27,7 +27,7 @@ public function test_dont_display_output_when_output_object_is_not_available()
 
         $migrator->run([__DIR__.'/fixtures']);
 
-        $this->assertTrue($this->tableExists('members'));
+        $this->assertTrue($this->tableExists('people'));
     }
 
     private function tableExists($table): bool

tests/Integration/Migration/fixtures/2014_10_12_000000_create_members_table.php → tests/Integration/Migration/fixtures/2014_10_12_000000_create_people_table.php

@@ -1,12 +1,10 @@
 <?php
 
-namespace Illuminate\Tests\Integration\Migration\fixtures;
-
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateMembersTable extends Migration
+class CreatePeopleTable extends Migration
 {
     /**
      * Run the migrations.
@@ -15,7 +13,7 @@ class CreateMembersTable extends Migration
      */
     public function up()
     {
-        Schema::create('members', function (Blueprint $table) {
+        Schema::create('people', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->string('email')->unique();
@@ -32,6 +30,6 @@ public function up()
      */
     public function down()
     {
-        Schema::drop('members');
+        Schema::drop('people');
     }
 }