From 4d4706ce1b2eb1963df88568ba780a7aca5c7f06 Mon Sep 17 00:00:00 2001 From: fantiq Date: Wed, 10 Aug 2016 17:16:42 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0composere=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + composer.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 .gitignore create mode 100644 composer.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57872d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vendor/ diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..b38a63d --- /dev/null +++ b/composer.json @@ -0,0 +1,12 @@ +{ + "name": "php/framework", + "description": "a php framework develop more quickly", + "type": "git", + "authors": [ + { + "name": "fantiq", + "email": "fantiq@163.com" + } + ], + "require": {} +} From b1076a5200c607f0d9bdfa243a2bc9dae4f3fb3b Mon Sep 17 00:00:00 2001 From: fantiq Date: Wed, 10 Aug 2016 18:49:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A7=81=E6=9C=89?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 26 ++++++++++++++++++++------ composer.lock | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 composer.lock diff --git a/composer.json b/composer.json index b38a63d..d0b90bb 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,26 @@ { - "name": "php/framework", - "description": "a php framework develop more quickly", - "type": "git", - "authors": [ + "name": "test/phpframework", + "type": "test", + "description": "composer私有仓库测试", + "homepage": "http://git.kuaiqiangche.cc/common/tools", + "license": "MIT", + "authors": [ { - "name": "fantiq", + "name": "fanyilong", "email": "fantiq@163.com" } ], - "require": {} + "require": { + "php": ">=7.0" + }, + "autoload": { + "psr-4": { + "framework\\": "src/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "master" + } + } } diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..f2fbcc8 --- /dev/null +++ b/composer.lock @@ -0,0 +1,20 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "f194eb0cdd91610977da7bfa7ab79153", + "content-hash": "2b6da7410734361e7eb4465a461817f1", + "packages": [], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=7.0" + }, + "platform-dev": [] +} From 9cbca2be128ac3a06298dd331661ceba14228c9c Mon Sep 17 00:00:00 2001 From: fantiq Date: Wed, 10 Aug 2016 21:58:46 +0800 Subject: [PATCH 3/8] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d0b90bb..115e624 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "test/phpframework", + "name": "fantest/phpframework", "type": "test", "description": "composer私有仓库测试", - "homepage": "http://git.kuaiqiangche.cc/common/tools", + "homepage": "https://github.com/fantiq", "license": "MIT", "authors": [ { From 3e5e6cc6397dc96b638e27390f9b4499e05e06aa Mon Sep 17 00:00:00 2001 From: fantiq Date: Thu, 11 Aug 2016 08:50:11 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ composer.lock | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 57872d0..6e6ae76 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /vendor/ +/.* +!.gitignore \ No newline at end of file diff --git a/composer.lock b/composer.lock deleted file mode 100644 index f2fbcc8..0000000 --- a/composer.lock +++ /dev/null @@ -1,20 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "hash": "f194eb0cdd91610977da7bfa7ab79153", - "content-hash": "2b6da7410734361e7eb4465a461817f1", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">=7.0" - }, - "platform-dev": [] -} From 8ff2f6e24fc65dbf14a4ea50940b76732c119086 Mon Sep 17 00:00:00 2001 From: fantiq Date: Thu, 11 Aug 2016 11:11:27 +0800 Subject: [PATCH 5/8] Update composer.json --- composer.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 115e624..f503925 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "fantest/phpframework", - "type": "test", + "name": "fantiq/phpframework", + "type": "composer", "description": "composer私有仓库测试", "homepage": "https://github.com/fantiq", "license": "MIT", @@ -17,10 +17,5 @@ "psr-4": { "framework\\": "src/" } - }, - "extra": { - "branch-alias": { - "dev-master": "master" - } } } From ee0ef65320d9144c041b6aee313dc93eeb3a0e11 Mon Sep 17 00:00:00 2001 From: fantiq Date: Thu, 11 Aug 2016 14:31:53 +0800 Subject: [PATCH 6/8] Update composer.json --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index f503925..2737610 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,11 @@ "description": "composer私有仓库测试", "homepage": "https://github.com/fantiq", "license": "MIT", + "version" : "1.0.1", + "dist" : { + "url" : "https://github.com/fantiq/phpframework/archive/v1.0.1-dev.zip", + "type" : "zip" + } "authors": [ { "name": "fanyilong", From a8d7f846b4e1af14837a46329ff44409ceb9f61b Mon Sep 17 00:00:00 2001 From: fantiq Date: Thu, 11 Aug 2016 14:32:14 +0800 Subject: [PATCH 7/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2737610..64d4115 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "dist" : { "url" : "https://github.com/fantiq/phpframework/archive/v1.0.1-dev.zip", "type" : "zip" - } + }, "authors": [ { "name": "fanyilong", From 0e4003cb65db64dea17b642835b93bf0b2a79946 Mon Sep 17 00:00:00 2001 From: fantiq Date: Thu, 11 Aug 2016 15:40:04 +0800 Subject: [PATCH 8/8] Update composer.json --- composer.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 64d4115..bffeb2e 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,6 @@ "description": "composer私有仓库测试", "homepage": "https://github.com/fantiq", "license": "MIT", - "version" : "1.0.1", - "dist" : { - "url" : "https://github.com/fantiq/phpframework/archive/v1.0.1-dev.zip", - "type" : "zip" - }, "authors": [ { "name": "fanyilong", @@ -22,5 +17,11 @@ "psr-4": { "framework\\": "src/" } - } + }, + "repositories" : [ + { + "type" : "composer", + "url" : "https://packagist.phpcomposer.com" + } + ] }