Merge branch '1.x' into 2.x

* 1.x:
  More explicit nullable types
  Make implicit nullable types explicit

.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/Command/UpdateRecipesCommand.php

@@ -262,7 +262,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function getRecipe(PackageInterface $package, string $recipeRef = null, string $recipeVersion = null): ?Recipe
+    private function getRecipe(PackageInterface $package, ?string $recipeRef = null, ?string $recipeVersion = null): ?Recipe
     {
         $operation = new InformationOperation($package);
         if (null !== $recipeRef) {

src/Configurator/EnvConfigurator.php

@@ -177,7 +177,7 @@ private function unconfigurePhpUnit(Recipe $recipe, $vars)
      * If $originalValue is passed, and the value contains an expression.
      * the $originalValue is used.
      */
-    private function evaluateValue($value, string $originalValue = null)
+    private function evaluateValue($value, ?string $originalValue = null)
     {
         if ('%generate(secret)%' === $value) {
             if (null !== $originalValue) {

src/Downloader.php

@@ -51,7 +51,11 @@ class Downloader
     private $enabled = true;
     private $composer;
 
+<<<<<<< HEAD
     public function __construct(Composer $composer, IoInterface $io, HttpDownloader $rfs)
+=======
+    public function __construct(Composer $composer, IOInterface $io, $rfs)
+>>>>>>> 1.x
     {
         if (getenv('SYMFONY_CAFILE')) {
             $this->caFile = getenv('SYMFONY_CAFILE');

src/Flex.php

@@ -486,7 +486,7 @@ function ($value) {
         $this->finish($rootDir, $originalComposerJsonHash);
     }
 
-    public function finish(string $rootDir, string $originalComposerJsonHash = null): void
+    public function finish(string $rootDir, ?string $originalComposerJsonHash = null): void
     {
         $this->synchronizePackageJson($rootDir);
         $this->lock->write();
@@ -718,7 +718,7 @@ private function formatOrigin(Recipe $recipe): string
         return sprintf('<info>%s</> (<comment>>=%s</>): From %s', $matches[1], $matches[2], 'auto-generated recipe' === $matches[3] ? '<comment>'.$matches[3].'</>' : $matches[3]);
     }
 
-    private function shouldRecordOperation(OperationInterface $operation, bool $isDevMode, Composer $composer = null): bool
+    private function shouldRecordOperation(OperationInterface $operation, bool $isDevMode, ?Composer $composer = null): bool
     {
         if ($this->dryRun || $this->reinstall) {
             return false;

src/Options.php

@@ -23,7 +23,7 @@ class Options
     private $writtenFiles = [];
     private $io;
 
-    public function __construct(array $options = [], IOInterface $io = null)
+    public function __construct(array $options = [], ?IOInterface $io = null)
     {
         $this->options = $options;
         $this->io = $io;

src/ScriptExecutor.php

@@ -30,7 +30,7 @@ class ScriptExecutor
     private $options;
     private $executor;
 
-    public function __construct(Composer $composer, IOInterface $io, Options $options, ProcessExecutor $executor = null)
+    public function __construct(Composer $composer, IOInterface $io, Options $options, ?ProcessExecutor $executor = null)
     {
         $this->composer = $composer;
         $this->io = $io;

src/Unpacker.php

@@ -40,7 +40,7 @@ public function __construct(Composer $composer, PackageResolver $resolver, bool
         $this->versionParser = new VersionParser();
     }
 
-    public function unpack(Operation $op, Result $result = null, &$links = [], bool $devRequire = false): Result
+    public function unpack(Operation $op, ?Result $result = null, &$links = [], bool $devRequire = false): Result
     {
         if (null === $result) {
             $result = new Result();

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);