From 04a58c798829ef3b3ab27e130e22bdf023b88091 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Mon, 1 Jul 2019 17:36:28 -0400 Subject: [PATCH] [#14213] - Adjusted tests --- tests/_data/fixtures/controllers/ExceptionController.php | 2 +- tests/_data/fixtures/controllers/Firewall/FourController.php | 4 ++-- tests/_data/fixtures/controllers/Firewall/OneController.php | 4 ++-- tests/_data/fixtures/controllers/Firewall/ThreeController.php | 4 ++-- tests/_data/fixtures/controllers/Firewall/TwoController.php | 4 ++-- tests/_data/fixtures/controllers/MicroController.php | 4 ++-- tests/_data/fixtures/controllers/ViewRequestController.php | 4 ++-- .../fixtures/modules/backend/controllers/LoginController.php | 4 ++-- .../fixtures/modules/frontend/controllers/IndexController.php | 4 ++-- .../DispatcherTestAfterExecuteRouteExceptionController.php | 4 ++-- .../DispatcherTestAfterExecuteRouteForwardController.php | 4 ++-- .../DispatcherTestAfterExecuteRouteReturnFalseController.php | 4 ++-- .../DispatcherTestBeforeExecuteRouteExceptionController.php | 4 ++-- .../DispatcherTestBeforeExecuteRouteForwardController.php | 4 ++-- .../DispatcherTestBeforeExecuteRouteReturnFalseController.php | 4 ++-- .../Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php | 4 ++-- .../Helper/DispatcherTestDefaultNoNamespaceController.php | 4 ++-- .../Helper/DispatcherTestDefaultSimpleController.php | 4 ++-- .../Dispatcher/Helper/DispatcherTestDefaultTwoController.php | 4 ++-- .../Helper/DispatcherTestInitializeExceptionController.php | 4 ++-- .../Helper/DispatcherTestInitializeForwardController.php | 4 ++-- .../Helper/DispatcherTestInitializeReturnFalseController.php | 4 ++-- 22 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/_data/fixtures/controllers/ExceptionController.php b/tests/_data/fixtures/controllers/ExceptionController.php index ce2785c5ab8..a3f921912d4 100644 --- a/tests/_data/fixtures/controllers/ExceptionController.php +++ b/tests/_data/fixtures/controllers/ExceptionController.php @@ -4,7 +4,7 @@ /** * Class ExceptionController */ -class ExceptionController extends \Phalcon\Mvc\Controller +class ExceptionController extends \Phalcon\Mvc\Controller\AbstractController { public function indexAction() { diff --git a/tests/_data/fixtures/controllers/Firewall/FourController.php b/tests/_data/fixtures/controllers/Firewall/FourController.php index 7c773e5fca3..bae124096e2 100644 --- a/tests/_data/fixtures/controllers/Firewall/FourController.php +++ b/tests/_data/fixtures/controllers/Firewall/FourController.php @@ -12,10 +12,10 @@ namespace Phalcon\Test\Controllers\Firewall; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; use Phalcon\Test\Models\AlbumORama\Albums; -class FourController extends Controller +class FourController extends AbstractController { public function firstAction(Albums $album) { diff --git a/tests/_data/fixtures/controllers/Firewall/OneController.php b/tests/_data/fixtures/controllers/Firewall/OneController.php index e14d0fe09c2..e7d9220e899 100644 --- a/tests/_data/fixtures/controllers/Firewall/OneController.php +++ b/tests/_data/fixtures/controllers/Firewall/OneController.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Controllers\Firewall; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class OneController extends Controller +class OneController extends AbstractController { /** * @Allow("ROLE1") diff --git a/tests/_data/fixtures/controllers/Firewall/ThreeController.php b/tests/_data/fixtures/controllers/Firewall/ThreeController.php index 3de53c150c8..c17eaf4b768 100644 --- a/tests/_data/fixtures/controllers/Firewall/ThreeController.php +++ b/tests/_data/fixtures/controllers/Firewall/ThreeController.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Controllers\Firewall; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class ThreeController extends Controller +class ThreeController extends AbstractController { public function denyAction() { diff --git a/tests/_data/fixtures/controllers/Firewall/TwoController.php b/tests/_data/fixtures/controllers/Firewall/TwoController.php index 4b297555281..89ffcf61bb0 100644 --- a/tests/_data/fixtures/controllers/Firewall/TwoController.php +++ b/tests/_data/fixtures/controllers/Firewall/TwoController.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Controllers\Firewall; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class TwoController extends Controller +class TwoController extends AbstractController { public function allowAction() { diff --git a/tests/_data/fixtures/controllers/MicroController.php b/tests/_data/fixtures/controllers/MicroController.php index ad4b19ce984..cee0e92a3be 100644 --- a/tests/_data/fixtures/controllers/MicroController.php +++ b/tests/_data/fixtures/controllers/MicroController.php @@ -13,9 +13,9 @@ namespace Phalcon\Test\Controllers; use Phalcon\Http\Response; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class MicroController extends Controller +class MicroController extends AbstractController { public function indexAction() { diff --git a/tests/_data/fixtures/controllers/ViewRequestController.php b/tests/_data/fixtures/controllers/ViewRequestController.php index 78b41676470..5fc2b09ea9c 100644 --- a/tests/_data/fixtures/controllers/ViewRequestController.php +++ b/tests/_data/fixtures/controllers/ViewRequestController.php @@ -12,12 +12,12 @@ namespace Phalcon\Test\Controllers; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * Class ViewRequestController */ -class ViewRequestController extends Controller +class ViewRequestController extends AbstractController { public function requestAction() { diff --git a/tests/_data/fixtures/modules/backend/controllers/LoginController.php b/tests/_data/fixtures/modules/backend/controllers/LoginController.php index 36b9a9065ec..b2075c0c309 100644 --- a/tests/_data/fixtures/modules/backend/controllers/LoginController.php +++ b/tests/_data/fixtures/modules/backend/controllers/LoginController.php @@ -2,9 +2,9 @@ namespace Phalcon\Test\Modules\Backend\Controllers; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class LoginController extends Controller +class LoginController extends AbstractController { public function indexAction() { diff --git a/tests/_data/fixtures/modules/frontend/controllers/IndexController.php b/tests/_data/fixtures/modules/frontend/controllers/IndexController.php index 26bb393539c..3b252affa97 100644 --- a/tests/_data/fixtures/modules/frontend/controllers/IndexController.php +++ b/tests/_data/fixtures/modules/frontend/controllers/IndexController.php @@ -2,9 +2,9 @@ namespace Phalcon\Test\Modules\Frontend\Controllers; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; -class IndexController extends Controller +class IndexController extends AbstractController { public function indexAction() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php index f4a346f0a94..77ac9aef888 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php @@ -3,7 +3,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; use Exception; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteExceptionController @@ -21,7 +21,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestAfterExecuteRouteExceptionController extends Controller +class DispatcherTestAfterExecuteRouteExceptionController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php index 824a72cc143..545a2528d94 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php @@ -2,7 +2,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteForwardController @@ -20,7 +20,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestAfterExecuteRouteForwardController extends Controller +class DispatcherTestAfterExecuteRouteForwardController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php index 433306d4668..5bc8cfff126 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php @@ -2,7 +2,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController @@ -20,7 +20,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestAfterExecuteRouteReturnFalseController extends Controller +class DispatcherTestAfterExecuteRouteReturnFalseController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php index 0b228f6abda..d8199198bd4 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php @@ -3,7 +3,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; use Exception; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteExceptionController @@ -21,7 +21,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestBeforeExecuteRouteExceptionController extends Controller +class DispatcherTestBeforeExecuteRouteExceptionController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php index 03b63d16bb7..e8ad9366f30 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php @@ -2,7 +2,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteForwardController @@ -20,7 +20,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestBeforeExecuteRouteForwardController extends Controller +class DispatcherTestBeforeExecuteRouteForwardController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php index fba7b4ad76b..f5d4ce6193f 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php @@ -2,7 +2,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController @@ -20,7 +20,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestBeforeExecuteRouteReturnFalseController extends Controller +class DispatcherTestBeforeExecuteRouteReturnFalseController extends AbstractController { public function initialize() { diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php index 3c1e5d206c3..ea064470e19 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php @@ -3,7 +3,7 @@ namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper; use Exception; -use Phalcon\Mvc\Controller; +use Phalcon\Mvc\Controller\AbstractController; /** * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController @@ -21,7 +21,7 @@ * through the world-wide-web, please send an email to license@phalconphp.com * so that we can send you a copy immediately. */ -class DispatcherTestDefaultController extends Controller +class DispatcherTestDefaultController extends AbstractController { const RETURN_VALUE_STRING = 'string'; const RETURN_VALUE_INT = 5; diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php index 82967034a2e..c0959155e2e 100644 --- a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php +++ b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php @@ -1,7 +1,7 @@