Merge branch '2.8'

* 2.8:
  [Locale] Add missing @group legacy annotations
  [Form] Add missing @group legacy annotations
  [Form] Use FQCN form types
  Fix security-acl deps
  Fix typo
  [Security] Removed security-acl from the core
  fixed typos
  Fix doctrine mapping validation type error
  Remove skipping of tests based on ICU data version whenever possible
  Fix the handling of null as locale in the stub intl classes
  do not dump leading backslashes in class names
  fix issue #15377
  Skip ::class constant
  [Config] type specific check for emptiness
  [Form] Deprecated FormTypeInterface::getName() and passing of type instances

Conflicts:
	UPGRADE-2.8.md
	composer.json
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/ClassLoader/ClassMapGenerator.php
	src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
	src/Symfony/Component/Form/Tests/AbstractExtensionTest.php
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
	src/Symfony/Component/Form/Tests/SimpleFormTest.php
	src/Symfony/Component/Locale/Tests/LocaleTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
	src/Symfony/Component/Security/Acl/README.md
	src/Symfony/Component/Security/Acl/composer.json

1 files changed, 0 insertions, 573 deletions

diff --git a/Acl/Tests/Dbal/MutableAclProviderTest.php b/Acl/Tests/Dbal/MutableAclProviderTest.php
deleted file mode 100644
index 37e1d77..0000000
--- a/Acl/Tests/Dbal/MutableAclProviderTest.php
+++ /dev/null
@@ -1,573 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Security\Acl\Tests\Dbal;
-
-use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
-use Symfony\Component\Security\Acl\Model\FieldEntryInterface;
-use Symfony\Component\Security\Acl\Model\AuditableEntryInterface;
-use Symfony\Component\Security\Acl\Model\EntryInterface;
-use Symfony\Component\Security\Acl\Domain\Entry;
-use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
-use Symfony\Component\Security\Acl\Domain\Acl;
-use Symfony\Component\Security\Acl\Exception\AclNotFoundException;
-use Symfony\Component\Security\Acl\Exception\ConcurrentModificationException;
-use Symfony\Component\Security\Acl\Dbal\AclProvider;
-use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
-use Symfony\Component\Security\Acl\Dbal\MutableAclProvider;
-use Symfony\Component\Security\Acl\Dbal\Schema;
-use Doctrine\DBAL\DriverManager;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-
-class MutableAclProviderTest extends \PHPUnit_Framework_TestCase
-{
-    protected $con;
-
-    public static function assertAceEquals(EntryInterface $a, EntryInterface $b)
-    {
-        self::assertInstanceOf(get_class($a), $b);
-
-        foreach (array('getId', 'getMask', 'getStrategy', 'isGranting') as $getter) {
-            self::assertSame($a->$getter(), $b->$getter());
-        }
-
-        self::assertTrue($a->getSecurityIdentity()->equals($b->getSecurityIdentity()));
-        self::assertSame($a->getAcl()->getId(), $b->getAcl()->getId());
-
-        if ($a instanceof AuditableEntryInterface) {
-            self::assertSame($a->isAuditSuccess(), $b->isAuditSuccess());
-            self::assertSame($a->isAuditFailure(), $b->isAuditFailure());
-        }
-
-        if ($a instanceof FieldEntryInterface) {
-            self::assertSame($a->getField(), $b->getField());
-        }
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Security\Acl\Exception\AclAlreadyExistsException
-     */
-    public function testCreateAclThrowsExceptionWhenAclAlreadyExists()
-    {
-        $provider = $this->getProvider();
-        $oid = new ObjectIdentity('123456', 'FOO');
-        $provider->createAcl($oid);
-        $provider->createAcl($oid);
-    }
-
-    public function testCreateAcl()
-    {
-        $provider = $this->getProvider();
-        $oid = new ObjectIdentity('123456', 'FOO');
-        $acl = $provider->createAcl($oid);
-        $cachedAcl = $provider->findAcl($oid);
-
-        $this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\Acl', $acl);
-        $this->assertSame($acl, $cachedAcl);
-        $this->assertTrue($acl->getObjectIdentity()->equals($oid));
-    }
-
-    public function testDeleteAcl()
-    {
-        $provider = $this->getProvider();
-        $oid = new ObjectIdentity(1, 'Foo');
-        $acl = $provider->createAcl($oid);
-
-        $provider->deleteAcl($oid);
-        $loadedAcls = $this->getField($provider, 'loadedAcls');
-        $this->assertCount(0, $loadedAcls['Foo']);
-
-        try {
-            $provider->findAcl($oid);
-            $this->fail('ACL has not been properly deleted.');
-        } catch (AclNotFoundException $e) {
-        }
-    }
-
-    public function testDeleteAclDeletesChildren()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $parentAcl = $provider->createAcl(new ObjectIdentity(2, 'Foo'));
-        $acl->setParentAcl($parentAcl);
-        $provider->updateAcl($acl);
-        $provider->deleteAcl($parentAcl->getObjectIdentity());
-
-        try {
-            $provider->findAcl(new ObjectIdentity(1, 'Foo'));
-            $this->fail('Child-ACLs have not been deleted.');
-        } catch (AclNotFoundException $e) {
-        }
-    }
-
-    public function testFindAclsAddsPropertyListener()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-        $this->assertCount(1, $propertyChanges);
-        $this->assertTrue($propertyChanges->contains($acl));
-        $this->assertEquals(array(), $propertyChanges->offsetGet($acl));
-
-        $listeners = $this->getField($acl, 'listeners');
-        $this->assertSame($provider, $listeners[0]);
-    }
-
-    public function testFindAclsAddsPropertyListenerOnlyOnce()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $acl = $provider->findAcl(new ObjectIdentity(1, 'Foo'));
-
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-        $this->assertCount(1, $propertyChanges);
-        $this->assertTrue($propertyChanges->contains($acl));
-        $this->assertEquals(array(), $propertyChanges->offsetGet($acl));
-
-        $listeners = $this->getField($acl, 'listeners');
-        $this->assertCount(1, $listeners);
-        $this->assertSame($provider, $listeners[0]);
-    }
-
-    public function testFindAclsAddsPropertyListenerToParentAcls()
-    {
-        $provider = $this->getProvider();
-        $this->importAcls($provider, array(
-            'main' => array(
-                'object_identifier' => '1',
-                'class_type' => 'foo',
-                'parent_acl' => 'parent',
-            ),
-            'parent' => array(
-                'object_identifier' => '1',
-                'class_type' => 'anotherFoo',
-            ),
-        ));
-
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-        $this->assertCount(0, $propertyChanges);
-
-        $acl = $provider->findAcl(new ObjectIdentity('1', 'foo'));
-        $this->assertCount(2, $propertyChanges);
-        $this->assertTrue($propertyChanges->contains($acl));
-        $this->assertTrue($propertyChanges->contains($acl->getParentAcl()));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testPropertyChangedDoesNotTrackUnmanagedAcls()
-    {
-        $provider = $this->getProvider();
-        $acl = new Acl(1, new ObjectIdentity(1, 'foo'), new PermissionGrantingStrategy(), array(), false);
-
-        $provider->propertyChanged($acl, 'classAces', array(), array('foo'));
-    }
-
-    public function testPropertyChangedTracksChangesToAclProperties()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-
-        $provider->propertyChanged($acl, 'entriesInheriting', false, true);
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertTrue(isset($changes['entriesInheriting']));
-        $this->assertFalse($changes['entriesInheriting'][0]);
-        $this->assertTrue($changes['entriesInheriting'][1]);
-
-        $provider->propertyChanged($acl, 'entriesInheriting', true, false);
-        $provider->propertyChanged($acl, 'entriesInheriting', false, true);
-        $provider->propertyChanged($acl, 'entriesInheriting', true, false);
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertFalse(isset($changes['entriesInheriting']));
-    }
-
-    public function testPropertyChangedTracksChangesToAceProperties()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $ace = new Entry(1, $acl, new UserSecurityIdentity('foo', 'FooClass'), 'all', 1, true, true, true);
-        $ace2 = new Entry(2, $acl, new UserSecurityIdentity('foo', 'FooClass'), 'all', 1, true, true, true);
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-
-        $provider->propertyChanged($ace, 'mask', 1, 3);
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertTrue(isset($changes['aces']));
-        $this->assertInstanceOf('\SplObjectStorage', $changes['aces']);
-        $this->assertTrue($changes['aces']->contains($ace));
-        $aceChanges = $changes['aces']->offsetGet($ace);
-        $this->assertTrue(isset($aceChanges['mask']));
-        $this->assertEquals(1, $aceChanges['mask'][0]);
-        $this->assertEquals(3, $aceChanges['mask'][1]);
-
-        $provider->propertyChanged($ace, 'strategy', 'all', 'any');
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertTrue(isset($changes['aces']));
-        $this->assertInstanceOf('\SplObjectStorage', $changes['aces']);
-        $this->assertTrue($changes['aces']->contains($ace));
-        $aceChanges = $changes['aces']->offsetGet($ace);
-        $this->assertTrue(isset($aceChanges['mask']));
-        $this->assertTrue(isset($aceChanges['strategy']));
-        $this->assertEquals('all', $aceChanges['strategy'][0]);
-        $this->assertEquals('any', $aceChanges['strategy'][1]);
-
-        $provider->propertyChanged($ace, 'mask', 3, 1);
-        $changes = $propertyChanges->offsetGet($acl);
-        $aceChanges = $changes['aces']->offsetGet($ace);
-        $this->assertFalse(isset($aceChanges['mask']));
-        $this->assertTrue(isset($aceChanges['strategy']));
-
-        $provider->propertyChanged($ace2, 'mask', 1, 3);
-        $provider->propertyChanged($ace, 'strategy', 'any', 'all');
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertTrue(isset($changes['aces']));
-        $this->assertFalse($changes['aces']->contains($ace));
-        $this->assertTrue($changes['aces']->contains($ace2));
-
-        $provider->propertyChanged($ace2, 'mask', 3, 4);
-        $provider->propertyChanged($ace2, 'mask', 4, 1);
-        $changes = $propertyChanges->offsetGet($acl);
-        $this->assertFalse(isset($changes['aces']));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testUpdateAclDoesNotAcceptUntrackedAcls()
-    {
-        $provider = $this->getProvider();
-        $acl = new Acl(1, new ObjectIdentity(1, 'Foo'), new PermissionGrantingStrategy(), array(), true);
-        $provider->updateAcl($acl);
-    }
-
-    public function testUpdateDoesNothingWhenThereAreNoChanges()
-    {
-        $con = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false);
-        $con
-            ->expects($this->never())
-            ->method('beginTransaction')
-        ;
-        $con
-            ->expects($this->never())
-            ->method('executeQuery')
-        ;
-
-        $provider = new MutableAclProvider($con, new PermissionGrantingStrategy(), array());
-        $acl = new Acl(1, new ObjectIdentity(1, 'Foo'), new PermissionGrantingStrategy(), array(), true);
-        $propertyChanges = $this->getField($provider, 'propertyChanges');
-        $propertyChanges->offsetSet($acl, array());
-        $provider->updateAcl($acl);
-    }
-
-    public function testUpdateAclThrowsExceptionOnConcurrentModificationOfSharedProperties()
-    {
-        $provider = $this->getProvider();
-        $acl1 = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $acl2 = $provider->createAcl(new ObjectIdentity(2, 'Foo'));
-        $acl3 = $provider->createAcl(new ObjectIdentity(1, 'AnotherFoo'));
-        $sid = new RoleSecurityIdentity('ROLE_FOO');
-
-        $acl1->insertClassAce($sid, 1);
-        $acl3->insertClassAce($sid, 1);
-        $provider->updateAcl($acl1);
-        $provider->updateAcl($acl3);
-
-        $acl2->insertClassAce($sid, 16);
-        $provider->updateAcl($acl2);
-
-        $acl1->insertClassAce($sid, 3);
-        $acl2->insertClassAce($sid, 5);
-        try {
-            $provider->updateAcl($acl1);
-            $this->fail('Provider failed to detect a concurrent modification.');
-        } catch (ConcurrentModificationException $e) {
-        }
-    }
-
-    public function testUpdateAcl()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $sid = new UserSecurityIdentity('johannes', 'FooClass');
-        $acl->setEntriesInheriting(!$acl->isEntriesInheriting());
-
-        $acl->insertObjectAce($sid, 1);
-        $acl->insertClassAce($sid, 5, 0, false);
-        $acl->insertObjectAce($sid, 2, 1, true);
-        $acl->insertClassFieldAce('field', $sid, 2, 0, true);
-        $provider->updateAcl($acl);
-
-        $acl->updateObjectAce(0, 3);
-        $acl->deleteObjectAce(1);
-        $acl->updateObjectAuditing(0, true, false);
-        $acl->updateClassFieldAce(0, 'field', 15);
-        $provider->updateAcl($acl);
-
-        $reloadProvider = $this->getProvider();
-        $reloadedAcl = $reloadProvider->findAcl(new ObjectIdentity(1, 'Foo'));
-        $this->assertNotSame($acl, $reloadedAcl);
-        $this->assertSame($acl->isEntriesInheriting(), $reloadedAcl->isEntriesInheriting());
-
-        $aces = $acl->getObjectAces();
-        $reloadedAces = $reloadedAcl->getObjectAces();
-        $this->assertEquals(count($aces), count($reloadedAces));
-        foreach ($aces as $index => $ace) {
-            $this->assertAceEquals($ace, $reloadedAces[$index]);
-        }
-    }
-
-    public function testUpdateAclWorksForChangingTheParentAcl()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $parentAcl = $provider->createAcl(new ObjectIdentity(1, 'AnotherFoo'));
-        $acl->setParentAcl($parentAcl);
-        $provider->updateAcl($acl);
-
-        $reloadProvider = $this->getProvider();
-        $reloadedAcl = $reloadProvider->findAcl(new ObjectIdentity(1, 'Foo'));
-        $this->assertNotSame($acl, $reloadedAcl);
-        $this->assertSame($parentAcl->getId(), $reloadedAcl->getParentAcl()->getId());
-    }
-
-    public function testUpdateAclUpdatesChildAclsCorrectly()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-
-        $parentAcl = $provider->createAcl(new ObjectIdentity(1, 'Bar'));
-        $acl->setParentAcl($parentAcl);
-        $provider->updateAcl($acl);
-
-        $parentParentAcl = $provider->createAcl(new ObjectIdentity(1, 'Baz'));
-        $parentAcl->setParentAcl($parentParentAcl);
-        $provider->updateAcl($parentAcl);
-
-        $newParentParentAcl = $provider->createAcl(new ObjectIdentity(2, 'Baz'));
-        $parentAcl->setParentAcl($newParentParentAcl);
-        $provider->updateAcl($parentAcl);
-
-        $reloadProvider = $this->getProvider();
-        $reloadedAcl = $reloadProvider->findAcl(new ObjectIdentity(1, 'Foo'));
-        $this->assertEquals($newParentParentAcl->getId(), $reloadedAcl->getParentAcl()->getParentAcl()->getId());
-    }
-
-    public function testUpdateAclInsertingMultipleObjectFieldAcesThrowsDBConstraintViolations()
-    {
-        $provider = $this->getProvider();
-        $oid = new ObjectIdentity(1, 'Foo');
-        $sid1 = new UserSecurityIdentity('johannes', 'FooClass');
-        $sid2 = new UserSecurityIdentity('guilro', 'FooClass');
-        $sid3 = new UserSecurityIdentity('bmaz', 'FooClass');
-        $fieldName = 'fieldName';
-
-        $acl = $provider->createAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid1, 4);
-        $provider->updateAcl($acl);
-
-        $acl = $provider->findAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid2, 4);
-        $provider->updateAcl($acl);
-
-        $acl = $provider->findAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid3, 4);
-        $provider->updateAcl($acl);
-    }
-
-    public function testUpdateAclDeletingObjectFieldAcesThrowsDBConstraintViolations()
-    {
-        $provider = $this->getProvider();
-        $oid = new ObjectIdentity(1, 'Foo');
-        $sid1 = new UserSecurityIdentity('johannes', 'FooClass');
-        $sid2 = new UserSecurityIdentity('guilro', 'FooClass');
-        $sid3 = new UserSecurityIdentity('bmaz', 'FooClass');
-        $fieldName = 'fieldName';
-
-        $acl = $provider->createAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid1, 4);
-        $provider->updateAcl($acl);
-
-        $acl = $provider->findAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid2, 4);
-        $provider->updateAcl($acl);
-
-        $index = 0;
-        $acl->deleteObjectFieldAce($index, $fieldName);
-        $provider->updateAcl($acl);
-
-        $acl = $provider->findAcl($oid);
-        $acl->insertObjectFieldAce($fieldName, $sid3, 4);
-        $provider->updateAcl($acl);
-    }
-
-    public function testUpdateUserSecurityIdentity()
-    {
-        $provider = $this->getProvider();
-        $acl = $provider->createAcl(new ObjectIdentity(1, 'Foo'));
-        $sid = new UserSecurityIdentity('johannes', 'FooClass');
-        $acl->setEntriesInheriting(!$acl->isEntriesInheriting());
-
-        $acl->insertObjectAce($sid, 1);
-        $acl->insertClassAce($sid, 5, 0, false);
-        $acl->insertObjectAce($sid, 2, 1, true);
-        $acl->insertClassFieldAce('field', $sid, 2, 0, true);
-        $provider->updateAcl($acl);
-
-        $newSid = new UserSecurityIdentity('mathieu', 'FooClass');
-        $provider->updateUserSecurityIdentity($newSid, 'johannes');
-
-        $reloadProvider = $this->getProvider();
-        $reloadedAcl = $reloadProvider->findAcl(new ObjectIdentity(1, 'Foo'));
-
-        $this->assertNotSame($acl, $reloadedAcl);
-        $this->assertSame($acl->isEntriesInheriting(), $reloadedAcl->isEntriesInheriting());
-
-        $aces = $acl->getObjectAces();
-        $reloadedAces = $reloadedAcl->getObjectAces();
-        $this->assertEquals(count($aces), count($reloadedAces));
-        foreach ($reloadedAces as $ace) {
-            $this->assertTrue($ace->getSecurityIdentity()->equals($newSid));
-        }
-    }
-
-    /**
-     * Imports acls.
-     *
-     * Data must have the following format:
-     * array(
-     *     *name* => array(
-     *         'object_identifier' => *required*
-     *         'class_type' => *required*,
-     *         'parent_acl' => *name (optional)*
-     *     ),
-     * )
-     *
-     * @param AclProvider $provider
-     * @param array       $data
-     *
-     * @throws \InvalidArgumentException
-     * @throws \Exception
-     */
-    protected function importAcls(AclProvider $provider, array $data)
-    {
-        $aclIds = $parentAcls = array();
-        $con = $this->getField($provider, 'connection');
-        $con->beginTransaction();
-        try {
-            foreach ($data as $name => $aclData) {
-                if (!isset($aclData['object_identifier'], $aclData['class_type'])) {
-                    throw new \InvalidArgumentException('"object_identifier", and "class_type" must be present.');
-                }
-
-                $this->callMethod($provider, 'createObjectIdentity', array(new ObjectIdentity($aclData['object_identifier'], $aclData['class_type'])));
-                $aclId = $con->lastInsertId();
-                $aclIds[$name] = $aclId;
-
-                $sql = $this->callMethod($provider, 'getInsertObjectIdentityRelationSql', array($aclId, $aclId));
-                $con->executeQuery($sql);
-
-                if (isset($aclData['parent_acl'])) {
-                    if (isset($aclIds[$aclData['parent_acl']])) {
-                        $con->executeQuery('UPDATE acl_object_identities SET parent_object_identity_id = '.$aclIds[$aclData['parent_acl']].' WHERE id = '.$aclId);
-                        $con->executeQuery($this->callMethod($provider, 'getInsertObjectIdentityRelationSql', array($aclId, $aclIds[$aclData['parent_acl']])));
-                    } else {
-                        $parentAcls[$aclId] = $aclData['parent_acl'];
-                    }
-                }
-            }
-
-            foreach ($parentAcls as $aclId => $name) {
-                if (!isset($aclIds[$name])) {
-                    throw new \InvalidArgumentException(sprintf('"%s" does not exist.', $name));
-                }
-
-                $con->executeQuery(sprintf('UPDATE acl_object_identities SET parent_object_identity_id = %d WHERE id = %d', $aclIds[$name], $aclId));
-                $con->executeQuery($this->callMethod($provider, 'getInsertObjectIdentityRelationSql', array($aclId, $aclIds[$name])));
-            }
-
-            $con->commit();
-        } catch (\Exception $e) {
-            $con->rollBack();
-
-            throw $e;
-        }
-    }
-
-    protected function callMethod($object, $method, array $args)
-    {
-        $method = new \ReflectionMethod($object, $method);
-        $method->setAccessible(true);
-
-        return $method->invokeArgs($object, $args);
-    }
-
-    protected function setUp()
-    {
-        if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
-            self::markTestSkipped('This test requires SQLite support in your environment');
-        }
-
-        $this->con = DriverManager::getConnection(array(
-            'driver' => 'pdo_sqlite',
-            'memory' => true,
-        ));
-
-        // import the schema
-        $schema = new Schema($this->getOptions());
-        foreach ($schema->toSql($this->con->getDatabasePlatform()) as $sql) {
-            $this->con->exec($sql);
-        }
-    }
-
-    protected function tearDown()
-    {
-        $this->con = null;
-    }
-
-    protected function getField($object, $field)
-    {
-        $reflection = new \ReflectionProperty($object, $field);
-        $reflection->setAccessible(true);
-
-        return $reflection->getValue($object);
-    }
-
-    public function setField($object, $field, $value)
-    {
-        $reflection = new \ReflectionProperty($object, $field);
-        $reflection->setAccessible(true);
-        $reflection->setValue($object, $value);
-        $reflection->setAccessible(false);
-    }
-
-    protected function getOptions()
-    {
-        return array(
-            'oid_table_name' => 'acl_object_identities',
-            'oid_ancestors_table_name' => 'acl_object_identity_ancestors',
-            'class_table_name' => 'acl_classes',
-            'sid_table_name' => 'acl_security_identities',
-            'entry_table_name' => 'acl_entries',
-        );
-    }
-
-    protected function getStrategy()
-    {
-        return new PermissionGrantingStrategy();
-    }
-
-    protected function getProvider($cache = null)
-    {
-        return new MutableAclProvider($this->con, $this->getStrategy(), $this->getOptions(), $cache);
-    }
-}