Updated to core:v1.1

vegas-cmf · Feb 25, 2015 · 8258415 · 8258415
1 parent c29e54f
commit 8258415
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/Task/GeneratorTaskAbstract.php b/src/Task/GeneratorTaskAbstract.php
@@ -15,7 +15,7 @@
 use Vegas\ApiDoc\Benchmark;
 use Vegas\ApiDoc\Generator;
 use Vegas\ApiDoc\Renderer;
-use Vegas\Cli\Task;
+use Vegas\Cli\TaskAbstract;
 use Vegas\Cli\Task\Action;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @package Vegas\ApiDoc\Task
  */
-abstract class GeneratorTaskAbstract extends Task
+abstract class GeneratorTaskAbstract extends TaskAbstract
 {
 
     /**

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -14,7 +14,7 @@
 use Phalcon\DI;
 use Vegas\Mvc\Application;
 use Vegas\Mvc\Controller\Crud;
-use Vegas\Mvc\Module\ModuleLoader;
+use Vegas\Mvc\Module\Loader as ModuleLoader;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
@@ -27,7 +27,7 @@ public function setUp()
         $_SERVER['REQUEST_URI'] = '/';
 
         $this->di = DI::getDefault();
-        $modules = ModuleLoader::dump($this->di);
+        $modules = (new ModuleLoader())->dump(TESTS_ROOT_DIR . '/fixtures/app', TESTS_ROOT_DIR . '/fixtures/app/config/');
 
         $app = new Application();
         $app->registerModules($modules);

diff --git a/tests/fixtures/app/Bootstrap.php b/tests/fixtures/app/Bootstrap.php
@@ -13,7 +13,7 @@
 use Vegas\Db\Mapping\Json;
 use Vegas\Db\MappingManager;
 
-class Bootstrap extends \Vegas\Application\Bootstrap
+class Bootstrap extends \Vegas\Mvc\Bootstrap
 {
     public function setup()
     {

diff --git a/tests/fixtures/app/invalid/ApiBug/controllers/TestController.php b/tests/fixtures/app/invalid/ApiBug/controllers/TestController.php
@@ -6,7 +6,7 @@
 namespace ApiBug\Controllers;
 
 use ApiTest\Services\Exception\ApiException;
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 use Phalcon\Mvc\Dispatcher;
 
 /**

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/CustomController.php b/tests/fixtures/app/modules/ApiTest/controllers/CustomController.php
@@ -1,7 +1,7 @@
 <?php
 namespace ApiTest\Controllers;
 
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 
 /**
  * Class EmptyController

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/EmptyController.php b/tests/fixtures/app/modules/ApiTest/controllers/EmptyController.php
@@ -2,7 +2,7 @@
 
 namespace ApiTest\Controllers;
 
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 
 class EmptyController extends ControllerAbstract
 {

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/FooController.php b/tests/fixtures/app/modules/ApiTest/controllers/FooController.php
@@ -6,7 +6,7 @@
 namespace ApiTest\Controllers;
 
 use ApiTest\Services\Exception\ApiException;
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 use Phalcon\Mvc\Dispatcher;
 
 /**

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/ShouldBeSkipped.php b/tests/fixtures/app/modules/ApiTest/controllers/ShouldBeSkipped.php
@@ -14,7 +14,7 @@
 namespace ApiTest\Controllers;
 
 
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 
 /**
  * Class ShouldBeSkipped

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/TestController.php b/tests/fixtures/app/modules/ApiTest/controllers/TestController.php
@@ -6,7 +6,7 @@
 namespace ApiTest\Controllers;
 
 use ApiTest\Services\Exception\ApiException;
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 use Phalcon\Mvc\Dispatcher;
 
 /**

diff --git a/tests/fixtures/app/modules/ApiTest/controllers/v2/NestedController.php b/tests/fixtures/app/modules/ApiTest/controllers/v2/NestedController.php
@@ -6,7 +6,7 @@
 namespace ApiTest\Controllers\V2;
 
 use ApiTest\Services\Exception\ApiException;
-use Vegas\Mvc\Controller\ControllerAbstract;
+use Vegas\Mvc\ControllerAbstract;
 use Phalcon\Mvc\Dispatcher;
 
 /**