8000 Merge branch '2.8' into 3.3 · symfony/symfony@5b997f1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5b997f1

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: [FrameworkBundle] Fix visibility of a test helper [link] clear the cache after linking [link] Prevent warnings when running link with 2.7 [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message
2 parents 5f5edf2 + 874d418 commit 5b997f1

File tree

5 files changed

+68
-4
lines changed

5 files changed

+68
-4
lines changed

‎link

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ if (!is_dir("$argv[1]/vendor/symfony")) {
3535
}
3636

3737
$sfPackages = array('symfony/symfony' => __DIR__);
38+
39+
$filesystem = new Filesystem();
3840
foreach (glob(__DIR__.'/src/Symfony/{Bundle,Bridge,Component,Component/Security}/*', GLOB_BRACE | GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
39-
$sfPackages[json_decode(file_get_contents("$dir/composer.json"))->name] = $dir;
41+
if ($filesystem->exists($composer = "$dir/composer.json")) {
42+
$sfPackages[json_decode(file_get_contents($composer))->name] = $dir;
43+
}
4044
}
4145

42-
$filesystem = new Filesystem();
4346
foreach (glob("$argv[1]/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
4447
$package = 'symfony/'.basename($dir);
4548
if (is_link($dir)) {
@@ -57,3 +60,7 @@ foreach (glob("$argv[1]/vendor/symfony/*", GLOB_ONLYDIR | GLOB_NOSORT) as $dir)
5760
$filesystem->symlink($sfDir, $dir);
5861
echo "\"$package\" has been linked to \"$sfPackages[$package]\".".PHP_EOL;
5962
}
63+
64+
foreach (glob("$argv[1]/var/cache/*") as $cacheDir) {
65+
$filesystem->remove($cacheDir);
66+
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private function createRedirectController($httpPort = null, $httpsPort = null)
290290
return $controller;
291291
}
292292

293-
public function assertRedirectUrl(Response $returnResponse, $expectedUrl)
293+
private function assertRedirectUrl(Response $returnResponse, $expectedUrl)
294294
{
295295
$this->assertTrue($returnResponse->isRedirect($expectedUrl), "Expected: $expectedUrl\nGot: ".$returnResponse->headers->get('Location'));
296296
}

‎src/Symfony/Component/Validator/Constraints/ExpressionValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function validate($value, Constraint $constraint)
4545

4646
if (!$this->getExpressionLanguage()->evaluate($constraint->expression, $variables)) {
4747
$this->context->buildViolation($constraint->message)
48-
->setParameter('{{ value }}', $this->formatValue($value))
48+
->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING))
4949
->setCode(Expression::EXPRESSION_FAILED_ERROR)
5050
->addViolation();
5151
}

‎src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\Validator\Constraints\ExpressionValidator;
1616
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
1717
use Symfony\Component\Validator\Tests\Fixtures\Entity;
18+
use Symfony\Component\Validator\Tests\Fixtures\ToString;
1819

1920
class ExpressionValidatorTest extends ConstraintValidatorTestCase
2021
{
@@ -87,6 +88,40 @@ public function testFailingExpressionAtObjectLevel()
8788
->assertRaised();
8889
}
8990

91+
public function testSucceedingExpressionAtObjectLevelWithToString()
92+
{
93+
$constraint = new Expression('this.data == 1');
94+
95+
$object = new ToString();
96+
$object->data = '1';
97+
98+
$this->setObject($object);
99+
100+
$this->validator->validate($object, $constraint);
101+
102+
$this->assertNoViolation();
103+
}
104+
105+
public function testFailingExpressionAtObjectLevelWithToString()
106+
{
107+
$constraint = new Expression(array(
108+
'expression' => 'this.data == 1',
109+
'message' => 'myMessage',
110+
));
111+
112+
$object = new ToString();
113+
$object->data = '2';
114+
115+
$this->setObject($object);
116+
117+
$this->validator->validate($object, $constraint);
118+
119+
$this->buildViolation('myMessage')
120+
->setParameter('{{ value }}', 'toString')
121+
->setCode(Expression::EXPRESSION_FAILED_ERROR)
122+
->assertRaised();
123+
}
124+
90125
public function testSucceedingExpressionAtPropertyLevel()
91126
{
92127
$constraint = new Expression('value == this.data');

‎src/Symfony/Component/Validator/Tests/Fixtures/ToString.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Validator\Tests\Fixtures;
13+
14+
class ToString
15+
{
16+
public $data;
17+
18+
public function __toString()
19+
{
20+
return 'toString';
21+
}
22+
}

0 commit comments

Comments
 (0)
0