This commit is contained in:
Fabien Potencier 2012-02-10 13:35:11 +01:00
parent 5ca472bd45
commit 92cb685ebc
19 changed files with 26 additions and 26 deletions

View File

@ -17,7 +17,6 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Config\Definition\NodeInterface; use Symfony\Component\Config\Definition\NodeInterface;
use Symfony\Component\Config\Definition\ArrayNode; use Symfony\Component\Config\Definition\ArrayNode;
use Symfony\Component\Config\Definition\PrototypedArrayNode; use Symfony\Component\Config\Definition\PrototypedArrayNode;
use Symfony\Component\Config\Definition\BooleanNode;
/** /**
* A console command for dumping available configuration reference * A console command for dumping available configuration reference

View File

@ -101,4 +101,4 @@ class RouterDataCollector extends DataCollector
{ {
return 'router'; return 'router';
} }
} }

View File

@ -1 +1 @@
{% block panel '' %} {% block panel '' %}

View File

@ -47,6 +47,7 @@
options options
); );
} }
return this; return this;
}, },
toggle: function(selector, elOn, elOff) { toggle: function(selector, elOn, elOff) {
@ -64,9 +65,10 @@
els[i].style.display = style; els[i].style.display = style;
} }
} }
return this; return this;
} }
} }
})(); })();
/*]]>*/</script> /*]]>*/</script>

View File

@ -13,4 +13,4 @@
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>

View File

@ -44,7 +44,7 @@ class ClassMapGenerator
* @return array A class map array * @return array A class map array
*/ */
static public function createMap($dir) static public function createMap($dir)
{ {
if (is_string($dir)) { if (is_string($dir)) {
$dir = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir)); $dir = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir));
} }
@ -61,9 +61,9 @@ class ClassMapGenerator
if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') { if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
continue; continue;
} }
$classes = self::findClasses($path); $classes = self::findClasses($path);
foreach ($classes as $class) { foreach ($classes as $class) {
$map[$class] = $path; $map[$class] = $path;
} }
@ -90,7 +90,7 @@ class ClassMapGenerator
$namespace = ''; $namespace = '';
for ($i = 0, $max = count($tokens); $i < $max; $i++) { for ($i = 0, $max = count($tokens); $i < $max; $i++) {
$token = $tokens[$i]; $token = $tokens[$i];
if (is_string($token)) { if (is_string($token)) {
continue; continue;
} }
@ -114,7 +114,7 @@ class ClassMapGenerator
while (($t = $tokens[++$i]) && is_array($t)) { while (($t = $tokens[++$i]) && is_array($t)) {
if (T_STRING === $t[0]) { if (T_STRING === $t[0]) {
$class .= $t[1]; $class .= $t[1];
} else if ($class !== '' && T_WHITESPACE == $t[0]) { } elseif ($class !== '' && T_WHITESPACE == $t[0]) {
break; break;
} }
} }

View File

@ -146,6 +146,7 @@ class MergeCollectionListener implements EventSubscriberInterface
// Don't set to the snapshot as then we are switching from the // Don't set to the snapshot as then we are switching from the
// original object to its copy, which might break things // original object to its copy, which might break things
$event->setData($originalData); $event->setData($originalData);
return; return;
} }

View File

@ -17,7 +17,6 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface; use Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface;
use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\MemberMetadata; use Symfony\Component\Validator\Mapping\MemberMetadata;
use Symfony\Component\Validator\GroupSequenceProviderInterface;
/** /**
* Responsible for walking over and initializing validation on different * Responsible for walking over and initializing validation on different

View File

@ -15,7 +15,7 @@ use Symfony\Component\ClassLoader\ClassMapGenerator;
class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @dataProvider getTestCreateMapTests * @dataProvider getTestCreateMapTests
*/ */
@ -23,7 +23,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
{ {
$this->assertEquals($expected, ClassMapGenerator::createMap($directory)); $this->assertEquals($expected, ClassMapGenerator::createMap($directory));
} }
public function getTestCreateMapTests() public function getTestCreateMapTests()
{ {
return array( return array(

View File

@ -4,5 +4,5 @@ namespace ClassMap;
class SomeClass extends SomeParent implements SomeInterface class SomeClass extends SomeParent implements SomeInterface
{ {
} }

View File

@ -4,5 +4,5 @@ namespace ClassMap;
interface SomeInterface interface SomeInterface
{ {
} }

View File

@ -4,5 +4,5 @@ namespace ClassMap;
abstract class SomeParent abstract class SomeParent
{ {
} }

View File

@ -8,4 +8,4 @@ namespace Alpha {
namespace Beta { namespace Beta {
class A {} class A {}
class B {} class B {}
} }

View File

@ -1,3 +1,3 @@
<?php <?php
$a = new stdClass(); $a = new stdClass();

View File

@ -1 +1 @@
This file should be skipped. This file should be skipped.

View File

@ -3,4 +3,4 @@
namespace Foo\Bar; namespace Foo\Bar;
class A {} class A {}
class B {} class B {}

View File

@ -151,7 +151,7 @@ class ChoiceListTest extends \PHPUnit_Framework_TestCase
$values = array('2', '1'); $values = array('2', '1');
$this->assertSame(array($this->obj3, $this->obj2), $this->list->getChoicesForValues($values)); $this->assertSame(array($this->obj3, $this->obj2), $this->list->getChoicesForValues($values));
} }
public function testGetChoicesForValuesIgnoresNonExistingValues() public function testGetChoicesForValuesIgnoresNonExistingValues()
{ {
$values = array('1', '2', '5'); $values = array('1', '2', '5');

View File

@ -40,4 +40,4 @@ class RedirectResponseTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('foo.bar', $response->getTargetUrl()); $this->assertEquals('foo.bar', $response->getTargetUrl());
} }
} }

View File

@ -19,7 +19,6 @@ use Symfony\Tests\Component\Validator\Fixtures\Entity;
use Symfony\Tests\Component\Validator\Fixtures\ConstraintA; use Symfony\Tests\Component\Validator\Fixtures\ConstraintA;
use Symfony\Tests\Component\Validator\Fixtures\ConstraintB; use Symfony\Tests\Component\Validator\Fixtures\ConstraintB;
use Symfony\Tests\Component\Validator\Fixtures\PropertyConstraint; use Symfony\Tests\Component\Validator\Fixtures\PropertyConstraint;
use Symfony\Tests\Component\Validator\Fixtures\GroupSequenceProvider;
require_once __DIR__.'/../Fixtures/Entity.php'; require_once __DIR__.'/../Fixtures/Entity.php';
require_once __DIR__.'/../Fixtures/ConstraintA.php'; require_once __DIR__.'/../Fixtures/ConstraintA.php';