Skip to content

GitLab

Commit e699144c authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

laminas-migration migrate

parent 4c578763
Pipeline #10459 passed with stage
in 21 seconds
Hide whitespace changes
Inline Side-by-side
src/ZfcUser/Form/Register.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUser\Form;
use Zend\Form\Element\Captcha as Captcha;
use Laminas\Form\Element\Captcha as Captcha;
use ZfcUser\Options\RegistrationOptionsInterface;
class Register extends Base
......@@ -27,7 +27,7 @@ class Register extends Base
if ($this->getRegistrationOptions()->getUseRegistrationFormCaptcha()) {
$this->add(array(
'name' => 'captcha',
'type' => 'Zend\Form\Element\Captcha',
'type' => 'Laminas\Form\Element\Captcha',
'options' => array(
'label' => 'Please type the following text',
'captcha' => $this->getRegistrationOptions()->getFormCaptchaOptions(),
......
src/ZfcUser/InputFilter/ProvidesEventsInputFilter.php
View file @ e699144c
<?php
namespace ZfcUser\InputFilter;
use Zend\EventManager\EventManagerAwareTrait;
use Zend\InputFilter\InputFilter;
use Laminas\EventManager\EventManagerAwareTrait;
use Laminas\InputFilter\InputFilter;
class ProvidesEventsInputFilter extends InputFilter
{
......
src/ZfcUser/Mapper/AbstractDbMapper.php
View file @ e699144c
<?php
namespace ZfcUser\Mapper;
use Zend\Db\Adapter\Adapter;
use Zend\Db\Adapter\Driver\ResultInterface;
use Zend\Db\ResultSet\HydratingResultSet;
use Zend\Db\Sql\Select;
use Zend\Db\Sql\Sql;
use Zend\Db\Sql\TableIdentifier;
use Zend\Hydrator\HydratorInterface;
use Zend\Hydrator\ClassMethods;
use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Adapter\Driver\ResultInterface;
use Laminas\Db\ResultSet\HydratingResultSet;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Sql;
use Laminas\Db\Sql\TableIdentifier;
use Laminas\Hydrator\HydratorInterface;
use Laminas\Hydrator\ClassMethods;
use ZfcUser\Entity\UserInterface as UserEntityInterface;
use ZfcUser\EventManager\EventProvider;
use ZfcUser\Db\Adapter\MasterSlaveAdapterInterface;
......
src/ZfcUser/Mapper/User.php
View file @ e699144c
......@@ -3,7 +3,7 @@
namespace ZfcUser\Mapper;
use ZfcUser\Entity\UserInterface as UserEntityInterface;
use Zend\Hydrator\HydratorInterface;
use Laminas\Hydrator\HydratorInterface;
class User extends AbstractDbMapper implements UserInterface
{
......
src/ZfcUser/Mapper/UserHydrator.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUser\Mapper;
use Zend\Hydrator\ClassMethods;
use Laminas\Hydrator\ClassMethods;
use ZfcUser\Entity\UserInterface as UserEntityInterface;
class UserHydrator extends ClassMethods
......
src/ZfcUser/Options/ModuleOptions.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUser\Options;
use Zend\Stdlib\AbstractOptions;
use Laminas\Stdlib\AbstractOptions;
class ModuleOptions extends AbstractOptions implements
UserControllerOptionsInterface,
......
src/ZfcUser/Service/User.php
View file @ e699144c
......@@ -3,11 +3,11 @@
namespace ZfcUser\Service;
use Interop\Container\ContainerInterface;
use Zend\Authentication\AuthenticationService;
use Zend\Form\Form;
use Zend\ServiceManager\ServiceManager;
use Zend\Crypt\Password\Bcrypt;
use Zend\Hydrator;
use Laminas\Authentication\AuthenticationService;
use Laminas\Form\Form;
use Laminas\ServiceManager\ServiceManager;
use Laminas\Crypt\Password\Bcrypt;
use Laminas\Hydrator;
use ZfcUser\EventManager\EventProvider;
use ZfcUser\Mapper\UserInterface as UserMapperInterface;
use ZfcUser\Options\UserServiceOptionsInterface;
......@@ -288,7 +288,7 @@ class User extends EventProvider
/**
* Return the Form Hydrator
*
* @return \Zend\Hydrator\ClassMethods
* @return \Laminas\Hydrator\ClassMethods
*/
public function getFormHydrator()
{
......
src/ZfcUser/Validator/AbstractRecord.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUser\Validator;
use Zend\Validator\AbstractValidator;
use Laminas\Validator\AbstractValidator;
use ZfcUser\Mapper\UserInterface;
abstract class AbstractRecord extends AbstractValidator
......
src/ZfcUser/View/Helper/ZfcUserDisplayName.php
View file @ e699144c
......@@ -2,8 +2,8 @@
namespace ZfcUser\View\Helper;
use Zend\View\Helper\AbstractHelper;
use Zend\Authentication\AuthenticationService;
use Laminas\View\Helper\AbstractHelper;
use Laminas\Authentication\AuthenticationService;
use ZfcUser\Entity\UserInterface as User;
class ZfcUserDisplayName extends AbstractHelper
......
src/ZfcUser/View/Helper/ZfcUserIdentity.php
View file @ e699144c
......@@ -2,8 +2,8 @@
namespace ZfcUser\View\Helper;
use Zend\View\Helper\AbstractHelper;
use Zend\Authentication\AuthenticationService;
use Laminas\View\Helper\AbstractHelper;
use Laminas\Authentication\AuthenticationService;
class ZfcUserIdentity extends AbstractHelper
{
......
src/ZfcUser/View/Helper/ZfcUserLoginWidget.php
View file @ e699144c
......@@ -2,9 +2,9 @@
namespace ZfcUser\View\Helper;
use Zend\View\Helper\AbstractHelper;
use Laminas\View\Helper\AbstractHelper;
use ZfcUser\Form\Login as LoginForm;
use Zend\View\Model\ViewModel;
use Laminas\View\Model\ViewModel;
class ZfcUserLoginWidget extends AbstractHelper
{
......
tests/ZfcUserTest/Authentication/Adapter/AbstractAdapterTest.php
View file @ e699144c
......@@ -23,7 +23,7 @@ class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
*/
public function testGetStorageWithoutStorageSet()
{
$this->assertInstanceOf('Zend\Authentication\Storage\Session', $this->adapter->getStorage());
$this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->adapter->getStorage());
}
/**
......@@ -32,11 +32,11 @@ class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
*/
public function testSetGetStorage()
{
$storage = new \Zend\Authentication\Storage\Session('ZfcUser');
$storage = new \Laminas\Authentication\Storage\Session('ZfcUser');
$storage->write('zfcUser');
$this->adapter->setStorage($storage);
$this->assertInstanceOf('Zend\Authentication\Storage\Session', $this->adapter->getStorage());
$this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->adapter->getStorage());
$this->assertSame('zfcUser', $this->adapter->getStorage()->read());
}
......
tests/ZfcUserTest/Authentication/Adapter/AdapterChainEventTest.php
View file @ e699144c
......@@ -68,9 +68,9 @@ class AdapterChainEventTest extends \PHPUnit_Framework_TestCase
public function testRequest()
{
$request = $this->getMock('Zend\Stdlib\RequestInterface');
$request = $this->getMock('Laminas\Stdlib\RequestInterface');
$this->event->setRequest($request);
$this->assertInstanceOf('Zend\Stdlib\RequestInterface', $this->event->getRequest());
$this->assertInstanceOf('Laminas\Stdlib\RequestInterface', $this->event->getRequest());
}
}
tests/ZfcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php
View file @ e699144c
......@@ -14,7 +14,7 @@ class AdapterChainServiceFactoryTest extends \PHPUnit_Framework_TestCase
protected $factory;
/**
* @var \Zend\ServiceManager\ServiceLocatorInterface
* @var \Laminas\ServiceManager\ServiceLocatorInterface
*/
protected $serviceLocator;
......@@ -24,7 +24,7 @@ class AdapterChainServiceFactoryTest extends \PHPUnit_Framework_TestCase
protected $options;
/**
* @var \Zend\EventManager\EventManagerInterface
* @var \Laminas\EventManager\EventManagerInterface
*/
protected $eventManager;
......@@ -41,7 +41,7 @@ class AdapterChainServiceFactoryTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$this->serviceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
$this->serviceLocator = $this->getMock('Laminas\ServiceManager\ServiceLocatorInterface');
$this->options = $this->getMockBuilder('ZfcUser\Options\ModuleOptions')
->disableOriginalConstructor()
......@@ -55,7 +55,7 @@ class AdapterChainServiceFactoryTest extends \PHPUnit_Framework_TestCase
->method('get')
->will($this->returnCallback(array($this,'helperServiceLocator')));
$this->eventManager = $this->getMock('Zend\EventManager\EventManager');
$this->eventManager = $this->getMock('Laminas\EventManager\EventManager');
$this->factory = new AdapterChainServiceFactory();
}
......
tests/ZfcUserTest/Authentication/Adapter/AdapterChainTest.php
View file @ e699144c
......@@ -2,12 +2,12 @@
namespace ZfcUserTest\Authentication\Adapter;
use Zend\EventManager\EventInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\SharedEventManagerInterface;
use Laminas\EventManager\EventInterface;
use Laminas\EventManager\EventManagerInterface;
use Laminas\EventManager\SharedEventManagerInterface;
use ZfcUser\Authentication\Adapter\AdapterChain;
use ZfcUser\Authentication\Adapter\AdapterChainEvent;
use Zend\Stdlib\RequestInterface;
use Laminas\Stdlib\RequestInterface;
class AdapterChainTest extends \PHPUnit_Framework_TestCase
{
......@@ -56,10 +56,10 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
$this->adapterChain = new AdapterChain();
$this->sharedEventManager = $this->getMock('Zend\EventManager\SharedEventManagerInterface');
$this->sharedEventManager = $this->getMock('Laminas\EventManager\SharedEventManagerInterface');
//$this->sharedEventManager->expects($this->any())->method('getListeners')->will($this->returnValue([]));
$this->eventManager = $this->getMock('Zend\EventManager\EventManagerInterface');
$this->eventManager = $this->getMock('Laminas\EventManager\EventManagerInterface');
$this->eventManager->expects($this->any())->method('getSharedManager')->will($this->returnValue($this->sharedEventManager));
$this->eventManager->expects($this->any())->method('setIdentifiers');
......@@ -90,7 +90,7 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
$this->adapterChain->setEvent($event);
$result = $this->adapterChain->authenticate();
$this->assertInstanceOf('Zend\Authentication\Result', $result);
$this->assertInstanceOf('Laminas\Authentication\Result', $result);
$this->assertEquals($result->getIdentity(), 'identity');
$this->assertEquals($result->getMessages(), array());
}
......@@ -131,7 +131,7 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
*/
protected function setUpPrepareForAuthentication()
{
$this->request = $this->getMock('Zend\Stdlib\RequestInterface');
$this->request = $this->getMock('Laminas\Stdlib\RequestInterface');
$this->event = $this->getMock('ZfcUser\Authentication\Adapter\AdapterChainEvent');
$this->event->expects($this->once())->method('setRequest')->with($this->request);
......@@ -139,9 +139,9 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
$this->eventManager->expects($this->at(0))->method('trigger')->with('authenticate.pre');
/**
* @var $response \Zend\EventManager\ResponseCollection
* @var $response \Laminas\EventManager\ResponseCollection
*/
$responses = $this->getMock('Zend\EventManager\ResponseCollection');
$responses = $this->getMock('Laminas\EventManager\ResponseCollection');
$this->eventManager->expects($this->at(1))
->method('trigger')
......@@ -206,7 +206,7 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
$result->expects($this->once())->method('stopped')->will($this->returnValue(true));
$lastResponse = $this->getMock('Zend\Stdlib\ResponseInterface');
$lastResponse = $this->getMock('Laminas\Stdlib\ResponseInterface');
$result->expects($this->atLeastOnce())->method('last')->will($this->returnValue($lastResponse));
$this->assertEquals(
......@@ -283,7 +283,7 @@ class AdapterChainTest extends \PHPUnit_Framework_TestCase
{
$testParams = array('testParam' => 'testValue');
$event = new \Zend\EventManager\Event;
$event = new \Laminas\EventManager\Event;
$event->setParams($testParams);
$this->adapterChain->setEvent($event);
......
tests/ZfcUserTest/Authentication/Adapter/DbTest.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUserTest\Authentication\Adapter;
use Zend\EventManager\Event;
use Laminas\EventManager\Event;
use ZfcUser\Authentication\Adapter\Db;
class DbTest extends \PHPUnit_Framework_TestCase
......@@ -24,7 +24,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
/**
* Mock of Storage.
*
* @var \Zend\Authentication\Storage\Session|\PHPUnit_Framework_MockObject_MockObject
* @var \Laminas\Authentication\Storage\Session|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storage;
......@@ -51,7 +51,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$storage = $this->getMock('Zend\Authentication\Storage\Session');
$storage = $this->getMock('Laminas\Authentication\Storage\Session');
$this->storage = $storage;
$authEvent = $this->getMock('ZfcUser\Authentication\Adapter\AdapterChainEvent');
......@@ -69,8 +69,8 @@ class DbTest extends \PHPUnit_Framework_TestCase
$this->db = new Db;
$this->db->setStorage($this->storage);
$sessionManager = $this->getMock('Zend\Session\SessionManager');
\Zend\Session\AbstractContainer::setDefaultManager($sessionManager);
$sessionManager = $this->getMock('Laminas\Session\SessionManager');
\Laminas\Session\AbstractContainer::setDefaultManager($sessionManager);
}
/**
......@@ -95,7 +95,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::SUCCESS)
->with(\Laminas\Authentication\Result::SUCCESS)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
......@@ -128,7 +128,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::FAILURE_IDENTITY_NOT_FOUND)
->with(\Laminas\Authentication\Result::FAILURE_IDENTITY_NOT_FOUND)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
......@@ -161,7 +161,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::FAILURE_UNCATEGORIZED)
->with(\Laminas\Authentication\Result::FAILURE_UNCATEGORIZED)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
......@@ -201,7 +201,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::FAILURE_CREDENTIAL_INVALID)
->with(\Laminas\Authentication\Result::FAILURE_CREDENTIAL_INVALID)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once(1))
->method('setMessages')
......@@ -250,7 +250,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::SUCCESS)
->with(\Laminas\Authentication\Result::SUCCESS)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
......@@ -304,7 +304,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::SUCCESS)
->with(\Laminas\Authentication\Result::SUCCESS)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
......@@ -328,7 +328,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('getPassword')
->will($this->returnValue('$2a$10$x05G2P803MrB3jaORBXBn.QHtiYzGQOBjQ7unpEIge.Mrz6c3KiVm'));
$bcrypt = $this->getMock('Zend\Crypt\Password\Bcrypt');
$bcrypt = $this->getMock('Laminas\Crypt\Password\Bcrypt');
$bcrypt->expects($this->once())
->method('getCost')
->will($this->returnValue('10'));
......@@ -356,7 +356,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('setPassword')
->with('$2a$10$D41KPuDCn6iGoESjnLee/uE/2Xo985sotVySo2HKDz6gAO4hO/Gh6');
$bcrypt = $this->getMock('Zend\Crypt\Password\Bcrypt');
$bcrypt = $this->getMock('Laminas\Crypt\Password\Bcrypt');
$bcrypt->expects($this->once())
->method('getCost')
->will($this->returnValue('5'));
......@@ -419,13 +419,13 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testSetGetServicemanager()
{
$sm = $this->getMock('Zend\ServiceManager\ServiceManager');
$sm = $this->getMock('Laminas\ServiceManager\ServiceManager');
$this->db->setServiceManager($sm);
$serviceManager = $this->db->getServiceManager();
$this->assertInstanceOf('Zend\ServiceManager\ServiceLocatorInterface', $serviceManager);
$this->assertInstanceOf('Laminas\ServiceManager\ServiceLocatorInterface', $serviceManager);
$this->assertSame($sm, $serviceManager);
}
......@@ -434,7 +434,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testGetOptionsWithNoOptionsSet()
{
$serviceMapper = $this->getMock('Zend\ServiceManager\ServiceManager');
$serviceMapper = $this->getMock('Laminas\ServiceManager\ServiceManager');
$serviceMapper->expects($this->once())
->method('get')
->with('zfcuser_module_options')
......@@ -468,7 +468,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testGetMapperWithNoMapperSet()
{
$serviceMapper = $this->getMock('Zend\ServiceManager\ServiceManager');
$serviceMapper = $this->getMock('Laminas\ServiceManager\ServiceManager');
$serviceMapper->expects($this->once())
->method('get')
->with('zfcuser_user_mapper')
......@@ -526,7 +526,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('read')
->will($this->returnValue(array('is_satisfied' => false)));
$post = $this->getMock('Zend\Stdlib\Parameters');
$post = $this->getMock('Laminas\Stdlib\Parameters');
$post->expects($this->at(0))
->method('get')
->with('identity')
......@@ -536,7 +536,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->with('credential')
->will($this->returnValue($credential));
$request = $this->getMock('Zend\Http\Request');
$request = $this->getMock('Laminas\Http\Request');
$request->expects($this->exactly(2))
->method('getPost')
->will($this->returnValue($post));
......
tests/ZfcUserTest/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php
View file @ e699144c
......@@ -2,7 +2,7 @@
namespace ZfcUserTest\Authentication\Adapter\TestAsset;
use Zend\EventManager\EventInterface;
use Laminas\EventManager\EventInterface;
use ZfcUser\Authentication\Adapter\AbstractAdapter;
class AbstractAdapterExtension extends AbstractAdapter
......
tests/ZfcUserTest/Authentication/Storage/DbTest.php
View file @ e699144c
......@@ -32,7 +32,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
$db = new Db;
$this->db = $db;
$this->storage = $this->getMock('Zend\Authentication\Storage\Session');
$this->storage = $this->getMock('Laminas\Authentication\Storage\Session');
$this->mapper = $this->getMock('ZfcUser\Mapper\User');
}
......@@ -175,7 +175,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testGetMapperWithNoMapperSet()
{
$sm = $this->getMock('Zend\ServiceManager\ServiceManager');
$sm = $this->getMock('Laminas\ServiceManager\ServiceManager');
$sm->expects($this->once())
->method('get')
->with('zfcuser_user_mapper')
......@@ -207,11 +207,11 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testSetGetServicemanager()
{
$sm = $this->getMock('Zend\ServiceManager\ServiceManager');
$sm = $this->getMock('Laminas\ServiceManager\ServiceManager');
$this->db->setServiceManager($sm);
$this->assertInstanceOf('Zend\ServiceManager\ServiceLocatorInterface', $this->db->getServiceManager());
$this->assertInstanceOf('Laminas\ServiceManager\ServiceLocatorInterface', $this->db->getServiceManager());
$this->assertSame($sm, $this->db->getServiceManager());
}
......@@ -221,7 +221,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testGetStorageWithoutStorageSet()
{
$this->assertInstanceOf('Zend\Authentication\Storage\Session', $this->db->getStorage());
$this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->db->getStorage());
}
/**
......@@ -230,9 +230,9 @@ class DbTest extends \PHPUnit_Framework_TestCase
*/
public function testSetGetStorage()
{
$storage = new \Zend\Authentication\Storage\Session('ZfcUserStorage');
$storage = new \Laminas\Authentication\Storage\Session('ZfcUserStorage');
$this->db->setStorage($storage);
$this->assertInstanceOf('Zend\Authentication\Storage\Session', $this->db->getStorage());
$this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->db->getStorage());
}
}
tests/ZfcUserTest/Controller/Plugin/ZfcUserAuthenticationTest.php
View file @ e699144c
......@@ -3,8 +3,8 @@
namespace ZfcUserTest\Controller\Plugin;
use ZfcUser\Controller\Plugin\ZfcUserAuthentication as Plugin;
use Zend\Authentication\AuthenticationService;
use Zend\Authentication\Adapter\AdapterInterface;
use Laminas\Authentication\AuthenticationService;
use Laminas\Authentication\Adapter\AdapterInterface;
use ZfcUser\Authentication\Adapter\AdapterChain;
class ZfcUserAuthenticationTest extends \PHPUnit_Framework_TestCase
......@@ -30,7 +30,7 @@ class ZfcUserAuthenticationTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->SUT = new Plugin();
$this->mockedAuthenticationService = $this->getMock('Zend\Authentication\AuthenticationService');
$this->mockedAuthenticationService = $this->getMock('Laminas\Authentication\AuthenticationService');
$this->mockedAuthenticationAdapter = $this->getMockForAbstractClass('\ZfcUser\Authentication\Adapter\AdapterChain');
}
......@@ -78,12 +78,12 @@ class ZfcUserAuthenticationTest extends \PHPUnit_Framework_TestCase
$adapter2 = new AdapterChain();
$this->SUT->setAuthAdapter($adapter1);
$this->assertInstanceOf('\Zend\Authentication\Adapter\AdapterInterface', $this->SUT->getAuthAdapter());
$this->assertInstanceOf('\Laminas\Authentication\Adapter\AdapterInterface', $this->SUT->getAuthAdapter());
$this->assertSame($adapter1, $this->SUT->getAuthAdapter());
$this->SUT->setAuthAdapter($adapter2);
$this->assertInstanceOf('\Zend\Authentication\Adapter\AdapterInterface', $this->SUT->getAuthAdapter());
$this->assertInstanceOf('\Laminas\Authentication\Adapter\AdapterInterface', $this->SUT->getAuthAdapter());
$this->assertNotSame($adapter1, $this->SUT->getAuthAdapter());
$this->assertSame($adapter2, $this->SUT->getAuthAdapter());
}
......@@ -98,12 +98,12 @@ class ZfcUserAuthenticationTest extends \PHPUnit_Framework_TestCase
$service2 = new AuthenticationService();
$this->SUT->setAuthService($service1);
$this->assertInstanceOf('\Zend\Authentication\AuthenticationService', $this->SUT->getAuthService());
$this->assertInstanceOf('\Laminas\Authentication\AuthenticationService', $this->SUT->getAuthService());
$this->assertSame($service1, $this->SUT->getAuthService());
$this->SUT->setAuthService($service2);
$this->assertInstanceOf('\Zend\Authentication\AuthenticationService', $this->SUT->getAuthService());
$this->assertInstanceOf('\Laminas\Authentication\AuthenticationService', $this->SUT->getAuthService());
$this->assertNotSame($service1, $this->SUT->getAuthService());
$this->assertSame($service2, $this->SUT->getAuthService());
}
......
tests/ZfcUserTest/Controller/RedirectCallbackTest.php
View file @ e699144c
......@@ -2,12 +2,12 @@
namespace ZfcUserTest\Controller;
use Zend\Http\PhpEnvironment\Request;
use Zend\Http\PhpEnvironment\Response;
use Zend\Mvc\Application;
use Zend\Mvc\MvcEvent;
use Zend\Router\RouteInterface;
use Zend\Router\RouteMatch;
use Laminas\Http\PhpEnvironment\Request;
use Laminas\Http\PhpEnvironment\Response;
use Laminas\Mvc\Application;
use Laminas\Mvc\MvcEvent;
use Laminas\Router\RouteInterface;
use Laminas\Router\RouteMatch;
use ZfcUser\Controller\RedirectCallback;
use ZfcUser\Options\ModuleOptions;
......@@ -40,7 +40,7 @@ class RedirectCallbackTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->router = $this->getMockBuilder('Zend\Router\RouteInterface')
$this->router = $this->getMockBuilder('Laminas\Router\RouteInterface')