[8.x] Fixes for PHP 8.1 (#37101)

* fix PHP 8.1 deprecations (broadcasting) * fix PHP 8.1 deprecations (cache) * remove returns after never-return method call * fix PHP 8.1 deprecations (bus) * fix PHP 8.1 deprecations (database) * fix PHP 8.1 deprecations (validation) * use strict comparison * fix PHP 8.1 deprecations (mail) * fix PHP 8.1 deprecations (routing)

Author: jrmajor

src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php

@@ -20,16 +20,16 @@ class RedisBroadcaster extends Broadcaster
  /**
  * The Redis connection to use for broadcasting.
  *
- * @var string
+ * @var ?string
  */
- protected $connection;
+ protected $connection = null;
 
  /**
  * The Redis key prefix.
  *
  * @var string
  */
- protected $prefix;
+ protected $prefix = '';
 
  /**
  * Create a new broadcaster instance.

src/Illuminate/Cache/Console/ClearCommand.php

@@ -116,7 +116,7 @@ protected function cache()
  */
  protected function tags()
  {
- return array_filter(explode(',', $this->option('tags')));
+ return array_filter(explode(',', $this->option('tags') ?? ''));
  }
 
  /**

src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php

@@ -36,14 +36,10 @@ public function setUpRedis()
 
  if (! extension_loaded('redis')) {
  $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
-
- return;
  }
 
  if (static::$connectionFailedOnceWithDefaultsSkip) {
  $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
-
- return;
  }
 
  foreach ($this->redisDriverProvider() as $driver) {

src/Illuminate/Mail/MailManager.php

@@ -168,7 +168,7 @@ public function createTransport(array $config)
  return call_user_func($this->customCreators[$transport], $config);
  }
 
- if (trim($transport) === '' || ! method_exists($this, $method = 'create'.ucfirst($transport).'Transport')) {
+ if (trim($transport ?? '') === '' || ! method_exists($this, $method = 'create'.ucfirst($transport).'Transport')) {
  throw new InvalidArgumentException("Unsupported mail transport [{$transport}].");
  }
 

src/Illuminate/Routing/AbstractRouteCollection.php

@@ -199,8 +199,11 @@ protected function addToSymfonyRoutesCollection(SymfonyRouteCollection $symfonyR
  {
  $name = $route->getName();
 
- if (Str::endsWith($name, '.') &&
- ! is_null($symfonyRoutes->get($name))) {
+ if (
+ ! is_null($name)
+ && Str::endsWith($name, '.')
+ && ! is_null($symfonyRoutes->get($name))
+ ) {
  $name = null;
  }
 

src/Illuminate/Validation/Concerns/FormatsMessages.php

@@ -54,7 +54,7 @@ protected function getMessage($attribute, $rule)
  // messages out of the translator service for this validation rule.
  $key = "validation.{$lowerRule}";
 
- if ($key != ($value = $this->translator->get($key))) {
+ if ($key !== ($value = $this->translator->get($key))) {
  return $value;
  }
 

src/Illuminate/Validation/Concerns/ReplacesAttributes.php

@@ -115,7 +115,7 @@ protected function replaceMax($message, $attribute, $rule, $parameters)
  */
  protected function replaceMultipleOf($message, $attribute, $rule, $parameters)
  {
- return str_replace(':value', $parameters[0], $message);
+ return str_replace(':value', $parameters[0] ?? '', $message);
  }
 
  /**

src/Illuminate/Validation/ValidationRuleParser.php

@@ -214,7 +214,7 @@ public static function parse($rule)
  */
  protected static function parseArrayRule(array $rule)
  {
- return [Str::studly(trim(Arr::get($rule, 0))), array_slice($rule, 1)];
+ return [Str::studly(trim(Arr::get($rule, 0, ''))), array_slice($rule, 1)];
  }
 
  /**

tests/Bus/BusBatchTest.php

@@ -377,7 +377,7 @@ public function test_options_unserialize_on_postgres($serialize, $options)
  'failed_jobs' => '',
  'failed_job_ids' => '[]',
  'options' => $serialize,
- 'created_at' => null,
+ 'created_at' => now()->timestamp,
  'cancelled_at' => null,
  'finished_at' => null,
  ]);

tests/Database/DatabaseMigrationMakeCommandTest.php

@@ -27,7 +27,9 @@ public function testBasicCreateDumpsAutoload()
  $app = new Application;
  $app->useDatabasePath(__DIR__);
  $command->setLaravel($app);
- $creator->shouldReceive('create')->once()->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true)
+ ->andReturn(__DIR__.'/migrations/2021_04_23_110457_create_foo.php');
  $composer->shouldReceive('dumpAutoloads')->once();
 
  $this->runCommand($command, ['name' => 'create_foo']);
@@ -42,7 +44,9 @@ public function testBasicCreateGivesCreatorProperArguments()
  $app = new Application;
  $app->useDatabasePath(__DIR__);
  $command->setLaravel($app);
- $creator->shouldReceive('create')->once()->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true)
+ ->andReturn(__DIR__.'/migrations/2021_04_23_110457_create_foo.php');
 
  $this->runCommand($command, ['name' => 'create_foo']);
  }
@@ -56,7 +60,9 @@ public function testBasicCreateGivesCreatorProperArgumentsWhenNameIsStudlyCase()
  $app = new Application;
  $app->useDatabasePath(__DIR__);
  $command->setLaravel($app);
- $creator->shouldReceive('create')->once()->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'foo', true)
+ ->andReturn(__DIR__.'/migrations/2021_04_23_110457_create_foo.php');
 
  $this->runCommand($command, ['name' => 'CreateFoo']);
  }
@@ -70,7 +76,9 @@ public function testBasicCreateGivesCreatorProperArgumentsWhenTableIsSet()
  $app = new Application;
  $app->useDatabasePath(__DIR__);
  $command->setLaravel($app);
- $creator->shouldReceive('create')->once()->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'users', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_foo', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'users', true)
+ ->andReturn(__DIR__.'/migrations/2021_04_23_110457_create_foo.php');
 
  $this->runCommand($command, ['name' => 'create_foo', '--create' => 'users']);
  }
@@ -84,7 +92,9 @@ public function testBasicCreateGivesCreatorProperArgumentsWhenCreateTablePattern
  $app = new Application;
  $app->useDatabasePath(__DIR__);
  $command->setLaravel($app);
- $creator->shouldReceive('create')->once()->with('create_users_table', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'users', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_users_table', __DIR__.DIRECTORY_SEPARATOR.'migrations', 'users', true)
+ ->andReturn(__DIR__.'/migrations/2021_04_23_110457_create_users_table.php');
 
  $this->runCommand($command, ['name' => 'create_users_table']);
  }
@@ -98,7 +108,9 @@ public function testCanSpecifyPathToCreateMigrationsIn()
  $app = new Application;
  $command->setLaravel($app);
  $app->setBasePath('/home/laravel');
- $creator->shouldReceive('create')->once()->with('create_foo', '/home/laravel/vendor/laravel-package/migrations', 'users', true);
+ $creator->shouldReceive('create')->once()
+ ->with('create_foo', '/home/laravel/vendor/laravel-package/migrations', 'users', true)
+ ->andReturn('/home/laravel/vendor/laravel-package/migrations/2021_04_23_110457_create_foo.php');
  $this->runCommand($command, ['name' => 'create_foo', '--path' => 'vendor/laravel-package/migrations', '--create' => 'users']);
  }