Merge pull request #310 from AntonShevchuk/master

Anton · web-flow · commit 560235bfdb74 · 2017-10-25T13:25:20.000+03:00
Renamed migrations
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ php:
   - master
 matrix:
   allow_failures:
-    - php: 7.2
     - php: master
 before_install:
   - nvm install stable
diff --git a/application/configs/testing/php.php b/application/configs/testing/php.php
diff --git a/data/migrations/20170316120432_users.php b/data/migrations/20170316120432_users.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class ModuleUsers extends AbstractMigration
+class Users extends AbstractMigration
 {
     /**
      * Change Method.
diff --git a/data/migrations/20170316120433_users_data.php b/data/migrations/20170316120433_users_data.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class DefaultUsers extends AbstractMigration
+class UsersData extends AbstractMigration
 {
     /**
      * Migrate Up.
diff --git a/data/migrations/20170316122256_acl.php b/data/migrations/20170316122256_acl.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class ModuleAcl extends AbstractMigration
+class Acl extends AbstractMigration
 {
     /**
      * Change Method.
diff --git a/data/migrations/20170316122257_acl_data.php b/data/migrations/20170316122257_acl_data.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class DefaultAcl extends AbstractMigration
+class AclData extends AbstractMigration
 {
     /**
      * Migrate Up.
diff --git a/data/migrations/20170316134406_pages.php b/data/migrations/20170316134406_pages.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class ModulePages extends AbstractMigration
+class Pages extends AbstractMigration
 {
     /**
      * Change Method.
diff --git a/data/migrations/20170316134407_pages_data.php b/data/migrations/20170316134407_pages_data.php
@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 
-class DefaultPages extends AbstractMigration
+class PagesData extends AbstractMigration
 {
     /**
      * Migrate Up.
diff --git a/tests/src/ControllerTestCase.php b/tests/src/ControllerTestCase.php
@@ -122,7 +122,7 @@ protected static function assertController($controller)
      */
     protected static function assertRedirect($module, $controller, $params = array(), $code = StatusCode::FOUND)
     {
-        $url = Router::getUrl($module, $controller, $params);
+        $url = Router::getFullUrl($module, $controller, $params);
 
         /**
          * @var RedirectException $exception

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class ModuleUsers extends AbstractMigration`
	`5`	`+class Users extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Change Method.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class DefaultUsers extends AbstractMigration`
	`5`	`+class UsersData extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Migrate Up.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class ModuleAcl extends AbstractMigration`
	`5`	`+class Acl extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Change Method.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class DefaultAcl extends AbstractMigration`
	`5`	`+class AclData extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Migrate Up.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class ModulePages extends AbstractMigration`
	`5`	`+class Pages extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Change Method.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`use Phinx\Migration\AbstractMigration;`
`4`	`4`
`5`		`-class DefaultPages extends AbstractMigration`
	`5`	`+class PagesData extends AbstractMigration`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`	`8`	`* Migrate Up.`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected static function assertController($controller)`
`122`	`122`	`*/`
`123`	`123`	`protected static function assertRedirect($module, $controller, $params = array(), $code = StatusCode::FOUND)`
`124`	`124`	`{`
`125`		`- $url = Router::getUrl($module, $controller, $params);`
	`125`	`+ $url = Router::getFullUrl($module, $controller, $params);`
`126`	`126`
`127`	`127`	`/**`
`128`	`128`	`* @var RedirectException $exception`