From 932a48626ead3a9cb9d92277c94a59ae38a0fe6e Mon Sep 17 00:00:00 2001 From: Alexander Yakovlev Date: Wed, 19 Oct 2016 11:36:14 +0700 Subject: [PATCH] migration module fixes --- application/bootstrap.php | 2 +- composer.json | 10 +-- composer.lock | 127 ++++++++++---------------------------- 3 files changed, 38 insertions(+), 101 deletions(-) diff --git a/application/bootstrap.php b/application/bootstrap.php index 60073f7..3cdac74 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -74,7 +74,7 @@ $modules = [ 'email' => $vendor_path.'tscms/email',// Electronic mail class 'debug-toolbar' => MODPATH.'debug-toolbar', // Debug toolbar 'config-writer' => MODPATH.'config-writer', // Write to PHP configs - 'migrations' => $vendor_path.'zer0pants/kohana-migrations', // SQL migrations + 'migrations' => $vendor_path.'oreolek/kohana-migrations', // SQL migrations 'core' => SYSPATH, // Core system ]; if (Kohana::$environment === Kohana::DEVELOPMENT) diff --git a/composer.json b/composer.json index dadb95d..cc0c992 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,7 @@ "repositories": [ { "type": "git", - "url": "https://github.com/zer0pants/kohana-migrations.git" - }, - { - "type": "git", - "url": "git@github.com:Oreolek/minion.git" + "url": "git@github.com:Oreolek/kohana-migrations.git" } ], "require": { @@ -35,13 +31,13 @@ "kohana/codebench": "3.4.*", "kohana/database": "3.4.*", "kohana/image": "3.4.*", - "oreolek/minion": "3.4.*", + "kohana/minion": "3.4.*", "kohana/orm": "3.4.*", "psr/log": "^1.0", "zombor/kostache": "^4.0", "tscms/email": "dev-3.3/master", "twbs/bootstrap-sass": "^3.3", - "zer0pants/kohana-migrations": "dev-3.4/develop", + "oreolek/kohana-migrations": "dev-3.4/develop", "ddeboer/transcoder": "^1.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 6a29a76..d1bc666 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9eac1baa125d93ff87bcc40f4e3c0342", - "content-hash": "a3fc6d7996e7c8e77727008335b6570a", + "hash": "3fb8fd5b0f087861ad3c0a1e03f59d52", + "content-hash": "e508757e467a827fae945dd82d99f251", "packages": [ { "name": "composer/installers", @@ -695,63 +695,58 @@ "time": "2014-06-20 19:34:49" }, { - "name": "oreolek/minion", + "name": "oreolek/kohana-migrations", "version": "dev-3.4/develop", "source": { "type": "git", - "url": "git@github.com:Oreolek/minion.git", - "reference": "cdf4647397ee1ec1083f983f573ec147c123a475" + "url": "git@github.com:Oreolek/kohana-migrations.git", + "reference": "ba56bc84b2dca71321b0964d15fd95ed4bcf3a53" }, "require": { - "composer/installers": "~1.0", "kohana/core": ">=3.4", - "php": ">=5.4.0" - }, - "require-dev": { - "kohana/core": "3.4.*@dev", - "kohana/koharness": "*@dev", - "kohana/unittest": "3.4.*@dev" - }, - "type": "kohana-module", - "extra": { - "branch-alias": { - "dev-3.3/develop": "3.3.x-dev", - "dev-3.4/develop": "3.4.x-dev" - }, - "installer-paths": { - "vendor/{$vendor}/{$name}": [ - "type:kohana-module" - ] - } + "kohana/minion": ">=3.4", + "php": ">=5.2.4" }, + "type": "library", "license": [ "BSD-3-Clause" ], "authors": [ { - "name": "Kohana Team", - "email": "team@kohanaframework.org", - "homepage": "http://kohanaframework.org/team", + "name": "Michael Roberts", + "email": "michael@verbate.co", "role": "developer" + }, + { + "name": "Mitch", + "email": "mitch@verbate.co", + "role": "developer" + }, + { + "name": "Alexander Yakovlev", + "email": "keloero@oreolek.ru", + "role": "developer" + }, + { + "name": "Contributors", + "homepage": "https://github.com/kohana-minion/tasks-migrations/graphs/contributors", + "role": "contributor" } ], - "description": "The official kohana module for running tasks via the CLI.", - "homepage": "http://kohanaframework.org", + "description": "Migration tasks for the kohana-minion cli framework, 3.4 branch", + "homepage": "https://github.com/Oreolek/kohana-migrations", "keywords": [ - "cli", - "console", + "database", "framework", "kohana", - "minion", - "task" + "migrations", + "tasks" ], "support": { - "issues": "http://dev.kohanaframework.org", - "forum": "http://forum.kohanaframework.org", - "irc": "irc://irc.freenode.net/kohana", - "source": "http://github.com/kohana/core" + "issues": "https://github.com/Oreolek/kohana-migrations/issues", + "source": "https://github.com/Oreolek/kohana-migrations" }, - "time": "2016-10-19 04:13:53" + "time": "2016-10-19 04:32:04" }, { "name": "psr/log", @@ -958,60 +953,6 @@ ], "time": "2016-07-25 19:58:53" }, - { - "name": "zer0pants/kohana-migrations", - "version": "dev-3.4/develop", - "source": { - "type": "git", - "url": "https://github.com/zer0pants/kohana-migrations.git", - "reference": "420ad1ddb805b824e2c0e9a6624f951ecd075bc8" - }, - "require": { - "kohana/core": ">=3.4", - "kohana/minion": ">=3.4", - "php": ">=5.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-3.3/develop": "3.3.x-dev" - } - }, - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Michael Roberts", - "email": "michael@verbate.co", - "role": "developer" - }, - { - "name": "Mitch", - "email": "mitch@verbate.co", - "role": "developer" - }, - { - "name": "Contributors", - "homepage": "https://github.com/kohana-minion/tasks-migrations/graphs/contributors", - "role": "contributor" - } - ], - "description": "Migration tasks for the kohana-minion cli framework", - "homepage": "https://github.com/kohana-minion/tasks-migrations", - "keywords": [ - "database", - "framework", - "kohana", - "migrations", - "tasks" - ], - "support": { - "issues": "https://github.com/kohana-minion/tasks-migrations/issues", - "source": "https://github.com/kohana-minion/tasks-migrations" - }, - "time": "2016-04-04 04:25:55" - }, { "name": "zombor/kostache", "version": "v4.0.3", @@ -2544,7 +2485,7 @@ "minimum-stability": "dev", "stability-flags": { "tscms/email": 20, - "zer0pants/kohana-migrations": 20, + "oreolek/kohana-migrations": 20, "phing/phing": 20 }, "prefer-stable": false,