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

merged 2.0

Browse Source
This commit is contained in:
Fabien Potencier 2011-12-20 20:16:39 +01:00
commit 5803146a9e
5 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
View File

@ -100,6 +100,6 @@ class EntityUserProvider implements UserProviderInterface
*/
public function supportsClass($class)
{
return $class === $this->class;
return $class === $this->class || is_subclass_of($class, $this->class);
}
}

2
src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php
View File

@ -77,12 +77,12 @@ class MetadataFactory
if (class_exists($class)) {
$r = $all[0]->getReflectionClass();
$path = $this->getBasePathForClass($class, $r->getNamespacename(), dirname($r->getFilename()));
$metadata->setNamespace($r->getNamespacename());
} elseif (!$path) {
throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $class));
}
$metadata->setPath($path);
$metadata->setNamespace($r->getNamespacename());
return $metadata;
}

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
View File

@ -1,5 +1,5 @@
<!-- START of Symfony2 Web Debug Toolbar -->
{% if position != 'normal' %}
{% if 'normal' != position %}
<div style="clear: both; height: 40px;"></div>
{% endif %}

17
tests/Symfony/Tests/Bridge/Doctrine/Security/User/EntityUserProviderTest.php
View File

@ -75,6 +75,23 @@ class EntityUserProviderTest extends DoctrineOrmTestCase
$provider->refreshUser($user2);
}
public function testSupportProxy()
{
$em = $this->createTestEntityManager();
$this->createSchema($em);
$user1 = new CompositeIdentEntity(1, 1, 'user1');
$em->persist($user1);
$em->flush();
$em->clear();
$provider = new EntityUserProvider($em, 'Symfony\Tests\Bridge\Doctrine\Fixtures\CompositeIdentEntity', 'name');
$user2 = $em->getReference('Symfony\Tests\Bridge\Doctrine\Fixtures\CompositeIdentEntity', array('id1' => 1, 'id2' => 1));
$this->assertTrue($provider->supportsClass(get_class($user2)));
}
private function createSchema($em)
{
$schemaTool = new SchemaTool($em);

8
tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php
View File

@ -23,6 +23,10 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
*/
public function testFindWithPHP_PATH()
{
if (defined('PHP_BINARY')) {
$this->markTestSkipped('The PHP binary is easily available as of PHP 5.4');
}
$f = new PhpExecutableFinder();
$current = $f->find();
@ -41,6 +45,10 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
*/
public function testFindWithSuffix()
{
if (defined('PHP_BINARY')) {
$this->markTestSkipped('The PHP binary is easily available as of PHP 5.4');
}
putenv('PHP_PATH=');
putenv('PHP_PEAR_PHP_BIN=');
$f = new PhpExecutableFinder();