[4.x] Laravel Pint: Use the default for nullable_type_declaration_for_default_null_value

pint.json

@@ -6,9 +6,6 @@
                 "method": "one"
             }
         },
-        "nullable_type_declaration_for_default_null_value": {
-            "use_nullable_type_declaration": false
-        },
         "psr_autoloading": true
     }
 }

src/Actions/DuplicateEntry.php

@@ -55,7 +55,7 @@ public function run($items, $values)
             ->each(fn ($original) => $this->duplicateEntry($original));
     }
 
-    private function duplicateEntry(Entry $original, string $origin = null)
+    private function duplicateEntry(Entry $original, ?string $origin = null)
     {
         $originalParent = $this->getEntryParentFromStructure($original);
         [$title, $slug] = $this->generateTitleAndSlug($original);

src/Assets/Asset.php

@@ -886,7 +886,7 @@ public function reupload(ReplacementFile $file)
      *
      * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
-    public function download(string $name = null, array $headers = [])
+    public function download(?string $name = null, array $headers = [])
     {
         return $this->disk()->filesystem()->download($this->path(), $name, $headers);
     }

src/Assets/FileUploader.php

@@ -15,7 +15,7 @@ public function __construct($container)
         $this->container = $container ? AssetContainer::find($container) : null;
     }
 
-    public static function container(string $container = null)
+    public static function container(?string $container = null)
     {
         return new static($container);
     }

src/Auth/Eloquent/RoleRepository.php

