More explicit nullable types

Author: nicolas-grekas

.php-cs-fixer.dist.php

@@ -12,6 +12,7 @@
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => true,
         'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
+        'nullable_type_declaration_for_default_null_value' => true,
         'protected_to_private' => false,
     ))
     ->setRiskyAllowed(true)

src/Downloader.php

@@ -52,7 +52,7 @@ class Downloader
     private $enabled = true;
     private $composer;
 
-    public function __construct(Composer $composer, IoInterface $io, $rfs)
+    public function __construct(Composer $composer, IOInterface $io, $rfs)
     {
         if (getenv('SYMFONY_CAFILE')) {
             $this->caFile = getenv('SYMFONY_CAFILE');

tests/Configurator/AddLinesConfiguratorTest.php

@@ -568,7 +568,7 @@ public function getUpdateTests()
         ];
     }
 
-    private function runConfigure(array $config, Composer $composer = null)
+    private function runConfigure(array $config, ?Composer $composer = null)
     {
         $configurator = $this->createConfigurator($composer);
 
@@ -586,7 +586,7 @@ private function runUnconfigure(array $config)
         $configurator->unconfigure($recipe, $config, $lock);
     }
 
-    private function createConfigurator(Composer $composer = null)
+    private function createConfigurator(?Composer $composer = null)
     {
         return new AddLinesConfigurator(
             $composer ?: $this->getMockBuilder(Composer::class)->getMock(),

tests/FlexTest.php

@@ -375,7 +375,7 @@ private function mockPackageEvent(Package $package): PackageEvent
         return $event;
     }
 
-    private function mockConfigurator(Recipe $recipe = null): Configurator
+    private function mockConfigurator(?Recipe $recipe = null): Configurator
     {
         $configurator = $this->getMockBuilder(Configurator::class)->disableOriginalConstructor()->getMock();
 
@@ -406,7 +406,7 @@ private function mockLocker(array $lockData = []): Locker
         return $locker;
     }
 
-    private function mockComposer(Locker $locker, RootPackageInterface $package, Config $config = null): Composer
+    private function mockComposer(Locker $locker, RootPackageInterface $package, ?Config $config = null): Composer
     {
         if (null === $config) {
             $config = $this->getMockBuilder(Config::class)->getMock();
@@ -474,7 +474,7 @@ private function mockFlexCustom(BufferIO $io, Composer $composer, Configurator $
         }, null, Flex::class)->__invoke();
     }
 
-    private function mockFlex(BufferIO $io, RootPackageInterface $package, Recipe $recipe = null, array $recipes = [], array $lockerData = []): Flex
+    private function mockFlex(BufferIO $io, RootPackageInterface $package, ?Recipe $recipe = null, array $recipes = [], array $lockerData = []): Flex
     {
         $composer = $this->mockComposer($this->mockLocker($lockerData), $package);