This commit is contained in:
Fabien Potencier 2012-05-21 16:05:09 +02:00
parent 87bb3661fc
commit bdf9b7eb3e
10 changed files with 22 additions and 12 deletions

View File

@ -125,7 +125,8 @@ function get_data($index, $dataDir, $locale = 'en', $constraint = null)
return $data; return $data;
} }
function create_stub_datafile($locale, $target, $data) { function create_stub_datafile($locale, $target, $data)
{
$template = <<<TEMPLATE $template = <<<TEMPLATE
<?php <?php

View File

@ -19,7 +19,8 @@ class CompositeIdentEntity implements UserInterface
/** @Column(type="string") */ /** @Column(type="string") */
public $name; public $name;
public function __construct($id1, $id2, $name) { public function __construct($id1, $id2, $name)
{
$this->id1 = $id1; $this->id1 = $id1;
$this->id2 = $id2; $this->id2 = $id2;
$this->name = $name; $this->name = $name;

View File

@ -18,7 +18,8 @@ class CompositeStringIdentEntity
/** @Column(type="string") */ /** @Column(type="string") */
public $name; public $name;
public function __construct($id1, $id2, $name) { public function __construct($id1, $id2, $name)
{
$this->id1 = $id1; $this->id1 = $id1;
$this->id2 = $id2; $this->id2 = $id2;
$this->name = $name; $this->name = $name;

View File

@ -15,7 +15,8 @@ class SingleIdentEntity
/** @Column(type="string", nullable=true) */ /** @Column(type="string", nullable=true) */
public $name; public $name;
public function __construct($id, $name) { public function __construct($id, $name)
{
$this->id = $id; $this->id = $id;
$this->name = $name; $this->name = $name;
} }

View File

@ -15,7 +15,8 @@ class SingleStringIdentEntity
/** @Column(type="string") */ /** @Column(type="string") */
public $name; public $name;
public function __construct($id, $name) { public function __construct($id, $name)
{
$this->id = $id; $this->id = $id;
$this->name = $name; $this->name = $name;
} }

View File

@ -97,7 +97,8 @@ abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
$ref->setValue($obj, $value); $ref->setValue($obj, $value);
} }
private function invoke($obj, $method, array $args = array()) { private function invoke($obj, $method, array $args = array())
{
$ref = new \ReflectionMethod($obj, $method); $ref = new \ReflectionMethod($obj, $method);
$ref->setAccessible(true); $ref->setAccessible(true);

View File

@ -13,7 +13,8 @@ namespace Symfony\Tests\Bridge\Twig\Extension\Fixtures;
// Preventing autoloader throwing E_FATAL when Twig is now available // Preventing autoloader throwing E_FATAL when Twig is now available
if (!class_exists('Twig_Environment')) { if (!class_exists('Twig_Environment')) {
class StubFilesystemLoader { class StubFilesystemLoader
{
} }
} else { } else {
class StubFilesystemLoader extends \Twig_Loader_Filesystem class StubFilesystemLoader extends \Twig_Loader_Filesystem

View File

@ -34,7 +34,8 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
$this->removeDirectory($this->directory); $this->removeDirectory($this->directory);
} }
protected function removeDirectory($directory) { protected function removeDirectory($directory)
{
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
foreach ($iterator as $path) { foreach ($iterator as $path) {
if (preg_match('#/\.\.?$#', $path->__toString())) { if (preg_match('#/\.\.?$#', $path->__toString())) {

View File

@ -268,7 +268,8 @@ class CollectionValidatorTest extends \PHPUnit_Framework_TestCase
)))); ))));
} }
public function testArrayAccessObject() { public function testArrayAccessObject()
{
$value = new TestArrayObject(); $value = new TestArrayObject();
$value['foo'] = 12; $value['foo'] = 12;
$value['asdf'] = 'asdfaf'; $value['asdf'] = 'asdfaf';
@ -288,7 +289,8 @@ class CollectionValidatorTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($result); $this->assertTrue($result);
} }
public function testArrayObject() { public function testArrayObject()
{
$value = new \ArrayObject(array()); $value = new \ArrayObject(array());
$value['foo'] = 12; $value['foo'] = 12;
$value['asdf'] = 'asdfaf'; $value['asdf'] = 'asdfaf';

View File

@ -5,8 +5,8 @@ namespace Symfony\Tests\Component\Validator\Fixtures;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** @Annotation */ /** @Annotation */
class ConstraintB extends Constraint { class ConstraintB extends Constraint
{
public function getTargets() public function getTargets()
{ {
return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT); return array(self::PROPERTY_CONSTRAINT, self::CLASS_CONSTRAINT);