Commit 72a339ad authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Début de correction des tests unitaires pour phpunit v7.

parent dc864987
Loading
Loading
Loading
Loading
+2 −2
Changes for tests/BjyAuthorizeTest/Acl/RoleTest.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@

namespace BjyAuthorizeTest\Acl;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use BjyAuthorize\Acl\Role;
use stdClass;

@@ -17,7 +17,7 @@ use stdClass;
 *
 * @author Marco Pivetta <ocramius@gmail.com>
 */
class RoleTest extends PHPUnit_Framework_TestCase
class RoleTest extends TestCase
{
    /**
     * @covers \BjyAuthorize\Acl\Role::__construct
+5 −5
Changes for tests/BjyAuthorizeTest/Collector/RoleCollectorTest.php: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@
namespace BjyAuthorizeTest\Collector;

use BjyAuthorize\Collector\RoleCollector;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
 * Tests for {@see \BjyAuthorize\Collector\RoleCollector}
 *
 * @author Marco Pivetta <ocramius@gmail.com>
 */
class RoleCollectorTest extends PHPUnit_Framework_TestCase
class RoleCollectorTest extends TestCase
{
    /**
     * @var \BjyAuthorize\Collector\RoleCollector
@@ -24,7 +24,7 @@ class RoleCollectorTest extends PHPUnit_Framework_TestCase
    protected $collector;

    /**
     * @var \PHPUnit_Framework_MockObject_MockObject|\BjyAuthorize\Provider\Identity\ProviderInterface
     * @var \PHPUnit\Framework\MockObject\MockObject|\BjyAuthorize\Provider\Identity\ProviderInterface
     */
    protected $identityProvider;

@@ -130,7 +130,7 @@ class RoleCollectorTest extends PHPUnit_Framework_TestCase
     */
    public function testGetName()
    {
        $this->assertInternalType('string', $this->collector->getName());
        $this->assertIsString($this->collector->getName());
    }

    /**
@@ -138,6 +138,6 @@ class RoleCollectorTest extends PHPUnit_Framework_TestCase
     */
    public function testGetPriority()
    {
        $this->assertInternalType('integer', $this->collector->getPriority());
        $this->assertIsInt($this->collector->getPriority());
    }
}
+2 −2
Changes for tests/BjyAuthorizeTest/Controller/Plugin/IsAllowedTest.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@

namespace BjyAuthorizeTest\Controller\Plugin;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use BjyAuthorize\Controller\Plugin\IsAllowed;

/**
@@ -16,7 +16,7 @@ use BjyAuthorize\Controller\Plugin\IsAllowed;
 *
 * @author Marco Pivetta <ocramius@gmail.com>
 */
class IsAllowedTest extends PHPUnit_Framework_TestCase
class IsAllowedTest extends TestCase
{
    /**
     * @covers \BjyAuthorize\Controller\Plugin\IsAllowed
+5 −5
Changes for tests/BjyAuthorizeTest/Guard/ControllerTest.php: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@

namespace BjyAuthorizeTest\Guard;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use BjyAuthorize\Guard\Controller;
use Zend\Mvc\MvcEvent;

@@ -17,15 +17,15 @@ use Zend\Mvc\MvcEvent;
 *
 * @author Marco Pivetta <ocramius@gmail.com>
 */
class ControllerTest extends PHPUnit_Framework_TestCase
class ControllerTest extends TestCase
{
    /**
     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit_Framework_MockObject_MockObject
     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit\Framework\MockObject\MockObject
     */
    protected $serviceLocator;

    /**
     * @var \BjyAuthorize\Service\Authorize|\PHPUnit_Framework_MockObject_MockObject
     * @var \BjyAuthorize\Service\Authorize|\PHPUnit\Framework\MockObject\MockObject
     */
    protected $authorize;

@@ -255,7 +255,7 @@ class ControllerTest extends PHPUnit_Framework_TestCase
     * @param string|null $action
     * @param string|null $method
     *
     * @return \PHPUnit_Framework_MockObject_MockObject|\Zend\Mvc\MvcEvent
     * @return \PHPUnit\Framework\MockObject\MockObject|\Zend\Mvc\MvcEvent
     */
    private function createMvcEvent($controller = null, $action = null, $method = null)
    {
+5 −5
Changes for tests/BjyAuthorizeTest/Guard/RouteTest.php: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@

namespace BjyAuthorizeTest\Guard;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use BjyAuthorize\Guard\Route;
use Zend\Mvc\MvcEvent;

@@ -17,15 +17,15 @@ use Zend\Mvc\MvcEvent;
 *
 * @author Marco Pivetta <ocramius@gmail.com>
 */
class RouteTest extends PHPUnit_Framework_TestCase
class RouteTest extends TestCase
{
    /**
     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit_Framework_MockObject_MockObject
     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit\Framework\MockObject\MockObject
     */
    protected $serviceLocator;

    /**
     * @var \BjyAuthorize\Service\Authorize|\PHPUnit_Framework_MockObject_MockObject
     * @var \BjyAuthorize\Service\Authorize|\PHPUnit\Framework\MockObject\MockObject
     */
    protected $authorize;

@@ -217,7 +217,7 @@ class RouteTest extends PHPUnit_Framework_TestCase
    /**
     * @param string|null $route
     *
     * @return \PHPUnit_Framework_MockObject_MockObject|\Zend\Mvc\MvcEvent
     * @return \PHPUnit\Framework\MockObject\MockObject|\Zend\Mvc\MvcEvent
     */
    private function createMvcEvent($route = null)
    {
Loading