From 82584158154b5995769cfc5b6001911f568792f6 Mon Sep 17 00:00:00 2001
From: szytko <slawomir.zytko@gmail.com>
Date: Wed, 25 Feb 2015 13:35:21 +0100
Subject: [PATCH] Updated to core:v1.1

---
 src/Task/GeneratorTaskAbstract.php                            | 4 ++--
 tests/TestCase.php                                            | 4 ++--
 tests/fixtures/app/Bootstrap.php                              | 2 +-
 .../app/invalid/ApiBug/controllers/TestController.php         | 2 +-
 .../app/modules/ApiTest/controllers/CustomController.php      | 2 +-
 .../app/modules/ApiTest/controllers/EmptyController.php       | 2 +-
 .../app/modules/ApiTest/controllers/FooController.php         | 2 +-
 .../app/modules/ApiTest/controllers/ShouldBeSkipped.php       | 2 +-
 .../app/modules/ApiTest/controllers/TestController.php        | 2 +-
 .../app/modules/ApiTest/controllers/v2/NestedController.php   | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Task/GeneratorTaskAbstract.php b/src/Task/GeneratorTaskAbstract.php
index f74c305..33c9409 100644
--- 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
index 577c58b..010303c 100644
--- 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
index 4dca3d6..17c6f05 100644
--- 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
index c4cf549..95e63b6 100644
--- 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
index 043f2aa..637a018 100644
--- 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
index a97d943..dbd592f 100644
--- 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
index bfc94e3..0682437 100644
--- 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
index d7624b2..9ca72f7 100644
--- 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
index 4e2c70a..9bd022b 100644
--- 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
index fd17a20..35c1936 100644
--- 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;
 
 /**