Commit d30e4429 authored by catch's avatar catch
Browse files

task: #3612448 Widen constraints in core-recommended for 11.3.x and 10.6.x 

By: catch
By: longwave
By: godotislate
By: quietone
By: xjm
parent 56ced95a

composer/Generator/Builder/DrupalCoreRecommendedBuilder.php

+17 −2
Original line number Diff line number Diff line
@@ -31,13 +31,28 @@ public function getPackage() { 


    // Make a list of packages we do not want to put in the 'require' section.

    $remove_list = [

      'drupal/core',

      'wikimedia/composer-merge-plugin',

      'composer/installers',

      'drupal/core',

      // Guzzle regularly releases security fixes in only minor releases.

      'guzzlehttp/guzzle',

      'guzzlehttp/promises',

      'guzzlehttp/psr7',

      // This package contains no code other than interfaces, so allow sites

      // to use any compatible version without needing to switch off of

      // drupal/core-recommended.

      'psr/http-message',

      // Symfony polyfills are transitive dependency that almost exclusively

      // release security releases as minor releases.

      'symfony/polyfill-ctype',

      'symfony/polyfill-iconv',

      'symfony/polyfill-intl-grapheme',

      'symfony/polyfill-intl-idn',

      'symfony/polyfill-intl-normalizer',

      'symfony/polyfill-mbstring',

      'symfony/polyfill-php83',

      // Twig regularly releases security fixes in only minor releases.

      'twig/twig',

      'wikimedia/composer-merge-plugin',

    ];



    // Copy the 'packages' section from the Composer lock into our 'require'

composer/Metapackage/CoreRecommended/composer.json

+1 −12
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
        "doctrine/deprecations": "~1.1.5",

        "doctrine/lexer": "~2.1.1",

        "egulias/email-validator": "~4.0.4",

        "guzzlehttp/guzzle": "~7.15.1",

        "guzzlehttp/promises": "~2.5.1",

        "guzzlehttp/psr7": "~2.13.0",

        "masterminds/html5": "~2.10.0",

        "mck89/peast": "~v1.17.4",

        "pear/archive_tar": "~1.6.0",
@@ -41,13 +38,6 @@ 
        "symfony/http-kernel": "~v6.4.40",

        "symfony/mailer": "~v6.4.40",

        "symfony/mime": "~v6.4.40",

        "symfony/polyfill-ctype": "~v1.37.0",

        "symfony/polyfill-iconv": "~v1.37.0",

        "symfony/polyfill-intl-grapheme": "~v1.37.0",

        "symfony/polyfill-intl-idn": "~v1.38.1",

        "symfony/polyfill-intl-normalizer": "~v1.37.0",

        "symfony/polyfill-mbstring": "~v1.37.0",

        "symfony/polyfill-php83": "~v1.37.0",

        "symfony/process": "~v6.4.39",

        "symfony/psr-http-message-bridge": "~v6.4.32",

        "symfony/routing": "~v6.4.41",
@@ -58,7 +48,6 @@ 
        "symfony/validator": "~v6.4.37",

        "symfony/var-dumper": "~v6.4.36",

        "symfony/var-exporter": "~v6.4.37",

        "symfony/yaml": "~v6.4.40",

        "twig/twig": "~v3.27.0"

        "symfony/yaml": "~v6.4.40"

    }

}

core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ public static function builderTestData() { 
          'require' =>

          [

            'drupal/core' => Composer::drupalVersionBranch(),

            'symfony/polyfill-ctype' => '~v1.12.0',

            'symfony/yaml' => '~v3.4.32',

          ],

          'conflict' =>