Skip to content

Commit e65cdb6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.0' into 5.1
* 5.0: [PhpUnitBridge] fix leftover [PhpUnitBridge] fix installing under PHP >= 8 Use ">=" for the "php" requirement bump icu 67.1
2 parents 0fd5b95 + b429b15 commit e65cdb6

File tree

407 files changed

+3493
-817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+3493
-817
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"ext-xml": "*",
2121
"doctrine/event-manager": "~1.0",
2222
"doctrine/persistence": "^1.3",

‎src/Symfony/Bridge/Doctrine/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"doctrine/event-manager": "~1.0",
2121
"doctrine/persistence": "^1.3",
2222
"symfony/polyfill-ctype": "~1.8",

‎src/Symfony/Bridge/Monolog/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"monolog/monolog": "^1.25.1|^2",
2121
"symfony/service-contracts": "^1.1|^2",
2222
"symfony/http-kernel": "^4.4|^5.0"

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

+28-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,31 @@
163163
rename("$PHPUNIT_VERSION_DIR", "$PHPUNIT_VERSION_DIR.old");
164164
passthru(sprintf('\\' === DIRECTORY_SEPARATOR ? 'rmdir /S /Q %s' : 'rm -rf %s', "$PHPUNIT_VERSION_DIR.old"));
165165
}
166-
$passthruOrFail("$COMPOSER create-project --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi phpunit/phpunit $PHPUNIT_VERSION_DIR \"$PHPUNIT_VERSION.*\"");
166+
167+
$info = [];
168+
foreach (explode("\n", `$COMPOSER info -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
169+
$line = rtrim($line);
170+
171+
if (!$info && preg_match('/^versions +: /', $line)) {
172+
$info['versions'] = explode(', ', ltrim(substr($line, 9), ': '));
173+
} elseif (isset($info['requires'])) {
174+
if ('' === $line) {
175+
break;
176+
}
177+
178+
$line = explode(' ', $line, 2);
179+
$info['requires'][$line[0]] = $line[1];
180+
} elseif ($info && 'requires' === $line) {
181+
$info['requires'] = [];
182+
}
183+
}
184+
185+
if (1 === \count($info['versions'])) {
186+
$passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi -s dev phpunit/phpunit $PHPUNIT_VERSION_DIR \"$PHPUNIT_VERSION.*\"");
187+
} else {
188+
$passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi phpunit/phpunit $PHPUNIT_VERSION_DIR \"$PHPUNIT_VERSION.*\"");
189+
}
190+
167191
@copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
168192
chdir("$PHPUNIT_VERSION_DIR");
169193
if ($SYMFONY_PHPUNIT_REMOVE) {
@@ -173,6 +197,9 @@
173197
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
174198
}
175199

200+
if ($info['requires']['php'] !== $phpVersion = preg_replace('{\^([\d\.]++)$}', '>=$1', $info['requires']['php'])) {
201+
$passthruOrFail("$COMPOSER require --no-update \"php:$phpVersion\"");
202+
}
176203
$passthruOrFail("$COMPOSER config --unset platform.php");
177204
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
178205
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");

‎src/Symfony/Bridge/ProxyManager/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/dependency-injection": "^5.0",
2121
"ocramius/proxy-manager": "~2.1"
2222
},

‎src/Symfony/Bridge/Twig/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/polyfill-php80": "^1.15",
2121
"symfony/translation-contracts": "^1.1|^2",
2222
"twig/twig": "^2.10|^3.0"

‎src/Symfony/Bundle/DebugBundle/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"ext-xml": "*",
2121
"symfony/http-kernel": "^4.4|^5.0",
2222
"symfony/twig-bridge": "^4.4|^5.0",

‎src/Symfony/Bundle/FrameworkBundle/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"ext-xml": "*",
2121
"symfony/cache": "^4.4|^5.0",
2222
"symfony/config": "^5.0",

‎src/Symfony/Bundle/SecurityBundle/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"ext-xml": "*",
2121
"symfony/config": "^4.4|^5.0",
2222
"symfony/dependency-injection": "^5.1",

‎src/Symfony/Bundle/TwigBundle/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/config": "^4.4|^5.0",
2121
"symfony/twig-bridge": "^5.0",
2222
"symfony/http-foundation": "^4.4|^5.0",

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/config": "^4.4|^5.0",
2121
"symfony/framework-bundle": "^5.1",
2222
"symfony/http-kernel": "^4.4|^5.0",

‎src/Symfony/Component/Asset/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5"
19+
"php": ">=7.2.5"
2020
},
2121
"suggest": {
2222
"symfony/http-foundation": ""

‎src/Symfony/Component/BrowserKit/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/dom-crawler": "^4.4|^5.0"
2121
},
2222
"require-dev": {

‎src/Symfony/Component/Cache/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/cache-implementation": "1.0"
2222
},
2323
"require": {
24-
"php": "^7.2.5",
24+
"php": ">=7.2.5",
2525
"psr/cache": "~1.0",
2626
"psr/log": "~1.0",
2727
"symfony/cache-contracts": "^1.1.7|^2",

‎src/Symfony/Component/Config/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1",
2121
"symfony/filesystem": "^4.4|^5.0",
2222
"symfony/polyfill-ctype": "~1.8",

‎src/Symfony/Component/Console/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/polyfill-mbstring": "~1.0",
2121
"symfony/polyfill-php73": "^1.8",
2222
"symfony/polyfill-php80": "^1.15",

‎src/Symfony/Component/CssSelector/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
],
2222
"require": {
23-
"php": "^7.2.5"
23+
"php": ">=7.2.5"
2424
},
2525
"autoload": {
2626
"psr-4": { "Symfony\\Component\\CssSelector\\": "" },

‎src/Symfony/Component/DependencyInjection/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"psr/container": "^1.0",
2121
"symfony/deprecation-contracts": "^2.1",
2222
"symfony/polyfill-php80": "^1.15",

‎src/Symfony/Component/DomCrawler/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/polyfill-ctype": "~1.8",
2121
"symfony/polyfill-mbstring": "~1.0",
2222
"symfony/polyfill-php80": "^1.15"

‎src/Symfony/Component/Dotenv/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1"
2121
},
2222
"require-dev": {

‎src/Symfony/Component/ErrorHandler/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"psr/log": "^1.0",
2121
"symfony/polyfill-php80": "^1.15",
2222
"symfony/var-dumper": "^4.4|^5.0"

‎src/Symfony/Component/EventDispatcher/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1",
2121
"symfony/event-dispatcher-contracts": "^2",
2222
"symfony/polyfill-php80": "^1.15"

‎src/Symfony/Component/ExpressionLanguage/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/cache": "^4.4|^5.0",
2121
"symfony/polyfill-php80": "^1.15",
2222
"symfony/service-contracts": "^1.1|^2"

‎src/Symfony/Component/Filesystem/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/polyfill-ctype": "~1.8"
2121
},
2222
"autoload": {

‎src/Symfony/Component/Finder/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5"
19+
"php": ">=7.2.5"
2020
},
2121
"autoload": {
2222
"psr-4": { "Symfony\\Component\\Finder\\": "" },

‎src/Symfony/Component/Form/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1",
2121
"symfony/event-dispatcher": "^4.4|^5.0",
2222
"symfony/intl": "^4.4|^5.0",

‎src/Symfony/Component/HttpClient/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/http-client-implementation": "1.1"
2222
},
2323
"require": {
24-
"php": "^7.2.5",
24+
"php": ">=7.2.5",
2525
"psr/log": "^1.0",
2626
"symfony/http-client-contracts": "^2.1.1",
2727
"symfony/polyfill-php73": "^1.11",

‎src/Symfony/Component/HttpFoundation/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1",
2121
"symfony/polyfill-mbstring": "~1.1",
2222
"symfony/polyfill-php80": "^1.15"

‎src/Symfony/Component/HttpKernel/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2.5",
19+
"php": ">=7.2.5",
2020
"symfony/deprecation-contracts": "^2.1",
2121
"symfony/error-handler": "^4.4|^5.0",
2222
"symfony/event-dispatcher": "^5.0",

‎src/Symfony/Component/Inflector/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
],
2525
"require": {
26-
"php": "^7.2.5",
26+
"php": ">=7.2.5",
2727
"symfony/deprecation-contracts": "^2.1",
2828
"symfony/string": "^5.1"
2929
},

‎src/Symfony/Component/Intl/Resources/data/languages/af.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"eu": "Baskies",
9292
"ewo": "Ewondo",
9393
"fa": "Persies",
94-
"fa_AF": "Dari",
9594
"ff": "Fulah",
9695
"fi": "Fins",
9796
"fil": "Filippyns",
@@ -397,6 +396,7 @@
397396
"ar_001": "Moderne Standaardarabies",
398397
"en_GB": "Engels (VK)",
399398
"en_US": "Engels (VSA)",
399+
"fa_AF": "Dari",
400400
"nds_NL": "Nedersaksies",
401401
"nl_BE": "Vlaams"
402402
}

‎src/Symfony/Component/Intl/Resources/data/languages/am.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
"eu": "ባስክኛ",
134134
"ewo": "ኤዎንዶ",
135135
"fa": "ፐርሺያኛ",
136-
"fa_AF": "ዳሪኛ",
137136
"ff": "ፉላህ",
138137
"fi": "ፊኒሽ",
139138
"fil": "ፊሊፒንኛ",
@@ -455,6 +454,7 @@
455454
"es_419": "የላቲን አሜሪካ ስፓኒሽ",
456455
"es_ES": "የአውሮፓ ስፓንሽኛ",
457456
"es_MX": "የሜክሲኮ ስፓንሽኛ",
457+
"fa_AF": "ዳሪኛ",
458458
"fr_CA": "የካናዳ ፈረንሳይኛ",
459459
"fr_CH": "የስዊዝ ፈረንሳይኛ",
460460
"nds_NL": "የታችኛው ሳክሰን",

‎src/Symfony/Component/Intl/Resources/data/languages/ar.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"eu": "الباسكية",
129129
"ewo": "الإيوندو",
130130
"fa": "الفارسية",
131-
"fa_AF": "الدارية",
132131
"fan": "الفانج",
133132
"fat": "الفانتي",
134133
"ff": "الفولانية",
@@ -520,6 +519,7 @@
520519
"es_419": "الإسبانية أمريكا اللاتينية",
521520
"es_ES": "الإسبانية الأوروبية",
522521
"es_MX": "الإسبانية المكسيكية",
522+
"fa_AF": "الدارية",
523523
"fr_CA": "الفرنسية الكندية",
524524
"fr_CH": "الفرنسية السويسرية",
525525
"nds_NL": "السكسونية السفلى",

‎src/Symfony/Component/Intl/Resources/data/languages/as.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"eu": "বাস্ক",
8787
"ewo": "ইওন্দো",
8888
"fa": "ফাৰ্ছী",
89-
"fa_AF": "দাৰি",
9089
"ff": "ফুলাহ",
9190
"fi": "ফিনিচ",
9291
"fil": "ফিলিপিনো",
@@ -381,6 +380,7 @@
381380
"es_419": "লেটিন আমেৰিকান স্পেনিচ",
382381
"es_ES": "ইউৰোপীয়ান স্পেনিচ",
383382
"es_MX": "মেক্সিকান স্পেনিচ",
383+
"fa_AF": "দাৰি",
384384
"fr_CA": "কানাডিয়ান ফ্ৰেন্স",
385385
"fr_CH": "ছুইচ ফ্ৰেন্স",
386386
"nl_BE": "ফ্লেমিচ",

‎src/Symfony/Component/Intl/Resources/data/languages/az.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
"eu": "bask",
120120
"ewo": "evondo",
121121
"fa": "fars",
122-
"fa_AF": "dari",
123122
"fan": "fang",
124123
"fat": "fanti",
125124
"ff": "fula",
@@ -502,6 +501,7 @@
502501
"es_419": "Latın Amerikası ispancası",
503502
"es_ES": "Kastiliya ispancası",
504503
"es_MX": "Meksika ispancası",
504+
"fa_AF": "dari",
505505
"fr_CA": "Kanada fransızcası",
506506
"fr_CH": "İsveçrə fransızcası",
507507
"nds_NL": "aşağı sakson",

‎src/Symfony/Component/Intl/Resources/data/languages/be.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
"eu": "баскская",
9595
"ewo": "эвонда",
9696
"fa": "фарсі",
97-
"fa_AF": "дары",
9897
"ff": "фула",
9998
"fi": "фінская",
10099
"fil": "філіпінская",
@@ -409,6 +408,7 @@
409408
"es_419": "лацінаамерыканская іспанская",
410409
"es_ES": "еўрапейская іспанская",
411410
"es_MX": "мексіканская іспанская",
411+
"fa_AF": "дары",
412412
"fr_CA": "канадская французская",
413413
"fr_CH": "швейцарская французская",
414414
"nds_NL": "ніжнесаксонская",

0 commit comments

Comments
 (0)