diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-12 11:20:33 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-12 11:20:33 +0200 |
| commit | 299eb573f3d41d26eab46fcc164e7934fbd5d653 (patch) | |
| tree | fa17b1ca5d119be54e6617b482fb1dc571b014a1 | |
| parent | 3b7b49f54fdba7817b679f6660ae9cbaecac391e (diff) | |
| parent | 01c92f979f9a7b83457045bc562098604adbd454 (diff) | |
| download | symfony-security-299eb573f3d41d26eab46fcc164e7934fbd5d653.zip symfony-security-299eb573f3d41d26eab46fcc164e7934fbd5d653.tar.gz symfony-security-299eb573f3d41d26eab46fcc164e7934fbd5d653.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
[ci] Fix tests requirements
Conflicts:
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
| -rw-r--r-- | Acl/Tests/Dbal/AclProviderTest.php | 7 | ||||
| -rw-r--r-- | Acl/Tests/Dbal/MutableAclProviderTest.php | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Acl/Tests/Dbal/AclProviderTest.php b/Acl/Tests/Dbal/AclProviderTest.php index becfb51..680c6c3 100644 --- a/Acl/Tests/Dbal/AclProviderTest.php +++ b/Acl/Tests/Dbal/AclProviderTest.php @@ -17,6 +17,9 @@ use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Dbal\Schema; use Doctrine\DBAL\DriverManager; +/** + * @requires extension pdo_sqlite + */ class AclProviderTest extends \PHPUnit_Framework_TestCase { protected $con; @@ -141,10 +144,6 @@ class AclProviderTest extends \PHPUnit_Framework_TestCase 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, diff --git a/Acl/Tests/Dbal/MutableAclProviderTest.php b/Acl/Tests/Dbal/MutableAclProviderTest.php index 37e1d77..c2169e4 100644 --- a/Acl/Tests/Dbal/MutableAclProviderTest.php +++ b/Acl/Tests/Dbal/MutableAclProviderTest.php @@ -27,6 +27,9 @@ use Symfony\Component\Security\Acl\Dbal\Schema; use Doctrine\DBAL\DriverManager; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; +/** + * @requires extension pdo_sqlite + */ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase { protected $con; @@ -513,10 +516,6 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase 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, |