[#14213] - Adjusted tests

phalcon · Jul 1, 2019 · 04a58c7 · 04a58c7
1 parent a4ff07c
commit 04a58c7
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php b/.../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
@@ -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/...ntegration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php b/...ntegration/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/...integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php b/...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/...s/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php b/...s/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/...tegration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php b/...tegration/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
@@ -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
@@ -1,7 +1,7 @@
 <?php
 
 // @codingStandardsIgnoreStart
-use Phalcon\Mvc\Controller;
+use Phalcon\Mvc\Controller\AbstractController;
 
 // @codingStandardsIgnoreSEnd
 
@@ -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 DispatcherTestDefaultNoNamespaceController extends Controller
+class DispatcherTestDefaultNoNamespaceController extends AbstractController
 {
     const RETURN_VALUE_STRING = 'string';
     const RETURN_VALUE_INT    = 5;

diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.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\DispatcherTestDefaultSimpleController
@@ -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 DispatcherTestDefaultSimpleController extends Controller
+class DispatcherTestDefaultSimpleController extends AbstractController
 {
     public function indexAction()
     {

diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.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\DispatcherTestDefaultTwoController
@@ -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 DispatcherTestDefaultTwoController extends Controller
+class DispatcherTestDefaultTwoController extends AbstractController
 {
     public function beforeExecuteRoute()
     {

diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.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\DispatcherTestInitializeExceptionController
@@ -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 DispatcherTestInitializeExceptionController extends Controller
+class DispatcherTestInitializeExceptionController extends AbstractController
 {
     public function beforeExecuteRoute()
     {

diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.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\DispatcherTestInitializeForwardController
@@ -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 DispatcherTestInitializeForwardController extends Controller
+class DispatcherTestInitializeForwardController extends AbstractController
 {
     public function beforeExecuteRoute()
     {

diff --git a/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php b/tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.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\DispatcherTestInitializeReturnFalseController
@@ -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 DispatcherTestInitializeReturnFalseController extends Controller
+class DispatcherTestInitializeReturnFalseController extends AbstractController
 {
     public function beforeExecuteRoute()
     {