Skip to content

Commit 1478780

Browse files
Merge branch '4.2' into 4.3
* 4.2: Fix Twig 1.x compatibility [Translator] Improve farsi(persian) translations for Form Improve fa translations Added tests to cover the possibility of having scalars as services. fixed tests on old PHP versions [FrameworkBundle] Inform the user when save_path will be ignored fixed CS [Translator] Load plurals from po files properly [Serializer]: AbstractObjectNormalizer ignores the property types of discriminated classes [EventDispatcher] Add tag kernel.rest on 'debug.event_dispatcher' service [Console] Update to inherit and add licence [Intl] Remove --dev from intl compile autoloader Remove call to deprecated method [Intl] Init compile tmp volume PHP 5 compat Add test case Update Request.php Don't assume port 0 for X-Forwarded-Port Load plurals from mo files properly
2 parents ae61816 + a89aa4a commit 1478780

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Resources/bin/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
$autoload = __DIR__.'/../../vendor/autoload.php';
1313

1414
if (!file_exists($autoload)) {
15-
bailout('You should run "composer install --dev" in the component before running this script.');
15+
bailout('You should run "composer install" in the component before running this script.');
1616
}
1717

1818
require_once $autoload;

Resources/bin/compile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/usr/bin/env bash
22

3-
if [[ $1 == force ]]; then
4-
docker pull jakzal/php-intl
5-
fi;
3+
[[ $1 == force ]] && docker pull jakzal/php-intl
4+
[[ ! -d /tmp/symfony/icu ]] && mkdir -p /tmp/symfony/icu
65

76
docker run \
87
-it --rm --name symfony-intl \

0 commit comments

Comments
 (0)