[6.x] Fix PHP 8.4 deprecation warnings for implicit nullable types (#376

)
joelbutcher · Sep 30, 2024 · d1c5cde · d1c5cde
1 parent b09c221
commit d1c5cde
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/Installer/InstallManager.php b/src/Installer/InstallManager.php
@@ -14,7 +14,7 @@
 use JoelButcher\Socialstream\Installer\Drivers\Jetstream\LivewireDriver as JetstreamLivewireDriver;
 
 /**
- * @method Driver driver($driver = null)
+ * @method Driver driver(?string $driver = null)
  */
 class InstallManager extends Manager
 {

diff --git a/src/Providers.php b/src/Providers.php
@@ -152,63 +152,63 @@ public static function hasTwitterOAuth2Support(): bool
     /**
      * Enable the Bitbucket provider.
      */
-    public static function bitbucket(string $label = null): string
+    public static function bitbucket(?string $label = null): string
     {
         return tap(ProviderEnum::Bitbucket->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the Facebook provider.
      */
-    public static function facebook(string $label = null): string
+    public static function facebook(?string $label = null): string
     {
         return tap(ProviderEnum::Facebook->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the GitHub provider.
      */
-    public static function github(string $label = null): string
+    public static function github(?string $label = null): string
     {
         return tap(ProviderEnum::Github->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the GitLab provider.
      */
-    public static function gitlab(string $label = null): string
+    public static function gitlab(?string $label = null): string
     {
         return tap(ProviderEnum::Gitlab->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the Google provider.
      */
-    public static function google(string $label = null): string
+    public static function google(?string $label = null): string
     {
         return tap(ProviderEnum::Google->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the LinkedIn provider.
      */
-    public static function linkedin(string $label = null): string
+    public static function linkedin(?string $label = null): string
     {
         return tap(ProviderEnum::LinkedIn->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the LinkedIn OpenID provider.
      */
-    public static function linkedinOpenId(string $label = null): string
+    public static function linkedinOpenId(?string $label = null): string
     {
         return tap(ProviderEnum::LinkedInOpenId->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the Slack provider.
      */
-    public static function slack(string $label = null): string
+    public static function slack(?string $label = null): string
     {
         return tap(ProviderEnum::Slack->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
@@ -218,28 +218,28 @@ public static function slack(string $label = null): string
      *
      * @deprecated use `twitterOAuth1` instead.
      */
-    public static function twitter(string $label = null): string
+    public static function twitter(?string $label = null): string
     {
         return tap(ProviderEnum::Twitter->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the Twitter OAuth 1.0 provider.
      */
-    public static function twitterOAuth1(string $label = null): string
+    public static function twitterOAuth1(?string $label = null): string
     {
         return tap(ProviderEnum::Twitter->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     /**
      * Enable the Twitter OAuth 2.0 provider.
      */
-    public static function twitterOAuth2(string $label = null): string
+    public static function twitterOAuth2(?string $label = null): string
     {
         return tap(ProviderEnum::TwitterOAuth2->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
-    public static function addLabelFor(ProviderEnum|string $provider, string $label = null): void
+    public static function addLabelFor(ProviderEnum|string $provider, ?string $label = null): void
     {
         if (! $label) {
             return;

diff --git a/src/Socialstream.php b/src/Socialstream.php
@@ -120,7 +120,7 @@ public static function providers(): array
     /**
      * Get a completion redirect path for a specific feature.
      */
-    public static function redirects(string $redirect, $default = null)
+    public static function redirects(string $redirect, mixed $default = null)
     {
         return config('socialstream.redirects.'.$redirect) ?? $default ?? config('socialstream.home');
     }

diff --git a/stubs/breeze/database/factories/UserFactory.php b/stubs/breeze/database/factories/UserFactory.php
@@ -48,7 +48,7 @@ public function unverified(): static
     /**
      * Indicate that the user should have a connected account for the given provider.
      */
-    public function withConnectedAccount(string $provider, callable $callback = null): static
+    public function withConnectedAccount(string $provider, ?callable $callback = null): static
     {
         if (! Providers::enabled($provider)) {
             return $this->state([]);

diff --git a/stubs/filament/database/factories/UserFactory.php b/stubs/filament/database/factories/UserFactory.php
@@ -45,7 +45,7 @@ public function unverified(): static
     /**
      * Indicate that the user should have a connected account for the given provider.
      */
-    public function withConnectedAccount(string $provider, callable $callback = null): static
+    public function withConnectedAccount(string $provider, ?callable $callback = null): static
     {
         if (! Providers::enabled($provider)) {
             return $this->state([]);

diff --git a/stubs/jetstream/database/factories/UserFactory.php b/stubs/jetstream/database/factories/UserFactory.php
@@ -48,7 +48,7 @@ public function unverified(): static
     /**
      * Indicate that the user should have a personal team.
      */
-    public function withPersonalTeam(callable $callback = null): static
+    public function withPersonalTeam(?callable $callback = null): static
     {
         if (! JetstreamFeatures::hasTeamFeatures()) {
             return $this->state([]);
@@ -69,7 +69,7 @@ public function withPersonalTeam(callable $callback = null): static
     /**
      * Indicate that the user should have a connected account for the given provider.
      */
-    public function withConnectedAccount(string $provider, callable $callback = null): static
+    public function withConnectedAccount(string $provider, ?callable $callback = null): static
     {
         if (! Providers::enabled($provider)) {
             return $this->state([]);