Skip to content

Commit 811da7f

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [Serializer] Added check of constuctor modifiers to AbstractNormalizer [Intl] Simplify the compile binary [Routing] Fix routes annotation loading with glob pattern Fix hardcoded hotPathTagName [Validator] Improve constraint default option check [Validator] Fix annotation default for @count and @Length Update composer.json Fix getSetMethodNormalizer to correctly ignore the attributes specified in "ignored_attributes" Add missing "vi" translations add missing German translations [Intl] Fix test added missing translation use behavior instead of behaviour [Validator] Translate JSON message to Hungarian [Validator] fix sr_Latn translations [FrameworkBundle][HttpFoundation] make session service resettable
2 parents 9651fdc + e03949b commit 811da7f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Resources/bin/compile

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

3-
if [[ $1 == force || ! $(docker ps -a | grep symfony-intl) ]]; then
4-
docker rm -f symfony-intl
5-
docker create --name symfony-intl -it -v /tmp:/tmp -v $(pwd):/app -w /app jakzal/php-intl:7.2-63.1 bash
6-
docker start symfony-intl
7-
docker exec symfony-intl bash -xc "apt-get update && apt-get -y install build-essential"
8-
else
9-
docker start symfony-intl
3+
if [[ $1 == force ]]; then
4+
docker pull jakzal/php-intl
105
fi;
116

12-
docker exec -u $(id -u):$(id -g) symfony-intl php src/Symfony/Component/Intl/Resources/bin/update-data.php
7+
docker run \
8+
-it --rm --name symfony-intl \
9+
-u $(id -u):$(id -g) \
10+
-v /tmp/symfony/icu:/tmp \
11+
-v $(pwd):/symfony \
12+
-w /symfony \
13+
jakzal/php-intl:latest \
14+
php src/Symfony/Component/Intl/Resources/bin/update-data.php

Tests/IntlTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testGetLocaleBundleCreatesTheLocaleBundle()
4141

4242
public function testGetRegionBundleCreatesTheRegionBundle()
4343
{
44-
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\LocaleBundleInterface', Intl::getLocaleBundle());
44+
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\RegionBundleInterface', Intl::getRegionBundle());
4545
}
4646

4747
public function testGetIcuVersionReadsTheVersionOfInstalledIcuLibrary()

0 commit comments

Comments
 (0)