diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 15:49:25 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 15:49:25 +0100 |
commit | 0e0bddb6cd3fda22a89662fd2476d05f11d10fef (patch) | |
tree | 7f374042f1a39eb89aeb4112987a77e530792704 /Tests/Acl | |
parent | 21d39918e40684006c679a53c528d361b3265b66 (diff) | |
parent | 58c7534305b398ab5752798ef5eb9f0e91cfc034 (diff) | |
download | symfony-security-0e0bddb6cd3fda22a89662fd2476d05f11d10fef.zip symfony-security-0e0bddb6cd3fda22a89662fd2476d05f11d10fef.tar.gz symfony-security-0e0bddb6cd3fda22a89662fd2476d05f11d10fef.tar.bz2 |
minor #13206 [2.3] Cleanup deprecations (nicolas-grekas)
This PR was merged into the 2.3 branch.
Discussion
----------
[2.3] Cleanup deprecations
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | let's see
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
d649bef [2.3] Remove useless tests skips
1d68ad3 [2.3] Cleanup deprecations
Diffstat (limited to 'Tests/Acl')
-rw-r--r-- | Tests/Acl/Dbal/AclProviderBenchmarkTest.php | 4 | ||||
-rw-r--r-- | Tests/Acl/Dbal/AclProviderTest.php | 3 | ||||
-rw-r--r-- | Tests/Acl/Dbal/MutableAclProviderTest.php | 3 | ||||
-rw-r--r-- | Tests/Acl/Domain/AclTest.php | 7 | ||||
-rw-r--r-- | Tests/Acl/Domain/DoctrineAclCacheTest.php | 7 | ||||
-rw-r--r-- | Tests/Acl/Domain/ObjectIdentityTest.php | 7 | ||||
-rw-r--r-- | Tests/Acl/Domain/PermissionGrantingStrategyTest.php | 7 |
7 files changed, 0 insertions, 38 deletions
diff --git a/Tests/Acl/Dbal/AclProviderBenchmarkTest.php b/Tests/Acl/Dbal/AclProviderBenchmarkTest.php index 46f4356..c25a697 100644 --- a/Tests/Acl/Dbal/AclProviderBenchmarkTest.php +++ b/Tests/Acl/Dbal/AclProviderBenchmarkTest.php @@ -32,10 +32,6 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase protected function setUp() { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The "Doctrine DBAL" library is not available'); - } - try { $this->con = DriverManager::getConnection(array( 'driver' => 'pdo_mysql', diff --git a/Tests/Acl/Dbal/AclProviderTest.php b/Tests/Acl/Dbal/AclProviderTest.php index ad58d72..d701e22 100644 --- a/Tests/Acl/Dbal/AclProviderTest.php +++ b/Tests/Acl/Dbal/AclProviderTest.php @@ -141,9 +141,6 @@ class AclProviderTest extends \PHPUnit_Framework_TestCase protected function setUp() { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) { self::markTestSkipped('This test requires SQLite support in your environment'); } diff --git a/Tests/Acl/Dbal/MutableAclProviderTest.php b/Tests/Acl/Dbal/MutableAclProviderTest.php index 21ea670..faa9261 100644 --- a/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -483,9 +483,6 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase protected function setUp() { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) { self::markTestSkipped('This test requires SQLite support in your environment'); } diff --git a/Tests/Acl/Domain/AclTest.php b/Tests/Acl/Domain/AclTest.php index 0e88ab8..9be4a94 100644 --- a/Tests/Acl/Domain/AclTest.php +++ b/Tests/Acl/Domain/AclTest.php @@ -510,11 +510,4 @@ class AclTest extends \PHPUnit_Framework_TestCase { return new Acl(1, new ObjectIdentity(1, 'foo'), new PermissionGrantingStrategy(), array(), true); } - - protected function setUp() - { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } - } } diff --git a/Tests/Acl/Domain/DoctrineAclCacheTest.php b/Tests/Acl/Domain/DoctrineAclCacheTest.php index 99eb27e..93c87c1 100644 --- a/Tests/Acl/Domain/DoctrineAclCacheTest.php +++ b/Tests/Acl/Domain/DoctrineAclCacheTest.php @@ -98,11 +98,4 @@ class DoctrineAclCacheTest extends \PHPUnit_Framework_TestCase return new DoctrineAclCache($cacheDriver, $this->getPermissionGrantingStrategy(), $prefix); } - - protected function setUp() - { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } - } } diff --git a/Tests/Acl/Domain/ObjectIdentityTest.php b/Tests/Acl/Domain/ObjectIdentityTest.php index 7aa3cf2..9281fd5 100644 --- a/Tests/Acl/Domain/ObjectIdentityTest.php +++ b/Tests/Acl/Domain/ObjectIdentityTest.php @@ -85,13 +85,6 @@ namespace Symfony\Component\Security\Tests\Acl\Domain array(new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false), ); } - - protected function setUp() - { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } - } } class TestDomainObject diff --git a/Tests/Acl/Domain/PermissionGrantingStrategyTest.php b/Tests/Acl/Domain/PermissionGrantingStrategyTest.php index 4698a72..4935bff 100644 --- a/Tests/Acl/Domain/PermissionGrantingStrategyTest.php +++ b/Tests/Acl/Domain/PermissionGrantingStrategyTest.php @@ -183,11 +183,4 @@ class PermissionGrantingStrategyTest extends \PHPUnit_Framework_TestCase return new Acl($id++, new ObjectIdentity(1, 'Foo'), $strategy, array(), true); } - - protected function setUp() - { - if (!class_exists('Doctrine\DBAL\DriverManager')) { - $this->markTestSkipped('The Doctrine2 DBAL is required for this test'); - } - } } |