diff --git a/.gitignore b/.gitignore index 9d9abe2e5f90846aa427eaff3e7c8710634547bd..42c884976213e91105b8f26b767c150532a89082 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ includes/config.php +includes/trac-users.txt trac-to-gitlab.phar vendor/* diff --git a/composer.json b/composer.json index 2c1bc9ffc5985f224dffa46dceae669826e5d65f..5c7c683069c7085e57ded917d3ab9f1f69dcbb40 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "dachaz/trac-to-gitlab", "version": "1.0.1", - "type": "CLI utility", + "type": "package", "description": "Command line utility to migrate Trac tickets to GitLab issues", "homepage": "https://github.com/Dachaz/trac-to-gitlab", "license": "WTFPL", @@ -16,7 +16,7 @@ "ext-mbstring": "*", "ext-json": "*", "m4tthumphrey/php-gitlab-api": "9.9.0", - "fguillot/json-rpc": "1.0.0", + "fguillot/json-rpc": "dev-master", "php-http/guzzle6-adapter": "^1.1" }, "autoload": { diff --git a/composer.lock b/composer.lock index eefd4507988f9d02cb7635e32a131df2ee43d2aa..bc0f9b4827766c2bb318f325e52ff259a6dec519 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a004bc34bf09724ebf546d41f934ddb7", + "content-hash": "f42b7c7718a0b7997c56aba15b814e65", "packages": [ { "name": "clue/stream-filter", @@ -60,21 +60,26 @@ }, { "name": "fguillot/json-rpc", - "version": "v1.0.0", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/fguillot/JsonRPC.git", - "reference": "5a11f1414780a200f09b78d20ab72b5cee4faa95" + "url": "https://github.com/matasarei/JsonRPC.git", + "reference": "8e8832f61c3f450b067c0c5c3020bcde4ee88f01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fguillot/JsonRPC/zipball/5a11f1414780a200f09b78d20ab72b5cee4faa95", - "reference": "5a11f1414780a200f09b78d20ab72b5cee4faa95", + "url": "https://api.github.com/repos/matasarei/JsonRPC/zipball/8e8832f61c3f450b067c0c5c3020bcde4ee88f01", + "reference": "8e8832f61c3f450b067c0c5c3020bcde4ee88f01", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-json": "*", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "4.8.*" }, + "default-branch": true, "type": "library", "autoload": { "psr-0": { @@ -91,9 +96,12 @@ } ], "description": "Simple Json-RPC client/server library that just works", - "homepage": "https://github.com/fguillot/JsonRPC", - "abandoned": true, - "time": "2015-07-01T19:50:31+00:00" + "homepage": "https://github.com/matasarei/JsonRPC", + "support": { + "issues": "https://github.com/matasarei/JsonRPC/issues", + "source": "https://github.com/matasarei/JsonRPC/tree/master" + }, + "time": "2020-02-07T00:12:56+00:00" }, { "name": "guzzlehttp/guzzle", @@ -920,13 +928,16 @@ "packages-dev": [], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "fguillot/json-rpc": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=5.3.0", + "php": ">=5.6.0", "ext-mbstring": "*", "ext-json": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/convert.php b/convert.php index 733b43ae697d4e55eebdd06ebb7cae50e103e8ad..e2370993e736b73424120cd7b28420c87a924ce2 100755 --- a/convert.php +++ b/convert.php @@ -11,7 +11,7 @@ $steps = [ 'commits' => __DIR__ . '/steps/clone-svn-repository.php', 'history' => __DIR__ . '/steps/rewrite-history.php', 'push' => __DIR__ . '/steps/push-repository.php', - 'comments' => __DIR__ . '/steps/add-comments.php', +// 'comments' => __DIR__ . '/steps/add-comments.php', ]; if (!class_exists('Transliterator')) { diff --git a/src/Migration.php b/src/Migration.php index 88abcebeea7f9b819db2413de1a30fc3e466f313..7863038f3f4f9de24e03b19f6f4b0d16cb9fb687 100644 --- a/src/Migration.php +++ b/src/Migration.php @@ -250,6 +250,3 @@ class Migration return $text; } } - - -?>