Revert "[#14213] - Adjusted tests"

This reverts commit 04a58c7.

tests/_data/fixtures/controllers/ExceptionController.php

@@ -4,7 +4,7 @@
 /**
  * Class ExceptionController
  */
-class ExceptionController extends \Phalcon\Mvc\Controller\AbstractController
+class ExceptionController extends \Phalcon\Mvc\Controller
 {
     public function indexAction()
     {

tests/_data/fixtures/controllers/Firewall/FourController.php

@@ -12,10 +12,10 @@
 
 namespace Phalcon\Test\Controllers\Firewall;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 use Phalcon\Test\Models\AlbumORama\Albums;
 
-class FourController extends AbstractController
+class FourController extends Controller
 {
     public function firstAction(Albums $album)
     {

tests/_data/fixtures/controllers/Firewall/OneController.php

@@ -12,9 +12,9 @@
 
 namespace Phalcon\Test\Controllers\Firewall;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class OneController extends AbstractController
+class OneController extends Controller
 {
     /**
      * @Allow("ROLE1")

tests/_data/fixtures/controllers/Firewall/ThreeController.php

@@ -12,9 +12,9 @@
 
 namespace Phalcon\Test\Controllers\Firewall;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class ThreeController extends AbstractController
+class ThreeController extends Controller
 {
     public function denyAction()
     {

tests/_data/fixtures/controllers/Firewall/TwoController.php

@@ -12,9 +12,9 @@
 
 namespace Phalcon\Test\Controllers\Firewall;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class TwoController extends AbstractController
+class TwoController extends Controller
 {
     public function allowAction()
     {

tests/_data/fixtures/controllers/MicroController.php

@@ -13,9 +13,9 @@
 namespace Phalcon\Test\Controllers;
 
 use Phalcon\Http\Response;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class MicroController extends AbstractController
+class MicroController extends Controller
 {
     public function indexAction()
     {

tests/_data/fixtures/controllers/ViewRequestController.php

@@ -12,12 +12,12 @@
 
 namespace Phalcon\Test\Controllers;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * Class ViewRequestController
  */
-class ViewRequestController extends AbstractController
+class ViewRequestController extends Controller
 {
     public function requestAction()
     {

tests/_data/fixtures/modules/backend/controllers/LoginController.php

@@ -2,9 +2,9 @@
 
 namespace Phalcon\Test\Modules\Backend\Controllers;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class LoginController extends AbstractController
+class LoginController extends Controller
 {
     public function indexAction()
     {

tests/_data/fixtures/modules/frontend/controllers/IndexController.php

@@ -2,9 +2,9 @@
 
 namespace Phalcon\Test\Modules\Frontend\Controllers;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
-class IndexController extends AbstractController
+class IndexController extends Controller
 {
     public function indexAction()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteExceptionController.php

@@ -3,7 +3,7 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteExceptionController
@@ -21,7 +21,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestAfterExecuteRouteExceptionController extends AbstractController
+class DispatcherTestAfterExecuteRouteExceptionController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteForwardController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestAfterExecuteRouteForwardController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestAfterExecuteRouteForwardController extends AbstractController
+class DispatcherTestAfterExecuteRouteForwardController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestAfterExecuteRouteReturnFalseController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestAfterExecuteRouteReturnFalseController extends AbstractController
+class DispatcherTestAfterExecuteRouteReturnFalseController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteExceptionController.php

@@ -3,7 +3,7 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteExceptionController
@@ -21,7 +21,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestBeforeExecuteRouteExceptionController extends AbstractController
+class DispatcherTestBeforeExecuteRouteExceptionController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteForwardController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteForwardController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestBeforeExecuteRouteForwardController extends AbstractController
+class DispatcherTestBeforeExecuteRouteForwardController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestBeforeExecuteRouteReturnFalseController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestBeforeExecuteRouteReturnFalseController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestBeforeExecuteRouteReturnFalseController extends AbstractController
+class DispatcherTestBeforeExecuteRouteReturnFalseController extends Controller
 {
     public function initialize()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultController.php

@@ -3,7 +3,7 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultController
@@ -21,7 +21,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestDefaultController extends AbstractController
+class DispatcherTestDefaultController extends Controller
 {
     const RETURN_VALUE_STRING = 'string';
     const RETURN_VALUE_INT    = 5;

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultNoNamespaceController.php

@@ -1,7 +1,7 @@
 <?php
 
 // @codingStandardsIgnoreStart
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 // @codingStandardsIgnoreSEnd
 
@@ -21,7 +21,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestDefaultNoNamespaceController extends AbstractController
+class DispatcherTestDefaultNoNamespaceController extends Controller
 {
     const RETURN_VALUE_STRING = 'string';
     const RETURN_VALUE_INT    = 5;

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultSimpleController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultSimpleController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestDefaultSimpleController extends AbstractController
+class DispatcherTestDefaultSimpleController extends Controller
 {
     public function indexAction()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestDefaultTwoController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestDefaultTwoController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestDefaultTwoController extends AbstractController
+class DispatcherTestDefaultTwoController extends Controller
 {
     public function beforeExecuteRoute()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeExceptionController.php

@@ -3,7 +3,7 @@
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
 use Exception;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeExceptionController
@@ -21,7 +21,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestInitializeExceptionController extends AbstractController
+class DispatcherTestInitializeExceptionController extends Controller
 {
     public function beforeExecuteRoute()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeForwardController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeForwardController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestInitializeForwardController extends AbstractController
+class DispatcherTestInitializeForwardController extends Controller
 {
     public function beforeExecuteRoute()
     {

tests/integration/Mvc/Dispatcher/Helper/DispatcherTestInitializeReturnFalseController.php

@@ -2,7 +2,7 @@
 
 namespace Phalcon\Test\Integration\Mvc\Dispatcher\Helper;
 
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 
 /**
  * \Phalcon\Test\Integration\Mvc\Dispatcher\Helper\DispatcherTestInitializeReturnFalseController
@@ -20,7 +20,7 @@
  * through the world-wide-web, please send an email to [email protected]
  * so that we can send you a copy immediately.
  */
-class DispatcherTestInitializeReturnFalseController extends AbstractController
+class DispatcherTestInitializeReturnFalseController extends Controller
 {
     public function beforeExecuteRoute()
     {