From 9c0e118b18ee9bf6bf5ac94f0900816dab8a7a3f Mon Sep 17 00:00:00 2001 From: Bert Hekman Date: Mon, 24 Aug 2015 10:23:16 +0200 Subject: [PATCH 1/3] Add branch alias dev-master => 1.0.x-dev --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 037bbfd0..074a785e 100644 --- a/composer.json +++ b/composer.json @@ -14,5 +14,10 @@ "xhprof_lib/utils/xhprof_runs.php" ] }, - "bin": ["bin/xhprofile"] + "bin": ["bin/xhprofile"], + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + } } From 3a8279ee5718deba8c6d488d58f636630759cd96 Mon Sep 17 00:00:00 2001 From: Bert Hekman Date: Tue, 5 Jan 2016 12:56:00 +0100 Subject: [PATCH 2/3] Add vendor and composer.lock to .gitignore and rename package to pbweb/xhprof --- .gitignore | 3 +++ composer.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f1631981..9a5e54b5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ extension/tests/*.log extension/tests/*.php support/libxhprof/.phutil_module_cache + +/composer.lock +/vendor diff --git a/composer.json b/composer.json index 074a785e..b3fa4a7c 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "facebook/xhprof", + "name": "pbweb/xhprof", "type": "library", "description": "XHProf: A Hierarchical Profiler for PHP", "keywords": ["profiling", "performance"], From 98e9e5e4d3332b59839446b43567d62fc585eadb Mon Sep 17 00:00:00 2001 From: Bert Hekman Date: Tue, 5 Jan 2016 13:12:08 +0100 Subject: [PATCH 3/3] Mark package as replacement for facebook/xhprof and lox/xhprof --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index b3fa4a7c..d986efb9 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,10 @@ ] }, "bin": ["bin/xhprofile"], + "replace": { + "facebook/xhprof": "*", + "lox/xhprof": "*" + }, "extra": { "branch-alias": { "dev-master": "1.0.x-dev"