From 38042820e9ee7ccc76d66f9c480fe8b7f0e8aaf0 Mon Sep 17 00:00:00 2001 From: Norbert Orzechowicz Date: Sat, 20 Apr 2019 18:08:40 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e808e1b..e157a55 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,15 @@ [![License](https://poser.pugx.org/coduo/php-humanizer/license)](https://packagist.org/packages/coduo/php-humanizer) ### Tests -* [![Build Status](https://travis-ci.org/coduo/php-humanizer.svg?branch=master)](https://travis-ci.org/coduo/php-humanizer) - master (3.0) +* [![Build Status](https://travis-ci.org/coduo/php-humanizer.svg?branch=master)](https://travis-ci.org/coduo/php-humanizer) - master (3.1) +* [![Build Status](https://travis-ci.org/coduo/php-humanizer.svg?branch=3.0)](https://travis-ci.org/coduo/php-humanizer) - 3.0 * [![Build Status](https://travis-ci.org/coduo/php-humanizer.svg?branch=2.0)](https://travis-ci.org/coduo/php-humanizer) - 2.0 * [![Build Status](https://travis-ci.org/coduo/php-humanizer.svg?branch=1.0)](https://travis-ci.org/coduo/php-humanizer) - 1.0 -[Readme for master (3.0) version](https://github.com/coduo/php-humanizer/tree/master/README.md) -[Readme for 2.0 version](https://github.com/coduo/php-matcher/tree/2.0/README.md) -[Readme for 1.0 version](https://github.com/coduo/php-matcher/tree/1.0/README.md) +[Readme for master (3.1) version](https://github.com/coduo/php-humanizer/tree/master/README.md) +[Readme for 3.0 version](https://github.com/coduo/php-humanizer/tree/3.0/README.md) +[Readme for 2.0 version](https://github.com/coduo/php-humanizer/tree/2.0/README.md) +[Readme for 1.0 version](https://github.com/coduo/php-humanizer/tree/1.0/README.md) Humanize values to make them readable for regular people ;) From 9d83e509dacfd26250ee4c6b0f195affb08cb1e2 Mon Sep 17 00:00:00 2001 From: Norbert Orzechowicz Date: Mon, 29 Apr 2019 17:57:07 +0200 Subject: [PATCH 2/3] Moved php-cs-fixer to dev dependency where it belongs to --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index bb9d931..0e76a37 100644 --- a/composer.json +++ b/composer.json @@ -18,13 +18,13 @@ "php": ">=7.0.0", "symfony/config": "^2.3|^3.0|^4", "symfony/translation": "^2.3|^3.0|^4", - "symfony/yaml": "^2.3|^3.0|^4", - "friendsofphp/php-cs-fixer": "^2.14" + "symfony/yaml": "^2.3|^3.0|^4" }, "require-dev": { "thunderer/shortcode": "^0.7", "phpspec/phpspec": "^2", - "phpunit/phpunit": "^4.5|^5.0" + "phpunit/phpunit": "^4.5|^5.0", + "friendsofphp/php-cs-fixer": "^2.14" }, "config": { "bin-dir": "bin" From 3d0ce36f40cb0667afbbafe41b0a4fccab574b51 Mon Sep 17 00:00:00 2001 From: Norbert Orzechowicz Date: Wed, 8 Jul 2020 14:33:18 +0200 Subject: [PATCH 3/3] Update composer.json --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 0e76a37..f5598f8 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,6 @@ "Coduo\\PHPHumanizer\\Tests\\": "tests/" } }, - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "suggest": { "ext-intl": "Required if you are going to use humanizer with locales different than en_EN" },