diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' into 2.8

Browse Source 
* 2.7:
  Use "more entropy" option for uniqid()
  reset constraint options
This commit is contained in:
Fabien Potencier 2016-10-03 08:49:46 -07:00
commit fcd401fc9c
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
View File

@ -86,7 +86,7 @@ class ProxyDumperTest extends \PHPUnit_Framework_TestCase
$definitions = array(
array(new Definition(__CLASS__), true),
array(new Definition('stdClass'), true),
array(new Definition('foo'.uniqid()), false),
array(new Definition(uniqid('foo', true)), false),
array(new Definition(), false),
);

2
src/Symfony/Bridge/Twig/Command/LintCommand.php
View File

@ -110,7 +110,7 @@ EOF
$template .= fread(STDIN, 1024);
}
return $this->display($input, $output, $io, array($this->validate($twig, $template, uniqid('sf_'))));
return $this->display($input, $output, $io, array($this->validate($twig, $template, uniqid('sf_', true))));
}
$filesInfo = $this->getFilesInfo($twig, $filenames);

3
src/Symfony/Component/Validator/Constraint.php
View File

@ -129,6 +129,9 @@ abstract class Constraint
unset($options['value']);
}
if (is_array($options)) {
reset($options);
}
if (is_array($options) && count($options) > 0 && is_string(key($options))) {
foreach ($options as $option => $value) {
if (array_key_exists($option, $knownOptions)) {

31
src/Symfony/Component/Validator/Tests/ConstraintTest.php
View File

@ -206,4 +206,35 @@ class ConstraintTest extends \PHPUnit_Framework_TestCase
{
Constraint::getErrorName(1);
}
public function testOptionsAsDefaultOption()
{
$constraint = new ConstraintA($options = array('value1'));
$this->assertEquals($options, $constraint->property2);
$constraint = new ConstraintA($options = array('value1', 'property1' => 'value2'));
$this->assertEquals($options, $constraint->property2);
}
/**
* @expectedException \Symfony\Component\Validator\Exception\InvalidOptionsException
* @expectedExceptionMessage The options "0", "5" do not exist
*/
public function testInvalidOptions()
{
new ConstraintA(array('property2' => 'foo', 'bar', 5 => 'baz'));
}
public function testOptionsWithInvalidInternalPointer()
{
$options = array('property1' => 'foo');
next($options);
next($options);
$constraint = new ConstraintA($options);
$this->assertEquals('foo', $constraint->property1);
}
}