Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 0e0bddb

Browse files
committed
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
2 parents 21d3991 + 58c7534 commit 0e0bddb

37 files changed

+1
-323
lines changed

Tests/Acl/Dbal/AclProviderBenchmarkTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
3232

3333
protected function setUp()
3434
{
35-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
36-
$this->markTestSkipped('The "Doctrine DBAL" library is not available');
37-
}
38-
3935
try {
4036
$this->con = DriverManager::getConnection(array(
4137
'driver' => 'pdo_mysql',

Tests/Acl/Dbal/AclProviderTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ public function testFindAcl()
141141

142142
protected function setUp()
143143
{
144-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
145-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
146-
}
147144
if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
148145
self::markTestSkipped('This test requires SQLite support in your environment');
149146
}

Tests/Acl/Dbal/MutableAclProviderTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,6 @@ protected function callMethod($object, $method, array $args)
483483

484484
protected function setUp()
485485
{
486-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
487-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
488-
}
489486
if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
490487
self::markTestSkipped('This test requires SQLite support in your environment');
491488
}

Tests/Acl/Domain/AclTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -510,11 +510,4 @@ protected function getAcl()
510510
{
511511
return new Acl(1, new ObjectIdentity(1, 'foo'), new PermissionGrantingStrategy(), array(), true);
512512
}
513-
514-
protected function setUp()
515-
{
516-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
517-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
518-
}
519-
}
520513
}

Tests/Acl/Domain/DoctrineAclCacheTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,4 @@ protected function getCache($cacheDriver = null, $prefix = DoctrineAclCache::PRE
9898

9999
return new DoctrineAclCache($cacheDriver, $this->getPermissionGrantingStrategy(), $prefix);
100100
}
101-
102-
protected function setUp()
103-
{
104-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
105-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
106-
}
107-
}
108101
}

Tests/Acl/Domain/ObjectIdentityTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@ public function getCompareData()
8585
array(new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false),
8686
);
8787
}
88-
89-
protected function setUp()
90-
{
91-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
92-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
93-
}
94-
}
9588
}
9689

9790
class TestDomainObject

Tests/Acl/Domain/PermissionGrantingStrategyTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,4 @@ protected function getAcl($strategy)
183183

184184
return new Acl($id++, new ObjectIdentity(1, 'Foo'), $strategy, array(), true);
185185
}
186-
187-
protected function setUp()
188-
{
189-
if (!class_exists('Doctrine\DBAL\DriverManager')) {
190-
$this->markTestSkipped('The Doctrine2 DBAL is required for this test');
191-
}
192-
}
193186
}

Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ class UserPasswordValidatorTest extends \PHPUnit_Framework_TestCase
2323

2424
protected function setUp()
2525
{
26-
if (false === class_exists('Symfony\Component\Validator\Validator')) {
27-
$this->markTestSkipped('The Validator component is required for this test.');
28-
}
29-
3026
$this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false);
3127
}
3228

Tests/Http/AccessMapTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515

1616
class AccessMapTest extends \PHPUnit_Framework_TestCase
1717
{
18-
protected function setUp()
19-
{
20-
if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
21-
$this->markTestSkipped('The "HttpFoundation" component is not available');
22-
}
23-
}
24-
2518
public function testReturnsFirstMatchedPattern()
2619
{
2720
$request = $this->getMock('Symfony\Component\HttpFoundation\Request');

Tests/Http/Authentication/DefaultAuthenticationFailureHandlerTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCas
3131

3232
protected function setUp()
3333
{
34-
if (!class_exists('Symfony\Component\HttpKernel\HttpKernel')) {
35-
$this->markTestSkipped('The "HttpKernel" component is not available');
36-
}
37-
38-
if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
39-
$this->markTestSkipped('The "HttpFoundation" component is not available');
40-
}
41-
42-
if (!interface_exists('Psr\Log\LoggerInterface')) {
43-
$this->markTestSkipped('The "LoggerInterface" is not available');
44-
}
45-
4634
$this->httpKernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
4735
$this->httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
4836
$this->logger = $this->getMock('Psr\Log\LoggerInterface');

0 commit comments

Comments
 (0)