summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Rowlands2017-08-12 18:40:17 +1000
committerLee Rowlands2017-08-12 18:41:40 +1000
commit89abb24c88936f5223782de1267fab50007edc26 (patch)
treed69265a19753b8434803294e71c1fbca097eed3c
parent25ece26767dea951e5c0afcc95c91e183cdf664e (diff)
Issue #2887000 by cilefen, Mile23, mpdonadio, Eric_A: composer.json does not constrain Symfony components to minor and patch versions that are compatible with Drupal
(cherry picked from commit 47028f4ded4db9c0fe84a31bc4605f6feaca566a)
-rw-r--r--core/composer.json28
-rw-r--r--core/tests/Drupal/Tests/ComposerIntegrationTest.php5
2 files changed, 19 insertions, 14 deletions
diff --git a/core/composer.json b/core/composer.json
index 0d10300..96fbe58 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -5,19 +5,19 @@
"license": "GPL-2.0+",
"require": {
"php": ">=5.5.9",
- "symfony/class-loader": "^3.2",
- "symfony/console": "^3.2",
- "symfony/dependency-injection": "^3.2",
- "symfony/event-dispatcher": "^3.2",
- "symfony/http-foundation": "^3.2",
- "symfony/http-kernel": "^3.2",
- "symfony/routing": "^3.2",
- "symfony/serializer": "^3.2",
- "symfony/translation": "^3.2",
- "symfony/validator": "^3.2",
- "symfony/process": "^3.2",
+ "symfony/class-loader": "~3.2.8",
+ "symfony/console": "~3.2.8",
+ "symfony/dependency-injection": "~3.2.8",
+ "symfony/event-dispatcher": "~3.2.8",
+ "symfony/http-foundation": "~3.2.8",
+ "symfony/http-kernel": "~3.2.8",
+ "symfony/routing": "~3.2.8",
+ "symfony/serializer": "~3.2.8",
+ "symfony/translation": "~3.2.8",
+ "symfony/validator": "~3.2.8",
+ "symfony/process": "~3.2.8",
"symfony/polyfill-iconv": "^1.0",
- "symfony/yaml": "^3.2",
+ "symfony/yaml": "~3.2.8",
"twig/twig": "^1.23.1",
"doctrine/common": "^2.5",
"doctrine/annotations": "^1.2",
@@ -45,8 +45,8 @@
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"mikey179/vfsStream": "^1.2",
"phpunit/phpunit": ">=4.8.35 <5",
- "symfony/css-selector": "^3.2",
- "symfony/phpunit-bridge": "^3.2"
+ "symfony/css-selector": "~3.2.8",
+ "symfony/phpunit-bridge": "~3.2.8"
},
"replace": {
"drupal/action": "self.version",
diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index 5619b84..511fd52 100644
--- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -104,6 +104,11 @@ class ComposerIntegrationTest extends UnitTestCase {
}
foreach ($composer_keys as $composer_key) {
foreach ($content[$composer_key] as $dependency => $version) {
+ // We allow tildes if the dependency is a Symfony component.
+ // @see https://www.drupal.org/node/2887000
+ if (strpos($dependency, 'symfony/') === 0) {
+ continue;
+ }
$this->assertFalse(strpos($version, '~'), "Dependency $dependency in $path contains a tilde, use a caret.");
}
}