This commit is contained in:
Fabien Potencier 2012-03-11 18:00:25 +01:00
parent 595e6d6ca2
commit 673bbb8a8e
13 changed files with 20 additions and 27 deletions

View File

@ -13,7 +13,6 @@ namespace Symfony\Bridge\Doctrine;
use Doctrine\Common\EventArgs;
use Doctrine\Common\EventManager;
use Doctrine\Common\EventSubscriber;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**

View File

@ -59,8 +59,8 @@ EOT
try {
$schema->addToSchema($connection->getSchemaManager()->createSchema());
} catch (SchemaException $e) {
$output->writeln("Aborting: " . $e->getMessage());
$output->writeln("Aborting: " . $e->getMessage());
return;
}

View File

@ -14,10 +14,10 @@ namespace Symfony\Bundle\SecurityBundle\EventListener;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
/**
* Merges ACL schema into the given schema.
*
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
/**
* Merges ACL schema into the given schema.
*
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/
class AclSchemaListener
{
@ -33,4 +33,4 @@ class AclSchemaListener
$schema = $args->getSchema();
$this->container->get('security.acl.dbal.schema')->addToSchema($schema);
}
}
}

View File

@ -7,7 +7,7 @@
<parameters>
<parameter key="security.acl.dbal.provider.class">Symfony\Component\Security\Acl\Dbal\MutableAclProvider</parameter>
<parameter key="security.acl.dbal.schema.class">Symfony\Component\Security\Acl\Dbal\Schema</parameter>
<parameter key="security.acl.dbal.schema_listener.class">Symfony\Bundle\SecurityBundle\EventListener\AclSchemaListener</parameter>
<parameter key="security.acl.dbal.schema_listener.class">Symfony\Bundle\SecurityBundle\EventListener\AclSchemaListener</parameter>
</parameters>
<services>

View File

@ -13,7 +13,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBun
use Symfony\Component\DependencyInjection\ContainerAware;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\SecurityContextInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
class LoginController extends ContainerAware

View File

@ -81,6 +81,7 @@ class UserLoginFormType extends AbstractType
/* Note: the form's intention must correspond to that for the form login
* listener in order for the CSRF token to validate successfully.
*/
return array(
'intention' => 'authenticate',
);

View File

@ -32,7 +32,7 @@ interface EventDispatcherInterface
* If not supplied, an empty Event instance is created.
*
* @return Event
*
*
* @api
*/
function dispatch($eventName, Event $event = null);

View File

@ -12,7 +12,6 @@
namespace Symfony\Component\Security\Acl\Dbal;
use Doctrine\DBAL\Schema\Schema as BaseSchema;
use Doctrine\DBAL\Schema\SchemaConfig;
use Doctrine\DBAL\Connection;
/**
@ -50,16 +49,16 @@ final class Schema extends BaseSchema
*
* @param BaseSchema $schema
*/
public function addToSchema(BaseSchema $schema)
{
foreach ($this->getTables() as $table) {
$schema->_addTable($table);
}
foreach ($this->getSequences() as $sequence) {
$schema->_addSequence($sequence);
}
}
public function addToSchema(BaseSchema $schema)
{
foreach ($this->getTables() as $table) {
$schema->_addTable($table);
}
foreach ($this->getSequences() as $sequence) {
$schema->_addSequence($sequence);
}
}
/**
* Adds the class table to the schema

View File

@ -12,7 +12,6 @@
namespace Symfony\Tests\Component\HttpKernel\Profiler;
use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
use Symfony\Component\HttpKernel\Profiler\Profile;
class FileProfilerStorageTest extends AbstractProfilerStorageTest
{

View File

@ -12,7 +12,6 @@
namespace Symfony\Tests\Component\HttpKernel\Profiler;
use Symfony\Component\HttpKernel\Profiler\MemcacheProfilerStorage;
use Symfony\Component\HttpKernel\Profiler\Profile;
class DummyMemcacheProfilerStorage extends MemcacheProfilerStorage
{

View File

@ -12,7 +12,6 @@
namespace Symfony\Tests\Component\HttpKernel\Profiler;
use Symfony\Component\HttpKernel\Profiler\MemcachedProfilerStorage;
use Symfony\Component\HttpKernel\Profiler\Profile;
class DummyMemcachedProfilerStorage extends MemcachedProfilerStorage
{

View File

@ -12,7 +12,6 @@
namespace Symfony\Tests\Component\HttpKernel\Profiler;
use Symfony\Component\HttpKernel\Profiler\RedisProfilerStorage;
use Symfony\Component\HttpKernel\Profiler\Profile;
class DummyRedisProfilerStorage extends RedisProfilerStorage
{

View File

@ -12,7 +12,6 @@
namespace Symfony\Tests\Component\HttpKernel\Profiler;
use Symfony\Component\HttpKernel\Profiler\SqliteProfilerStorage;
use Symfony\Component\HttpKernel\Profiler\Profile;
class SqliteProfilerStorageTest extends AbstractProfilerStorageTest
{