From bf44f146685770d1eb94a8a4e6b72bbfc7b438d8 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Fri, 1 Sep 2017 16:10:37 -0300 Subject: [PATCH] Add `extra.branch-alias` directive at `composer.json` in order to allow semver installs for development versions --- composer.json | 83 +++++++++++++++++++++++++++------------------------ composer.lock | 23 +++++++------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index b12fa291..70cebcc4 100644 --- a/composer.json +++ b/composer.json @@ -1,41 +1,46 @@ { - "name": "chrisboulton/php-resque", - "type": "library", - "description": "Redis backed library for creating background jobs and processing them later. Based on resque for Ruby.", - "keywords": ["job", "background", "redis", "resque"], - "homepage": "http://www.github.com/chrisboulton/php-resque/", - "license": "MIT", - "authors": [ - { - "name": "Chris Boulton", - "email": "chris@bigcommerce.com" - } - ], - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/chrisboulton/credis" - } - ], - "require": { - "php": ">=5.3.0", - "ext-pcntl": "*", - "colinmollenhour/credis": "~1.7", - "psr/log": "~1.0" - }, - "suggest": { - "ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.", - "ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available." - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "bin": [ - "bin/resque" - ], - "autoload": { - "psr-0": { - "Resque": "lib" - } - } + "name": "chrisboulton/php-resque", + "type": "library", + "description": "Redis backed library for creating background jobs and processing them later. Based on resque for Ruby.", + "keywords": ["job", "background", "redis", "resque"], + "homepage": "http://www.github.com/chrisboulton/php-resque/", + "license": "MIT", + "authors": [ + { + "name": "Chris Boulton", + "email": "chris@bigcommerce.com" + } + ], + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/chrisboulton/credis" + } + ], + "require": { + "php": ">=5.3.0", + "ext-pcntl": "*", + "colinmollenhour/credis": "~1.7", + "psr/log": "~1.0" + }, + "suggest": { + "ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.", + "ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available." + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "bin": [ + "bin/resque" + ], + "autoload": { + "psr-0": { + "Resque": "lib" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + } } diff --git a/composer.lock b/composer.lock index 0f431b90..33d3f26d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "41124ffd15a15b52947e430b92b8f10f", - "content-hash": "11906622d4e017ff6807c6dff51f208d", + "content-hash": "e813c4b5ecd745892ddc86e410592220", "packages": [ { "name": "colinmollenhour/credis", @@ -44,7 +43,7 @@ ], "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", "homepage": "https://github.com/colinmollenhour/credis", - "time": "2016-03-24 15:50:52" + "time": "2016-03-24T15:50:52+00:00" }, { "name": "psr/log", @@ -82,7 +81,7 @@ "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2012-12-21T11:40:51+00:00" } ], "packages-dev": [ @@ -145,7 +144,7 @@ "testing", "xunit" ], - "time": "2014-09-02 10:13:14" + "time": "2014-09-02T10:13:14+00:00" }, { "name": "phpunit/php-file-iterator", @@ -192,7 +191,7 @@ "filesystem", "iterator" ], - "time": "2015-06-21 13:08:43" + "time": "2015-06-21T13:08:43+00:00" }, { "name": "phpunit/php-text-template", @@ -233,7 +232,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -277,7 +276,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2016-05-12T18:03:57+00:00" }, { "name": "phpunit/php-token-stream", @@ -327,7 +326,7 @@ "keywords": [ "tokenizer" ], - "time": "2014-03-03 05:10:30" + "time": "2014-03-03T05:10:30+00:00" }, { "name": "phpunit/phpunit", @@ -400,7 +399,7 @@ "testing", "xunit" ], - "time": "2014-10-17 09:04:17" + "time": "2014-10-17T09:04:17+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -449,7 +448,7 @@ "mock", "xunit" ], - "time": "2013-01-13 10:24:48" + "time": "2013-01-13T10:24:48+00:00" }, { "name": "symfony/yaml", @@ -498,7 +497,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-09-02 01:57:56" + "time": "2016-09-02T01:57:56+00:00" } ], "aliases": [],