Skip to content

Commit 9651fdc

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [Phpunit] fixed support for PHP 5.3 Response prepare method update [Workflow] Added missing license header Check if Client exists when test.client does not exist, to provide clearer exception message [Form] Preventing validation of children if parent with Valid constraint has no validation groups [Tests] fixed compatbility of assertEquals(): void [Intl] Fix test [Validator] Add the missing translations for the Arabic (ar) locale [Intl] Add compile binary [Form] Fixed some phpdocs
2 parents 9c7765d + f223d39 commit 9651fdc

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Resources/bin/compile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
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
10+
fi;
11+
12+
docker exec -u $(id -u):$(id -g) symfony-intl php src/Symfony/Component/Intl/Resources/bin/update-data.php

Tests/Util/GitRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testItThrowsAnExceptionIfInitialisedWithNonGitDirectory()
4545
$this->setExpectedException(RuntimeException::class);
4646
}
4747

48-
@mkdir($this->targetDir, '0777', true);
48+
@mkdir($this->targetDir, 0777, true);
4949

5050
new GitRepository($this->targetDir);
5151
}

0 commit comments

Comments
 (0)