Merge branch '1.x' into 2.x

* 1.x:
  Keep existing constraints in package.json
  Fix testMemoryLimit on PHP installed using Nix
  Fix recipe history url
  Remove deprecation warnings
  Fix testMemoryLimit on PHP installed using Nix

Author: fabpot

src/Command/RecipesCommand.php

@@ -165,6 +165,10 @@ private function displayPackageInformation(Recipe $recipe)
         $lockBranch = $recipeLock['recipe']['branch'] ?? null;
         $lockVersion = $recipeLock['recipe']['version'] ?? $recipeLock['version'] ?? null;
 
+        if ('master' === $lockBranch && \in_array($lockRepo, ['github.com/symfony/recipes', 'github.com/symfony/recipes-contrib'])) {
+            $lockBranch = 'main';
+        }
+
         $status = '<comment>up to date</comment>';
         if ($recipe->isAuto()) {
             $status = '<comment>auto-generated recipe</comment>';

src/Configurator/DockerComposeConfigurator.php

@@ -315,9 +315,9 @@ private function getContentsAfterApplyingRecipe(string $rootDir, Recipe $recipe,
             return [];
         }
 
-        $files = array_map(function ($file) use ($rootDir) {
+        $files = array_filter(array_map(function ($file) use ($rootDir) {
             return $this->findDockerComposeFile($rootDir, $file);
-        }, array_keys($config));
+        }, array_keys($config)));
 
         $originalContents = [];
         foreach ($files as $file) {

src/PackageJsonSynchronizer.php

@@ -13,6 +13,7 @@
 
 use Composer\Json\JsonFile;
 use Composer\Json\JsonManipulator;
+use Composer\Semver\VersionParser;
 use Seld\JsonLint\ParsingException;
 
 /**
@@ -23,11 +24,13 @@ class PackageJsonSynchronizer
 {
     private $rootDir;
     private $vendorDir;
+    private $versionParser;
 
     public function __construct(string $rootDir, string $vendorDir = 'vendor')
     {
         $this->rootDir = $rootDir;
         $this->vendorDir = $vendorDir;
+        $this->versionParser = new VersionParser();
     }
 
     public function shouldSynchronize(): bool
@@ -136,8 +139,10 @@ private function registerDependencies(array $flexDependencies): bool
                 $content['devDependencies'][$dependency] = $constraint;
                 $didChangePackageJson = true;
             } elseif ($constraint !== $content[$parentNode][$dependency]) {
-                $content[$parentNode][$dependency] = $constraint;
-                $didChangePackageJson = true;
+                if ($this->shouldUpdateConstraint($content[$parentNode][$dependency], $constraint)) {
+                    $content[$parentNode][$dependency] = $constraint;
+                    $didChangePackageJson = true;
+                }
             }
         }
 
@@ -163,6 +168,18 @@ private function registerDependencies(array $flexDependencies): bool
         return $didChangePackageJson;
     }
 
+    private function shouldUpdateConstraint(string $existingConstraint, string $constraint)
+    {
+        try {
+            $existingConstraint = $this->versionParser->parseConstraints($existingConstraint);
+            $constraint = $this->versionParser->parseConstraints($constraint);
+
+            return !$existingConstraint->matches($constraint);
+        } catch (\UnexpectedValueException $e) {
+            return true;
+        }
+    }
+
     private function registerWebpackResources(array $phpPackages)
     {
         if (!file_exists($controllersJsonPath = $this->rootDir.'/assets/controllers.json')) {

tests/Fixtures/packageJson/stricter_constraints_package.json

@@ -0,0 +1,11 @@
+{
+   "name": "symfony/fixture",
+   "devDependencies": {
+      "@hotcookies": "^2",
+      "@hotdogs": "^1.9",
+      "@symfony/existing-package": "file:vendor/symfony/existing-package/Resources/assets"
+   },
+   "browserslist": [
+      "defaults"
+   ]
+}

tests/PackageJsonSynchronizerTest.php

@@ -245,4 +245,34 @@ public function testExistingElevatedPackage()
             json_decode(file_get_contents($this->tempDir.'/package.json'), true)
         );
     }
+
+    public function testStricterConstraintsAreKeptNonMatchingAreReplaced()
+    {
+        (new Filesystem())->copy($this->tempDir.'/stricter_constraints_package.json', $this->tempDir.'/package.json', true);
+
+        $this->synchronizer->synchronize([
+            [
+                'name' => 'symfony/existing-package',
+                'keywords' => ['symfony-ux'],
+            ],
+        ]);
+
+        // Should keep existing constraints when stricter than packages ones
+        $this->assertSame(
+            [
+                'name' => 'symfony/fixture',
+                'devDependencies' => [
+                    // this satisfies the constraint, so it's kept
+                    '@hotcookies' => '^2',
+                    // this was too low, so it's replaced
+                    '@hotdogs' => '^2',
+                    '@symfony/existing-package' => 'file:vendor/symfony/existing-package/Resources/assets',
+                ],
+                'browserslist' => [
+                    'defaults',
+                ],
+            ],
+            json_decode(file_get_contents($this->tempDir.'/package.json'), true)
+        );
+    }
 }

tests/ScriptExecutorTest.php

@@ -39,7 +39,11 @@ public function testMemoryLimit(): void
 
         $arguments = $phpFinder->findArguments();
         $ini = php_ini_loaded_file();
-        $arguments[] = "--php-ini={$ini}";
+
+        if (false !== $ini) {
+            $arguments[] = "--php-ini={$ini}";
+        }
+
         $arguments[] = "-d memory_limit={$memoryLimit}";
 
         $phpArgs = implode(' ', array_map([ProcessExecutor::class, 'escape'], $arguments));