From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Sat, 12 Oct 2024 11:28:13 +0100 Subject: Make provider functions static (PHPUnit 11 Fix) Bug-Debian: https://bugs.debian.org/1039838 --- Tests/Dbal/AclProviderBenchmarkTest.php | 3 + Tests/Domain/AclTest.php | 527 --------------------- Tests/Domain/AuditLoggerTest.php | 2 +- Tests/Domain/DoctrineAclCacheTest.php | 2 +- Tests/Domain/ObjectIdentityTest.php | 2 +- Tests/Domain/PermissionGrantingStrategyTest.php | 2 +- Tests/Domain/RoleSecurityIdentityTest.php | 2 +- .../SecurityIdentityRetrievalStrategyTest.php | 4 +- Tests/Domain/UserSecurityIdentityTest.php | 2 +- Tests/Permission/MaskBuilderTest.php | 2 +- Tests/Voter/AclVoterTest.php | 8 +- phpunit.xml.dist | 3 - 12 files changed, 16 insertions(+), 543 deletions(-) delete mode 100644 Tests/Domain/AclTest.php diff --git a/Tests/Dbal/AclProviderBenchmarkTest.php b/Tests/Dbal/AclProviderBenchmarkTest.php index c9eb2f9..685031a 100644 --- a/Tests/Dbal/AclProviderBenchmarkTest.php +++ b/Tests/Dbal/AclProviderBenchmarkTest.php @@ -52,6 +52,9 @@ class AclProviderBenchmarkTest extends TestCase $this->connection = null; } + /** + * @group nophpunit11 + */ public function testFindAcls() { // $this->generateTestData(); diff --git a/Tests/Domain/AclTest.php b/Tests/Domain/AclTest.php deleted file mode 100644 index b296170..0000000 --- a/Tests/Domain/AclTest.php +++ /dev/null @@ -1,527 +0,0 @@ - - * - * 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\Domain; - -use Doctrine\Persistence\PropertyChangedListener; -use PHPUnit\Framework\TestCase; -use Symfony\Component\Security\Acl\Domain\Acl; -use Symfony\Component\Security\Acl\Domain\Entry; -use Symfony\Component\Security\Acl\Domain\ObjectIdentity; -use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; -use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; -use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity; -use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface; - -class AclTest extends TestCase -{ - public function testConstructor() - { - $acl = new Acl(1, $oid = new ObjectIdentity('foo', 'foo'), $permissionStrategy = new PermissionGrantingStrategy(), [], true); - - $this->assertSame(1, $acl->getId()); - $this->assertSame($oid, $acl->getObjectIdentity()); - $this->assertNull($acl->getParentAcl()); - $this->assertTrue($acl->isEntriesInheriting()); - } - - /** - * @dataProvider getDeleteAceTests - */ - public function testDeleteAceThrowsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'delete'.$type.'Ace'}(0); - } - - /** - * @dataProvider getDeleteAceTests - */ - public function testDeleteAce($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type.'Ace'}(new RoleSecurityIdentity('foo'), 1); - $acl->{'insert'.$type.'Ace'}(new RoleSecurityIdentity('foo'), 2, 1); - $acl->{'insert'.$type.'Ace'}(new RoleSecurityIdentity('foo'), 3, 2); - - $listener = $this->getListener([ - $type.'Aces', 'aceOrder', 'aceOrder', $type.'Aces', - ]); - $acl->addPropertyChangedListener($listener); - - $this->assertCount(3, $acl->{'get'.$type.'Aces'}()); - - $acl->{'delete'.$type.'Ace'}(0); - $this->assertCount(2, $aces = $acl->{'get'.$type.'Aces'}()); - $this->assertEquals(2, $aces[0]->getMask()); - $this->assertEquals(3, $aces[1]->getMask()); - - $acl->{'delete'.$type.'Ace'}(1); - $this->assertCount(1, $aces = $acl->{'get'.$type.'Aces'}()); - $this->assertEquals(2, $aces[0]->getMask()); - } - - public function getDeleteAceTests() - { - return [ - ['class'], - ['object'], - ]; - } - - /** - * @dataProvider getDeleteFieldAceTests - */ - public function testDeleteFieldAceThrowsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'delete'.$type.'Ace'}(0, 'foo'); - } - - /** - * @dataProvider getDeleteFieldAceTests - */ - public function testDeleteFieldAce($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type.'Ace'}('foo', new RoleSecurityIdentity('foo'), 1, 0); - $acl->{'insert'.$type.'Ace'}('foo', new RoleSecurityIdentity('foo'), 2, 1); - $acl->{'insert'.$type.'Ace'}('foo', new RoleSecurityIdentity('foo'), 3, 2); - - $listener = $this->getListener([ - $type.'Aces', 'aceOrder', 'aceOrder', $type.'Aces', - ]); - $acl->addPropertyChangedListener($listener); - - $this->assertCount(3, $acl->{'get'.$type.'Aces'}('foo')); - - $acl->{'delete'.$type.'Ace'}(0, 'foo'); - $this->assertCount(2, $aces = $acl->{'get'.$type.'Aces'}('foo')); - $this->assertEquals(2, $aces[0]->getMask()); - $this->assertEquals(3, $aces[1]->getMask()); - - $acl->{'delete'.$type.'Ace'}(1, 'foo'); - $this->assertCount(1, $aces = $acl->{'get'.$type.'Aces'}('foo')); - $this->assertEquals(2, $aces[0]->getMask()); - } - - public function getDeleteFieldAceTests() - { - return [ - ['classField'], - ['objectField'], - ]; - } - - /** - * @dataProvider getInsertAceTests - */ - public function testInsertAce($property, $method) - { - $acl = $this->getAcl(); - - $listener = $this->getListener([ - $property, 'aceOrder', $property, 'aceOrder', $property, - ]); - $acl->addPropertyChangedListener($listener); - - $sid = new RoleSecurityIdentity('foo'); - $acl->$method($sid, 1); - $acl->$method($sid, 2); - $acl->$method($sid, 3, 1, false); - - $this->assertCount(3, $aces = $acl->{'get'.$property}()); - $this->assertEquals(2, $aces[0]->getMask()); - $this->assertEquals(3, $aces[1]->getMask()); - $this->assertEquals(1, $aces[2]->getMask()); - } - - /** - * @dataProvider getInsertAceTests - */ - public function testInsertClassAceThrowsExceptionOnInvalidIndex($property, $method) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->$method(new RoleSecurityIdentity('foo'), 1, 1); - } - - public function getInsertAceTests() - { - return [ - ['classAces', 'insertClassAce'], - ['objectAces', 'insertObjectAce'], - ]; - } - - /** - * @dataProvider getInsertFieldAceTests - */ - public function testInsertClassFieldAce($property, $method) - { - $acl = $this->getAcl(); - - $listener = $this->getListener([ - $property, $property, 'aceOrder', $property, - 'aceOrder', 'aceOrder', $property, - ]); - $acl->addPropertyChangedListener($listener); - - $sid = new RoleSecurityIdentity('foo'); - $acl->$method('foo', $sid, 1); - $acl->$method('foo2', $sid, 1); - $acl->$method('foo', $sid, 3); - $acl->$method('foo', $sid, 2); - - $this->assertCount(3, $aces = $acl->{'get'.$property}('foo')); - $this->assertCount(1, $acl->{'get'.$property}('foo2')); - $this->assertEquals(2, $aces[0]->getMask()); - $this->assertEquals(3, $aces[1]->getMask()); - $this->assertEquals(1, $aces[2]->getMask()); - } - - /** - * @dataProvider getInsertFieldAceTests - */ - public function testInsertClassFieldAceThrowsExceptionOnInvalidIndex($property, $method) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->$method('foo', new RoleSecurityIdentity('foo'), 1, 1); - } - - public function getInsertFieldAceTests() - { - return [ - ['classFieldAces', 'insertClassFieldAce'], - ['objectFieldAces', 'insertObjectFieldAce'], - ]; - } - - public function testIsFieldGranted() - { - $sids = [new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity('ROLE_IDDQD')]; - $masks = [1, 2, 4]; - $strategy = $this->createMock(PermissionGrantingStrategyInterface::class); - $acl = new Acl(1, new ObjectIdentity(1, 'foo'), $strategy, [], true); - - $strategy - ->expects($this->once()) - ->method('isFieldGranted') - ->with($this->equalTo($acl), $this->equalTo('foo'), $this->equalTo($masks), $this->equalTo($sids), $this->isTrue()) - ->willReturn(true) - ; - - $this->assertTrue($acl->isFieldGranted('foo', $masks, $sids, true)); - } - - public function testIsGranted() - { - $sids = [new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity('ROLE_IDDQD')]; - $masks = [1, 2, 4]; - $strategy = $this->createMock(PermissionGrantingStrategyInterface::class); - $acl = new Acl(1, new ObjectIdentity(1, 'foo'), $strategy, [], true); - - $strategy - ->expects($this->once()) - ->method('isGranted') - ->with($this->equalTo($acl), $this->equalTo($masks), $this->equalTo($sids), $this->isTrue()) - ->willReturn(true) - ; - - $this->assertTrue($acl->isGranted($masks, $sids, true)); - } - - public function testSetGetParentAcl() - { - $acl = $this->getAcl(); - $parentAcl = $this->getAcl(); - - $listener = $this->getListener(['parentAcl']); - $acl->addPropertyChangedListener($listener); - - $this->assertNull($acl->getParentAcl()); - $acl->setParentAcl($parentAcl); - $this->assertSame($parentAcl, $acl->getParentAcl()); - - $acl->setParentAcl(null); - $this->assertNull($acl->getParentAcl()); - } - - public function testSetIsEntriesInheriting() - { - $acl = $this->getAcl(); - - $listener = $this->getListener(['entriesInheriting']); - $acl->addPropertyChangedListener($listener); - - $this->assertTrue($acl->isEntriesInheriting()); - $acl->setEntriesInheriting(false); - $this->assertFalse($acl->isEntriesInheriting()); - } - - public function testIsSidLoadedWhenAllSidsAreLoaded() - { - $acl = $this->getAcl(); - - $this->assertTrue($acl->isSidLoaded(new UserSecurityIdentity('foo', 'Foo'))); - $this->assertTrue($acl->isSidLoaded(new RoleSecurityIdentity('ROLE_FOO', 'Foo'))); - } - - public function testIsSidLoaded() - { - $acl = new Acl(1, new ObjectIdentity('1', 'foo'), new PermissionGrantingStrategy(), [new UserSecurityIdentity('foo', 'Foo'), new UserSecurityIdentity('johannes', 'Bar')], true); - - $this->assertTrue($acl->isSidLoaded(new UserSecurityIdentity('foo', 'Foo'))); - $this->assertTrue($acl->isSidLoaded(new UserSecurityIdentity('johannes', 'Bar'))); - $this->assertTrue($acl->isSidLoaded([ - new UserSecurityIdentity('foo', 'Foo'), - new UserSecurityIdentity('johannes', 'Bar'), - ])); - $this->assertFalse($acl->isSidLoaded(new RoleSecurityIdentity('ROLE_FOO'))); - $this->assertFalse($acl->isSidLoaded(new UserSecurityIdentity('schmittjoh@gmail.com', 'Moo'))); - $this->assertFalse($acl->isSidLoaded([ - new UserSecurityIdentity('foo', 'Foo'), - new UserSecurityIdentity('johannes', 'Bar'), - new RoleSecurityIdentity('ROLE_FOO'), - ])); - } - - /** - * @dataProvider getUpdateAceTests - */ - public function testUpdateAceThrowsOutOfBoundsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'update'.$type}(0, 1); - } - - /** - * @dataProvider getUpdateAceTests - */ - public function testUpdateAce($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type}(new RoleSecurityIdentity('foo'), 1); - - $listener = $this->getListener([ - 'mask', 'mask', 'strategy', - ]); - $acl->addPropertyChangedListener($listener); - - $aces = $acl->{'get'.$type.'s'}(); - $ace = reset($aces); - $this->assertEquals(1, $ace->getMask()); - $this->assertEquals('all', $ace->getStrategy()); - - $acl->{'update'.$type}(0, 3); - $this->assertEquals(3, $ace->getMask()); - $this->assertEquals('all', $ace->getStrategy()); - - $acl->{'update'.$type}(0, 1, 'foo'); - $this->assertEquals(1, $ace->getMask()); - $this->assertEquals('foo', $ace->getStrategy()); - } - - public function getUpdateAceTests() - { - return [ - ['classAce'], - ['objectAce'], - ]; - } - - /** - * @dataProvider getUpdateFieldAceTests - */ - public function testUpdateFieldAceThrowsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'update'.$type}(0, 'foo', 1); - } - - /** - * @dataProvider getUpdateFieldAceTests - */ - public function testUpdateFieldAce($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type}('foo', new UserSecurityIdentity('foo', 'Foo'), 1); - - $listener = $this->getListener([ - 'mask', 'mask', 'strategy', - ]); - $acl->addPropertyChangedListener($listener); - - $aces = $acl->{'get'.$type.'s'}('foo'); - $ace = reset($aces); - $this->assertEquals(1, $ace->getMask()); - $this->assertEquals('all', $ace->getStrategy()); - - $acl->{'update'.$type}(0, 'foo', 3); - $this->assertEquals(3, $ace->getMask()); - $this->assertEquals('all', $ace->getStrategy()); - - $acl->{'update'.$type}(0, 'foo', 1, 'foo'); - $this->assertEquals(1, $ace->getMask()); - $this->assertEquals('foo', $ace->getStrategy()); - } - - public function getUpdateFieldAceTests() - { - return [ - ['classFieldAce'], - ['objectFieldAce'], - ]; - } - - /** - * @dataProvider getUpdateAuditingTests - */ - public function testUpdateAuditingThrowsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'update'.$type.'Auditing'}(0, true, false); - } - - /** - * @dataProvider getUpdateAuditingTests - */ - public function testUpdateAuditing($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type.'Ace'}(new RoleSecurityIdentity('foo'), 1); - - $listener = $this->getListener([ - 'auditFailure', 'auditSuccess', 'auditFailure', - ]); - $acl->addPropertyChangedListener($listener); - - $aces = $acl->{'get'.$type.'Aces'}(); - $ace = reset($aces); - $this->assertFalse($ace->isAuditSuccess()); - $this->assertFalse($ace->isAuditFailure()); - - $acl->{'update'.$type.'Auditing'}(0, false, true); - $this->assertFalse($ace->isAuditSuccess()); - $this->assertTrue($ace->isAuditFailure()); - - $acl->{'update'.$type.'Auditing'}(0, true, false); - $this->assertTrue($ace->isAuditSuccess()); - $this->assertFalse($ace->isAuditFailure()); - } - - public function getUpdateAuditingTests() - { - return [ - ['class'], - ['object'], - ]; - } - - /** - * @dataProvider getUpdateFieldAuditingTests - */ - public function testUpdateFieldAuditingThrowsExceptionOnInvalidField($type) - { - $acl = $this->getAcl(); - - $this->expectException(\InvalidArgumentException::class); - $acl->{'update'.$type.'Auditing'}(0, 'foo', true, true); - } - - /** - * @dataProvider getUpdateFieldAuditingTests - */ - public function testUpdateFieldAuditingThrowsExceptionOnInvalidIndex($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type.'Ace'}('foo', new RoleSecurityIdentity('foo'), 1); - - $this->expectException(\OutOfBoundsException::class); - $acl->{'update'.$type.'Auditing'}(1, 'foo', true, false); - } - - /** - * @dataProvider getUpdateFieldAuditingTests - */ - public function testUpdateFieldAuditing($type) - { - $acl = $this->getAcl(); - $acl->{'insert'.$type.'Ace'}('foo', new RoleSecurityIdentity('foo'), 1); - - $listener = $this->getListener([ - 'auditSuccess', 'auditSuccess', 'auditFailure', - ]); - $acl->addPropertyChangedListener($listener); - - $aces = $acl->{'get'.$type.'Aces'}('foo'); - $ace = reset($aces); - $this->assertFalse($ace->isAuditSuccess()); - $this->assertFalse($ace->isAuditFailure()); - - $acl->{'update'.$type.'Auditing'}(0, 'foo', true, false); - $this->assertTrue($ace->isAuditSuccess()); - $this->assertFalse($ace->isAuditFailure()); - - $acl->{'update'.$type.'Auditing'}(0, 'foo', false, true); - $this->assertFalse($ace->isAuditSuccess()); - $this->assertTrue($ace->isAuditFailure()); - } - - public function getUpdateFieldAuditingTests() - { - return [ - ['classField'], - ['objectField'], - ]; - } - - protected function getListener($expectedChanges) - { - $aceProperties = ['aceOrder', 'mask', 'strategy', 'auditSuccess', 'auditFailure']; - - $arguments = []; - $listener = $this->createMock(PropertyChangedListener::class); - foreach ($expectedChanges as $index => $property) { - if (\in_array($property, $aceProperties)) { - $class = Entry::class; - } else { - $class = Acl::class; - } - - $arguments[] = [$this->isInstanceOf($class), $this->equalTo($property)]; - } - $listener - ->method('propertyChanged') - ->withConsecutive(...$arguments) - ; - - return $listener; - } - - protected function getAcl() - { - return new Acl(1, new ObjectIdentity(1, 'foo'), new PermissionGrantingStrategy(), [], true); - } -} diff --git a/Tests/Domain/AuditLoggerTest.php b/Tests/Domain/AuditLoggerTest.php index afe886d..95b1f4a 100644 --- a/Tests/Domain/AuditLoggerTest.php +++ b/Tests/Domain/AuditLoggerTest.php @@ -65,7 +65,7 @@ class AuditLoggerTest extends TestCase $logger->logIfNeeded($granting, $ace); } - public function getTestLogData() + public static function getTestLogData() { return [ [true, false], diff --git a/Tests/Domain/DoctrineAclCacheTest.php b/Tests/Domain/DoctrineAclCacheTest.php index 58d83d0..1d2c6a6 100644 --- a/Tests/Domain/DoctrineAclCacheTest.php +++ b/Tests/Domain/DoctrineAclCacheTest.php @@ -34,7 +34,7 @@ class DoctrineAclCacheTest extends TestCase new DoctrineAclCache(DoctrineProvider::wrap(new ArrayAdapter()), $this->getPermissionGrantingStrategy(), $empty); } - public function getEmptyValue() + public static function getEmptyValue() { return [ [null], diff --git a/Tests/Domain/ObjectIdentityTest.php b/Tests/Domain/ObjectIdentityTest.php index 1d7f8e9..3a86db3 100644 --- a/Tests/Domain/ObjectIdentityTest.php +++ b/Tests/Domain/ObjectIdentityTest.php @@ -97,7 +97,7 @@ namespace Symfony\Component\Security\Acl\Tests\Domain } } - public function getCompareData() + public static function getCompareData() { return [ [new ObjectIdentity('123', 'foo'), new ObjectIdentity('123', 'foo'), true], diff --git a/Tests/Domain/PermissionGrantingStrategyTest.php b/Tests/Domain/PermissionGrantingStrategyTest.php index 33bc7e0..d7225e2 100644 --- a/Tests/Domain/PermissionGrantingStrategyTest.php +++ b/Tests/Domain/PermissionGrantingStrategyTest.php @@ -160,7 +160,7 @@ class PermissionGrantingStrategyTest extends TestCase } } - public function getAllStrategyTests() + public static function getAllStrategyTests() { return [ ['all', 1 << 0 | 1 << 1, 1 << 0, true], diff --git a/Tests/Domain/RoleSecurityIdentityTest.php b/Tests/Domain/RoleSecurityIdentityTest.php index b0dc640..c82f6c3 100644 --- a/Tests/Domain/RoleSecurityIdentityTest.php +++ b/Tests/Domain/RoleSecurityIdentityTest.php @@ -37,7 +37,7 @@ class RoleSecurityIdentityTest extends TestCase } } - public function getCompareData(): array + public static function getCompareData(): array { return [ [new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity('ROLE_FOO'), true], diff --git a/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php b/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php index edc56f1..cc0ed6f 100644 --- a/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php +++ b/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php @@ -129,7 +129,7 @@ class SecurityIdentityRetrievalStrategyTest extends TestCase } } - public function getSecurityIdentityRetrievalTests(): array + public static function getSecurityIdentityRetrievalTests(): array { $anonymousRoles = [new RoleSecurityIdentity('IS_AUTHENTICATED_ANONYMOUSLY')]; if (\defined('\Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter::PUBLIC_ACCESS')) { @@ -159,7 +159,7 @@ class SecurityIdentityRetrievalStrategyTest extends TestCase ]; } - public function getDeprecatedSecurityIdentityRetrievalTests() + public static function getDeprecatedSecurityIdentityRetrievalTests() { $anonymousRoles = [new RoleSecurityIdentity('IS_AUTHENTICATED_ANONYMOUSLY')]; if (\defined('\Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter::PUBLIC_ACCESS')) { diff --git a/Tests/Domain/UserSecurityIdentityTest.php b/Tests/Domain/UserSecurityIdentityTest.php index 602a78b..6b8d529 100644 --- a/Tests/Domain/UserSecurityIdentityTest.php +++ b/Tests/Domain/UserSecurityIdentityTest.php @@ -37,7 +37,7 @@ class UserSecurityIdentityTest extends \PHPUnit\Framework\TestCase } /** - * @dataProvider getCompareData + * @group nophpunit11 */ public function testEquals(UserSecurityIdentity $id1, SecurityIdentityInterface $id2, bool $equal) { diff --git a/Tests/Permission/MaskBuilderTest.php b/Tests/Permission/MaskBuilderTest.php index ed545ea..9203fb6 100644 --- a/Tests/Permission/MaskBuilderTest.php +++ b/Tests/Permission/MaskBuilderTest.php @@ -25,7 +25,7 @@ class MaskBuilderTest extends \PHPUnit\Framework\TestCase new MaskBuilder($invalidMask); } - public function getInvalidConstructorData() + public static function getInvalidConstructorData() { return [ [234.463], diff --git a/Tests/Voter/AclVoterTest.php b/Tests/Voter/AclVoterTest.php index a596810..c652ca4 100644 --- a/Tests/Voter/AclVoterTest.php +++ b/Tests/Voter/AclVoterTest.php @@ -56,7 +56,7 @@ class AclVoterTest extends TestCase $this->assertFalse($voter->supportsAttribute($attribute)); } - public function getSupportsAttributeTests() + public static function getSupportsAttributeTests() { return [ ['foo', true], @@ -64,7 +64,7 @@ class AclVoterTest extends TestCase ]; } - public function getSupportsAttributeNonStringTests() + public static function getSupportsAttributeNonStringTests() { return [ [new \stdClass()], @@ -84,7 +84,7 @@ class AclVoterTest extends TestCase $this->assertTrue($voter->supportsClass($class)); } - public function getSupportsClassTests() + public static function getSupportsClassTests() { return [ ['foo'], @@ -153,7 +153,7 @@ class AclVoterTest extends TestCase $this->assertSame($vote, $voter->vote($this->getToken(), new \stdClass(), ['VIEW'])); } - public function getTrueFalseTests() + public static function getTrueFalseTests() { return [[true], [false]]; } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 14d4060..7fdf34f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -31,7 +31,4 @@ benchmark - - -