8000 Merge branch '5.0' · symfony/symfony@1b5430b · GitHub
[go: up one dir, main page]
Skip to content

Commit 1b5430b

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.0'
* 5.0: (36 commits) Add test for tagged iterator with numeric index Fix container lint command when a synthetic service is used in combination with the expression language Fix Travis script [Validator][Range] Fix typos [SecurityBundle] Minor fix in LDAP config tree builder [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle Revert "minor #35559 [FrameworkBundle] remove mention of the old Controller class (nicolas-grekas)" [FrameworkBundle] remove redundant PHPDoc in console Descriptor and subclass [Mime] remove phpdoc mentioning Utf8AddressEncoder Add missing phpdoc Remove int return type from FlattenException::getCode [Yaml] fix dumping strings containing CRs [DI] Fix XmlFileLoader bad error message [Form] Handle false as empty value on expanded choices [Messenger] Add ext-redis min version req to tests Tweak message improve PlaintextPasswordEncoder docBlock summary [Validator] Add two missing translations for the Arabic (ar) locale Use some PHP 5.4 constants unconditionally Add new packages on the link script ...
2 parents 31232cf + ac2c8f2 commit 1b5430b

File tree

51 files changed

+594
-375
lines changed

Some content is hidden

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

51 files changed

+594
-375
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ install:
300300
run_tests () {
301301
set -e
302302
export PHP=$1
303+
phpenv global $PHP
303304
304305
if [[ !$deps && $PHP = 7.2 ]]; then
305306
tfold src/Symfony/Component/HttpClient.h2push "$COMPOSER_UP symfony/contracts && docker run -it --rm -v $(pwd):/app -v $(phpenv which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
@@ -309,7 +310,7 @@ install:
309310
echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
310311
return
311312
fi
312-
phpenv global $PHP
313+
313314
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
314315
tfold 'composer update' $COMPOSER_UP
315316
tfold 'phpunit install' ./phpunit install

0 commit comments

Comments
 (0)
0