@@ -7,7 +7,7 @@
 
 class RoleRepository extends BaseRepository
 {
-    public function make(string $handle = null): RoleContract
+    public function make(?string $handle = null): RoleContract
     {
         return (new Role)->handle($handle);
     }

src/Auth/Eloquent/User.php

@@ -20,7 +20,7 @@ class User extends BaseUser
     protected $roles;
     protected $groups;
 
-    public function model(Model $model = null)
+    public function model(?Model $model = null)
     {
         if (is_null($model)) {
             return $this->model;

src/Auth/File/Role.php

@@ -24,7 +24,7 @@ public function __construct()
         $this->permissions = collect();
     }
 
-    public function title(string $title = null)
+    public function title(?string $title = null)
     {
         if (func_num_args() === 0) {
             return $this->title;
@@ -40,7 +40,7 @@ public function id(): string
         return $this->handle();
     }
 
-    public function handle(string $handle = null)
+    public function handle(?string $handle = null)
     {
         if (func_num_args() === 0) {
             return $this->handle;

src/Auth/File/RoleRepository.php

@@ -7,7 +7,7 @@
 
 class RoleRepository extends BaseRepository
 {
-    public function make(string $handle = null): RoleContract
+    public function make(?string $handle = null): RoleContract
     {
         return (new Role)->handle($handle);
     }

src/Auth/Permission.php

@@ -18,7 +18,7 @@ class Permission
     protected $description;
     protected $group;
 
-    public function value(string $value = null)
+    public function value(?string $value = null)
     {
         if (func_num_args() > 0) {
             $this->value = $value;
@@ -39,7 +39,7 @@ public function originalLabel()
         return $this->label;
     }
 
-    public function label(string $label = null)
+    public function label(?string $label = null)
     {
         if (func_num_args() > 0) {
             $this->label = $label;
@@ -52,17 +52,17 @@ public function label(string $label = null)
         return __($label, [$this->placeholder => $this->placeholderLabel]);
     }
 
-    public function placeholder(string $placeholder = null)
+    public function placeholder(?string $placeholder = null)
     {
         return $this->fluentlyGetOrSet('placeholder')->args(func_get_args());
     }
 
-    public function placeholderLabel(string $label = null)
+    public function placeholderLabel(?string $label = null)
     {
         return $this->fluentlyGetOrSet('placeholderLabel')->args(func_get_args());
     }
 
-    public function placeholderValue(string $placeholderValue = null)
+    public function placeholderValue(?string $placeholderValue = null)
     {
         return $this->fluentlyGetOrSet('placeholderValue')->args(func_get_args());
     }
@@ -103,7 +103,7 @@ public function permissions()
         })->values();
     }
 
-    public function children(array $children = null)
+    public function children(?array $children = null)
     {
         return $this
             ->fluentlyGetOrSet('children')
@@ -156,7 +156,7 @@ public function toTree()
         })->all();
     }
 
-    public function group(string $group = null)
+    public function group(?string $group = null)
     {
         return $this->fluentlyGetOrSet('group')->args(func_get_args());
     }

src/Auth/UserGroup.php

@@ -29,7 +29,7 @@ public function __construct()
         $this->data = collect();
     }
 
-    public function title(string $title = null)
+    public function title(?string $title = null)
     {
         if (func_num_args() === 0) {
             return $this->title;
@@ -45,7 +45,7 @@ public function id(): string
         return $this->handle();
     }
 
-    public function handle(string $handle = null)
+    public function handle(?string $handle = null)
     {
         if (is_null($handle)) {
             return $this->handle;

src/CP/Utilities/Utility.php

@@ -99,7 +99,7 @@ public function url()
         return cp_route('utilities.index').'/'.$this->slug();
     }
 
-    public function routes(Closure $routes = null)
+    public function routes(?Closure $routes = null)
     {
         return $this->fluentlyGetOrSet('routes')->args(func_get_args());
     }

src/Console/Processes/Composer.php

@@ -109,7 +109,7 @@ public function installedPath(string $package)
      *
      * @param  mixed  $extraParams
      */
-    public function require(string $package, string $version = null, ...$extraParams)
+    public function require(string $package, ?string $version = null, ...$extraParams)
     {
         if ($version) {
             $parts[] = $version;
@@ -125,7 +125,7 @@ public function require(string $package, string $version = null, ...$extraParams
     /**
      * Require a dev package.
      */
-    public function requireDev(string $package, string $version = null, ...$extraParams)
+    public function requireDev(string $package, ?string $version = null, ...$extraParams)
     {
         $this->require($package, $version, '--dev', ...$extraParams);
     }

src/Contracts/Assets/Asset.php

@@ -76,7 +76,7 @@ public function upload(UploadedFile $file);
      *
      * @return \Symfony\Component\HttpFoundation\StreamedResponse
      */
-    public function download(string $name = null, array $headers = []);
+    public function download(?string $name = null, array $headers = []);
 
     /**
      * Get the asset file contents.

src/Contracts/Assets/AssetContainerRepository.php

@@ -12,5 +12,5 @@ public function find($id): ?AssetContainer;
 
     public function findByHandle(string $handle): ?AssetContainer;
 
-    public function make(string $handle = null): AssetContainer;
+    public function make(?string $handle = null): AssetContainer;
 }

src/Contracts/Auth/Role.php

@@ -6,9 +6,9 @@ interface Role
 {
     public function id(): string;
 
-    public function title(string $title = null);
+    public function title(?string $title = null);
 
-    public function handle(string $handle = null);
+    public function handle(?string $handle = null);
 
     public function permissions($permissions = null);
 

src/Contracts/Auth/RoleRepository.php

@@ -12,5 +12,5 @@ public function find(string $id): ?Role;
 
     public function exists(string $id): bool;
 
-    public function make(string $handle = null): Role;
+    public function make(?string $handle = null): Role;
 }

src/Contracts/Auth/UserGroup.php

@@ -6,9 +6,9 @@ interface UserGroup
 {
     public function id(): string;
 
-    public function title(string $title = null);
+    public function title(?string $title = null);
 
-    public function handle(string $slug = null);
+    public function handle(?string $slug = null);
 
     public function users();
 

src/Contracts/Entries/CollectionRepository.php

@@ -14,7 +14,7 @@ public function findByHandle($handle): ?Collection;
 
     public function findByMount($mount): ?Collection;
 
-    public function make(string $handle = null): Collection;
+    public function make(?string $handle = null): Collection;
 
     public function handles(): IlluminateCollection;
 

src/Contracts/Structures/NavigationRepository.php

@@ -14,5 +14,5 @@ public function findByHandle($handle): ?Nav;
 
     public function save(Nav $nav);
 
-    public function make(string $handle = null): Nav;
+    public function make(?string $handle = null): Nav;
 }

src/Contracts/Taxonomies/TaxonomyRepository.php

@@ -14,7 +14,7 @@ public function findByHandle($handle): ?Taxonomy;
 
     public function findByUri(string $uri): ?Taxonomy;
 
-    public function make(string $handle = null): Taxonomy;
+    public function make(?string $handle = null): Taxonomy;
 
     public function handles(): Collection;
 

src/Contracts/Taxonomies/TermRepository.php

@@ -14,7 +14,7 @@ public function find($id);
 
     public function findByUri(string $uri);
 
-    public function make(string $slug = null);
+    public function make(?string $slug = null);
 
     public function query();
 

src/Entries/Collection.php

@@ -678,7 +678,7 @@ public function structure($structure = null)
             ->args(func_get_args());
     }
 
-    public function structureContents(array $contents = null)
+    public function structureContents(?array $contents = null)
     {
         return $this
             ->fluentlyGetOrSet('structureContents')

src/Fields/FieldsetRepository.php

@@ -175,7 +175,7 @@ public function addNamespace(string $namespace, string $directory): void
         $this->hints[$namespace] = $directory;
     }
 
-    protected function getFieldsetsByDirectory(string $directory, string $namespace = null): Collection
+    protected function getFieldsetsByDirectory(string $directory, ?string $namespace = null): Collection
     {
         return File::withAbsolutePaths()
             ->getFilesByTypeRecursively($directory, 'yaml')

src/Fields/Fieldtype.php

@@ -309,7 +309,7 @@ public function view()
             : 'statamic::forms.fields.default';
     }
 
-    public function config(string $key = null, $fallback = null)
+    public function config(?string $key = null, $fallback = null)
     {
         if (! $this->field) {
             return $fallback;

src/Fieldtypes/Date.php

@@ -182,7 +182,7 @@ private function splitDateTimeForPreProcessSingle(Carbon $carbon)
         ];
     }
 
-    private function splitDateTimeForPreProcessRange(array $range = null)
+    private function splitDateTimeForPreProcessRange(?array $range = null)
     {
         return ['date' => $range, 'time' => null];
     }

src/GraphQL/Queries/Query.php

@@ -21,7 +21,7 @@ public static function auth($closure)
         static::$auth = $closure;
     }
 
-    public function authorize($root, array $args, $ctx, ResolveInfo $resolveInfo = null, Closure $getSelectFields = null): bool
+    public function authorize($root, array $args, $ctx, ?ResolveInfo $resolveInfo = null, ?Closure $getSelectFields = null): bool
     {
         if (static::$auth) {
             return call_user_func_array(static::$auth, [$root, $args, $ctx, $resolveInfo, $getSelectFields]);

src/GraphQL/Types/ArrayType.php

@@ -21,7 +21,7 @@ public function parseValue($value)
         return $value;
     }
 
-    public function parseLiteral(Node $valueNode, array $variables = null)
+    public function parseLiteral(Node $valueNode, ?array $variables = null)
     {
         return $valueNode->value;
     }

src/Imaging/GuzzleAdapter.php

@@ -40,7 +40,7 @@ class GuzzleAdapter implements FilesystemAdapter
      * @param  string  $base  The base URL.
      * @param  \GuzzleHttp\ClientInterface  $client  An optional Guzzle client.
      */
-    public function __construct($base, ClientInterface $client = null)
+    public function __construct($base, ?ClientInterface $client = null)
     {
         $this->base = rtrim($base, '/').'/';
         $this->client = $client ?: new Client();

src/Imaging/ResponseFactory.php

@@ -20,7 +20,7 @@ class ResponseFactory implements ResponseFactoryInterface
      *
      * @param  Request|null  $request  Request object to check "is not modified".
      */
-    public function __construct(Request $request = null)
+    public function __construct(?Request $request = null)
     {
         $this->request = $request;
     }

src/Preferences/Preference.php

@@ -8,7 +8,7 @@ class Preference
     protected $field;
     protected $tab = 'general';
 
-    public function handle(string $handle = null)
+    public function handle(?string $handle = null)
     {
         if (func_num_args() === 0) {
             return $this->handle;
@@ -19,7 +19,7 @@ public function handle(string $handle = null)
         return $this;
     }
 
-    public function field(array $field = null)
+    public function field(?array $field = null)
     {
         if (func_num_args() === 0) {
             return $this->field;
@@ -30,7 +30,7 @@ public function field(array $field = null)
         return $this;
     }
 
-    public function tab(string $tab = null)
+    public function tab(?string $tab = null)
     {
         if (func_num_args() === 0) {
             return $this->tab;

src/Search/Index.php

@@ -21,7 +21,7 @@ abstract protected function insertDocuments(Documents $documents);
 
     abstract protected function deleteIndex();
 
-    public function __construct($name, array $config, string $locale = null)
+    public function __construct($name, array $config, ?string $locale = null)
     {
         $this->name = $locale ? $name.'_'.$locale : $name;
         $this->config = $config;

src/Search/Result.php

@@ -61,7 +61,7 @@ public function getReference(): string
         return $this->searchable->getSearchReference();
     }
 
-    public function setScore(int $score = null): self
+    public function setScore(?int $score = null): self
     {
         $this->score = $score;
 

src/Search/Searchables/Providers.php

@@ -30,7 +30,7 @@ public function providers(): Collection
         });
     }
 
-    public function make(string $key, Index $index = null, array $keys = null)
+    public function make(string $key, ?Index $index = null, ?array $keys = null)
     {
         if (! $provider = $this->providers()->get($key)) {
             throw new \Exception('Unknown searchable ['.$key.']');

src/Stache/Repositories/AssetContainerRepository.php

@@ -33,7 +33,7 @@ public function findByHandle(string $handle): ?AssetContainer
         return $this->store->getItem($handle);
     }
 
-    public function make(string $handle = null): AssetContainer
+    public function make(?string $handle = null): AssetContainer
     {
         return app(AssetContainer::class)->handle($handle);
     }