From cb8b152dcc049c15d2a55b5630e1462dffa65fe0 Mon Sep 17 00:00:00 2001 From: Bertrand Gauthier Date: Thu, 14 Mar 2019 21:04:29 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20de=20correction=20des=20tests=20un?= =?UTF-8?q?itaires=20pour=20phpunit=20v7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/UnicaenAuthTest/Acl/NamedRoleTest.php | 4 ++-- .../Authentication/Adapter/AbstractFactoryTest.php | 4 ++-- tests/UnicaenAuthTest/Authentication/Adapter/CasTest.php | 4 ++-- tests/UnicaenAuthTest/Authentication/Adapter/DbTest.php | 4 ++-- tests/UnicaenAuthTest/Authentication/Adapter/LdapTest.php | 4 ++-- .../Authentication/Storage/ChainEventTest.php | 4 ++-- .../Authentication/Storage/ChainServiceFactoryTest.php | 2 +- .../UnicaenAuthTest/Authentication/Storage/ChainTest.php | 2 +- tests/UnicaenAuthTest/Authentication/Storage/DbTest.php | 4 ++-- tests/UnicaenAuthTest/Authentication/Storage/LdapTest.php | 4 ++-- tests/UnicaenAuthTest/Entity/Db/RoleTest.php | 4 ++-- tests/UnicaenAuthTest/Entity/Db/UserTest.php | 4 ++-- tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php | 6 +++--- tests/UnicaenAuthTest/Options/ModuleOptionsTest.php | 8 ++++---- .../Provider/Identity/BaseServiceFactoryTest.php | 4 ++-- tests/UnicaenAuthTest/Provider/Identity/BaseTest.php | 4 ++-- .../Provider/Identity/ChainServiceFactoryTest.php | 4 ++-- tests/UnicaenAuthTest/Provider/Identity/ChainTest.php | 4 ++-- .../Provider/Role/BaseServiceFactoryTest.php | 4 ++-- tests/UnicaenAuthTest/Provider/Role/ConfigTest.php | 4 ++-- tests/UnicaenAuthTest/Provider/Role/DbTest.php | 4 ++-- tests/UnicaenAuthTest/Service/UserTest.php | 4 ++-- tests/UnicaenAuthTest/View/Helper/UserAbstractTest.php | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/tests/UnicaenAuthTest/Acl/NamedRoleTest.php b/tests/UnicaenAuthTest/Acl/NamedRoleTest.php index be8e2e9..8c8a85e 100644 --- a/tests/UnicaenAuthTest/Acl/NamedRoleTest.php +++ b/tests/UnicaenAuthTest/Acl/NamedRoleTest.php @@ -1,7 +1,7 @@ */ -class NamedRoleTest extends PHPUnit_Framework_TestCase +class NamedRoleTest extends TestCase { public function testCanConstructWithoutName() { diff --git a/tests/UnicaenAuthTest/Authentication/Adapter/AbstractFactoryTest.php b/tests/UnicaenAuthTest/Authentication/Adapter/AbstractFactoryTest.php index 19bc6e1..10d213c 100644 --- a/tests/UnicaenAuthTest/Authentication/Adapter/AbstractFactoryTest.php +++ b/tests/UnicaenAuthTest/Authentication/Adapter/AbstractFactoryTest.php @@ -1,7 +1,7 @@ */ -class AbstractFactoryTest extends PHPUnit_Framework_TestCase +class AbstractFactoryTest extends TestCase { protected $factory; diff --git a/tests/UnicaenAuthTest/Authentication/Adapter/CasTest.php b/tests/UnicaenAuthTest/Authentication/Adapter/CasTest.php index f7343fa..9777d28 100644 --- a/tests/UnicaenAuthTest/Authentication/Adapter/CasTest.php +++ b/tests/UnicaenAuthTest/Authentication/Adapter/CasTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Authentication\Adapter; use CAS_GracefullTerminationException; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenApp\Exception; use UnicaenAuth\Authentication\Adapter\Cas; use Zend\EventManager\EventManager; @@ -18,7 +18,7 @@ require_once __VENDOR_DIR__ . '/intouch/phpcas/CAS.php'; * * @author Bertrand GAUTHIER */ -class CasTest extends PHPUnit_Framework_TestCase +class CasTest extends TestCase { protected $adapter; protected $moduleOptions; diff --git a/tests/UnicaenAuthTest/Authentication/Adapter/DbTest.php b/tests/UnicaenAuthTest/Authentication/Adapter/DbTest.php index 9e51e3f..88230d1 100644 --- a/tests/UnicaenAuthTest/Authentication/Adapter/DbTest.php +++ b/tests/UnicaenAuthTest/Authentication/Adapter/DbTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Authentication\Adapter; use PDOException; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenAuth\Authentication\Adapter\Db; use UnicaenAuth\Options\ModuleOptions; use Zend\Http\PhpEnvironment\Request; @@ -15,7 +15,7 @@ use ZfcUser\Authentication\Adapter\AdapterChainEvent; * * @author Bertrand GAUTHIER */ -class DbTest extends PHPUnit_Framework_TestCase +class DbTest extends TestCase { protected $adapter; protected $moduleOptions; diff --git a/tests/UnicaenAuthTest/Authentication/Adapter/LdapTest.php b/tests/UnicaenAuthTest/Authentication/Adapter/LdapTest.php index 38396ca..01e68b7 100644 --- a/tests/UnicaenAuthTest/Authentication/Adapter/LdapTest.php +++ b/tests/UnicaenAuthTest/Authentication/Adapter/LdapTest.php @@ -1,7 +1,7 @@ */ -class LdapTest extends PHPUnit_Framework_TestCase +class LdapTest extends TestCase { protected $adapter; protected $appModuleOptions; diff --git a/tests/UnicaenAuthTest/Authentication/Storage/ChainEventTest.php b/tests/UnicaenAuthTest/Authentication/Storage/ChainEventTest.php index 010219b..cacc15d 100644 --- a/tests/UnicaenAuthTest/Authentication/Storage/ChainEventTest.php +++ b/tests/UnicaenAuthTest/Authentication/Storage/ChainEventTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Authentication\Storage; use PDOException; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenAuth\Authentication\Storage\Db; use Zend\ServiceManager\Exception\ServiceNotFoundException; use ZfcUser\Entity\User; @@ -13,7 +13,7 @@ use UnicaenAuth\Authentication\Storage\ChainEvent; * * @author Bertrand GAUTHIER */ -class ChainEventTest extends PHPUnit_Framework_TestCase +class ChainEventTest extends TestCase { protected $event; diff --git a/tests/UnicaenAuthTest/Authentication/Storage/ChainServiceFactoryTest.php b/tests/UnicaenAuthTest/Authentication/Storage/ChainServiceFactoryTest.php index a0010a9..ae3a08c 100644 --- a/tests/UnicaenAuthTest/Authentication/Storage/ChainServiceFactoryTest.php +++ b/tests/UnicaenAuthTest/Authentication/Storage/ChainServiceFactoryTest.php @@ -9,7 +9,7 @@ use UnicaenAuth\Authentication\Storage\ChainServiceFactory; * * @author Bertrand GAUTHIER */ -class ChainServiceFactoryTest extends \PHPUnit_Framework_TestCase +class ChainServiceFactoryTest extends \PHPUnit\Framework\TestCase { protected $serviceLocator; protected $eventManager; diff --git a/tests/UnicaenAuthTest/Authentication/Storage/ChainTest.php b/tests/UnicaenAuthTest/Authentication/Storage/ChainTest.php index ab70c82..665fd18 100644 --- a/tests/UnicaenAuthTest/Authentication/Storage/ChainTest.php +++ b/tests/UnicaenAuthTest/Authentication/Storage/ChainTest.php @@ -9,7 +9,7 @@ use UnicaenAuth\Authentication\Storage\Chain; * * @author Bertrand GAUTHIER */ -class ChainTest extends \PHPUnit_Framework_TestCase +class ChainTest extends \PHPUnit\Framework\TestCase { protected $storage; protected $innerStorage; diff --git a/tests/UnicaenAuthTest/Authentication/Storage/DbTest.php b/tests/UnicaenAuthTest/Authentication/Storage/DbTest.php index 88aaa18..b082054 100644 --- a/tests/UnicaenAuthTest/Authentication/Storage/DbTest.php +++ b/tests/UnicaenAuthTest/Authentication/Storage/DbTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Authentication\Storage; use PDOException; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenAuth\Authentication\Storage\Db; use Zend\ServiceManager\Exception\ServiceNotFoundException; use Zend\ServiceManager\ServiceManager; @@ -14,7 +14,7 @@ use UnicaenAuth\Authentication\Storage\ChainEvent; * * @author Bertrand GAUTHIER */ -class DbTest extends PHPUnit_Framework_TestCase +class DbTest extends TestCase { protected $storage; protected $serviceManager; diff --git a/tests/UnicaenAuthTest/Authentication/Storage/LdapTest.php b/tests/UnicaenAuthTest/Authentication/Storage/LdapTest.php index eb57ca6..449b847 100644 --- a/tests/UnicaenAuthTest/Authentication/Storage/LdapTest.php +++ b/tests/UnicaenAuthTest/Authentication/Storage/LdapTest.php @@ -1,7 +1,7 @@ */ -class LdapTest extends PHPUnit_Framework_TestCase +class LdapTest extends TestCase { protected $storage; protected $mapper; diff --git a/tests/UnicaenAuthTest/Entity/Db/RoleTest.php b/tests/UnicaenAuthTest/Entity/Db/RoleTest.php index 73a6bc4..243a1ff 100644 --- a/tests/UnicaenAuthTest/Entity/Db/RoleTest.php +++ b/tests/UnicaenAuthTest/Entity/Db/RoleTest.php @@ -3,14 +3,14 @@ namespace UnicaenAuthTest\Entity\Db; use UnicaenAuth\Entity\Db\Role; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Description of UserTest * * @author Bertrand GAUTHIER */ -class RoleTest extends PHPUnit_Framework_TestCase +class RoleTest extends TestCase { protected $role; diff --git a/tests/UnicaenAuthTest/Entity/Db/UserTest.php b/tests/UnicaenAuthTest/Entity/Db/UserTest.php index 0276f65..d510037 100644 --- a/tests/UnicaenAuthTest/Entity/Db/UserTest.php +++ b/tests/UnicaenAuthTest/Entity/Db/UserTest.php @@ -3,14 +3,14 @@ namespace UnicaenAuthTest\Entity\Db; use UnicaenAuth\Entity\Db\User; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Description of UserTest * * @author Bertrand GAUTHIER */ -class UserTest extends PHPUnit_Framework_TestCase +class UserTest extends TestCase { protected $user; diff --git a/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php b/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php index 8ba2660..089c94b 100644 --- a/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php +++ b/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php @@ -10,7 +10,7 @@ use UnicaenAppTest\Entity\Ldap\TestAsset\People as PeopleTestAsset; * * @author Bertrand GAUTHIER */ -class PeopleTest extends \PHPUnit_Framework_TestCase +class PeopleTest extends \PHPUnit\Framework\TestCase { protected $entity; @@ -58,7 +58,7 @@ class PeopleTest extends \PHPUnit_Framework_TestCase public function testGetDisplayNameReturnsString() { - $this->assertInternalType('string', $this->entity->getDisplayName()); + $this->assertIsString($this->entity->getDisplayName()); $this->assertNotEmpty($this->entity->getDisplayName()); } @@ -72,7 +72,7 @@ class PeopleTest extends \PHPUnit_Framework_TestCase public function testGetEmailReturnsString() { - $this->assertInternalType('string', $this->entity->getEmail()); + $this->assertIsString($this->entity->getEmail()); $this->assertNotEmpty($this->entity->getEmail()); } diff --git a/tests/UnicaenAuthTest/Options/ModuleOptionsTest.php b/tests/UnicaenAuthTest/Options/ModuleOptionsTest.php index 7ad5465..4fe7712 100644 --- a/tests/UnicaenAuthTest/Options/ModuleOptionsTest.php +++ b/tests/UnicaenAuthTest/Options/ModuleOptionsTest.php @@ -1,7 +1,7 @@ */ -class ModuleOptionsTest extends PHPUnit_Framework_TestCase +class ModuleOptionsTest extends TestCase { protected $options; @@ -31,10 +31,10 @@ class ModuleOptionsTest extends PHPUnit_Framework_TestCase { $options = new ModuleOptions(); - $this->assertInternalType('array', $array = $options->getUsurpationAllowedUsernames()); + $this->assertIsArray($array = $options->getUsurpationAllowedUsernames()); $this->assertEmpty($array); - $this->assertInternalType('array', $array = $options->getCas()); + $this->assertIsArray($array = $options->getCas()); $this->assertEmpty($array); $this->assertFalse($this->options->getSaveLdapUserInDatabase()); diff --git a/tests/UnicaenAuthTest/Provider/Identity/BaseServiceFactoryTest.php b/tests/UnicaenAuthTest/Provider/Identity/BaseServiceFactoryTest.php index aa109b5..6dbfea9 100644 --- a/tests/UnicaenAuthTest/Provider/Identity/BaseServiceFactoryTest.php +++ b/tests/UnicaenAuthTest/Provider/Identity/BaseServiceFactoryTest.php @@ -2,14 +2,14 @@ namespace UnicaenAuthTest\Provider\Identity; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Description of BaseServiceFactoryTest * * @author Bertrand GAUTHIER */ -abstract class BaseServiceFactoryTest extends PHPUnit_Framework_TestCase +abstract class BaseServiceFactoryTest extends TestCase { protected $serviceLocator; protected $userService; diff --git a/tests/UnicaenAuthTest/Provider/Identity/BaseTest.php b/tests/UnicaenAuthTest/Provider/Identity/BaseTest.php index dbaa293..f5d15fc 100644 --- a/tests/UnicaenAuthTest/Provider/Identity/BaseTest.php +++ b/tests/UnicaenAuthTest/Provider/Identity/BaseTest.php @@ -1,7 +1,7 @@ */ -abstract class BaseTest extends PHPUnit_Framework_TestCase +abstract class BaseTest extends TestCase { protected $providerClass; protected $provider; diff --git a/tests/UnicaenAuthTest/Provider/Identity/ChainServiceFactoryTest.php b/tests/UnicaenAuthTest/Provider/Identity/ChainServiceFactoryTest.php index f953e62..1b5d5c4 100644 --- a/tests/UnicaenAuthTest/Provider/Identity/ChainServiceFactoryTest.php +++ b/tests/UnicaenAuthTest/Provider/Identity/ChainServiceFactoryTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Provider\Identity; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenAuth\Provider\Identity\ChainServiceFactory; /** @@ -10,7 +10,7 @@ use UnicaenAuth\Provider\Identity\ChainServiceFactory; * * @author Bertrand GAUTHIER */ -class ChainServiceFactoryTest extends PHPUnit_Framework_TestCase +class ChainServiceFactoryTest extends TestCase { protected $serviceLocator; protected $eventManager; diff --git a/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php b/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php index b9692d1..61ba53f 100644 --- a/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php +++ b/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php @@ -1,7 +1,7 @@ */ -class ChainTest extends PHPUnit_Framework_TestCase +class ChainTest extends TestCase { protected $provider; protected $authorize; diff --git a/tests/UnicaenAuthTest/Provider/Role/BaseServiceFactoryTest.php b/tests/UnicaenAuthTest/Provider/Role/BaseServiceFactoryTest.php index bed4a74..11435df 100644 --- a/tests/UnicaenAuthTest/Provider/Role/BaseServiceFactoryTest.php +++ b/tests/UnicaenAuthTest/Provider/Role/BaseServiceFactoryTest.php @@ -2,14 +2,14 @@ namespace UnicaenAuthTest\Provider\Role; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Description of ConfigServiceFactoryTest * * @author Bertrand GAUTHIER */ -abstract class BaseServiceFactoryTest extends PHPUnit_Framework_TestCase +abstract class BaseServiceFactoryTest extends TestCase { protected $serviceLocator; protected $factoryClass; diff --git a/tests/UnicaenAuthTest/Provider/Role/ConfigTest.php b/tests/UnicaenAuthTest/Provider/Role/ConfigTest.php index ff49094..0b019ef 100644 --- a/tests/UnicaenAuthTest/Provider/Role/ConfigTest.php +++ b/tests/UnicaenAuthTest/Provider/Role/ConfigTest.php @@ -1,7 +1,7 @@ */ -class ConfigTest extends PHPUnit_Framework_TestCase +class ConfigTest extends TestCase { protected $mapper; diff --git a/tests/UnicaenAuthTest/Provider/Role/DbTest.php b/tests/UnicaenAuthTest/Provider/Role/DbTest.php index ab05e30..63a0206 100644 --- a/tests/UnicaenAuthTest/Provider/Role/DbTest.php +++ b/tests/UnicaenAuthTest/Provider/Role/DbTest.php @@ -2,7 +2,7 @@ namespace UnicaenAuthTest\Provider\Role; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use UnicaenAuth\Provider\Role\DbRole; use BjyAuthorize\Provider\Role\ObjectRepositoryProvider; @@ -11,7 +11,7 @@ use BjyAuthorize\Provider\Role\ObjectRepositoryProvider; * * @author Bertrand GAUTHIER */ -class DbTest extends PHPUnit_Framework_TestCase +class DbTest extends TestCase { protected $provider; protected $objectRepository; diff --git a/tests/UnicaenAuthTest/Service/UserTest.php b/tests/UnicaenAuthTest/Service/UserTest.php index 0213559..7df3d1e 100644 --- a/tests/UnicaenAuthTest/Service/UserTest.php +++ b/tests/UnicaenAuthTest/Service/UserTest.php @@ -1,7 +1,7 @@ */ -class UserTest extends PHPUnit_Framework_TestCase +class UserTest extends TestCase { protected $service; protected $authModuleOptions; diff --git a/tests/UnicaenAuthTest/View/Helper/UserAbstractTest.php b/tests/UnicaenAuthTest/View/Helper/UserAbstractTest.php index ca22d78..5e72ace 100644 --- a/tests/UnicaenAuthTest/View/Helper/UserAbstractTest.php +++ b/tests/UnicaenAuthTest/View/Helper/UserAbstractTest.php @@ -1,7 +1,7 @@ */ -class UserAbstractTest extends PHPUnit_Framework_TestCase +class UserAbstractTest extends TestCase { protected $helper; protected $authService; -- GitLab