From 18fcf75250791407778ba852610ee5cd4f759202 Mon Sep 17 00:00:00 2001 From: Evan Mattson Date: Thu, 24 May 2018 18:11:07 +0300 Subject: [PATCH 1/7] loosen version constraint for composer/installers --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 9addd7b..a6defd7 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "minimum-stability": "stable", "require": { "php": ">=5.2", - "composer/installers": "^1.5" + "composer/installers": "^1.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4", diff --git a/composer.lock b/composer.lock index 381615e..c3cdfd2 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bebf9e2b96bfad1fddb1d585c0c76395", + "content-hash": "20b6e39d276e55faa6462ddce04f5cca", "packages": [ { "name": "composer/installers", @@ -198,16 +198,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1" + "reference": "4842476c434e375f9d3182ff7b89059583aa8b27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27", + "reference": "4842476c434e375f9d3182ff7b89059583aa8b27", "shasum": "" }, "require": { @@ -217,7 +217,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ "bin/phpcs", @@ -245,7 +245,7 @@ "phpcs", "standards" ], - "time": "2017-12-19T21:44:46+00:00" + "time": "2018-02-20T21:35:23+00:00" }, { "name": "wimg/php-compatibility", From 0f0e8a5200d651e58991cb4573e5262a760f869a Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 04:40:42 +0000 Subject: [PATCH 2/7] Lower the requirement for composer/installers to ^1.0 --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 9addd7b..a6defd7 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "minimum-stability": "stable", "require": { "php": ">=5.2", - "composer/installers": "^1.5" + "composer/installers": "^1.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4", diff --git a/composer.lock b/composer.lock index 381615e..05b0f86 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bebf9e2b96bfad1fddb1d585c0c76395", + "content-hash": "20b6e39d276e55faa6462ddce04f5cca", "packages": [ { "name": "composer/installers", @@ -198,16 +198,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.2.2", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "shasum": "" }, "require": { @@ -217,7 +217,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ "bin/phpcs", @@ -245,7 +245,7 @@ "phpcs", "standards" ], - "time": "2017-12-19T21:44:46+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "wimg/php-compatibility", From e2061442a87851a1d215de9673e51f720aaccb5f Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 04:45:00 +0000 Subject: [PATCH 3/7] Add a new Travis job for running with the lowest matching dependency versions --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fafab06..59ea9df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ matrix: include: - php: 7.2 env: WP_VERSION=trunk + - php: 7.2 + env: WP_VERSION=trunk COMPOSER_ARGS="--prefer-lowest" - php: 7.2 env: WP_VERSION=latest RUN_PHPCS=1 RUN_CODE_COVERAGE=1 - php: 7.1 @@ -36,7 +38,10 @@ before_script: bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION composer global require "phpunit/phpunit=4.8.*|5.7.*" fi - - composer install --prefer-dist --no-suggest --no-autoloader + - | + if [[ ! -z "$COMPOSER_ARGS" ]]; then + composer install --prefer-dist --no-suggest --no-autoloader $COMPOSER_ARGS + fi script: - | From f4ec33b120cfa8d40cafbba9c0df3338eae95828 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 04:55:51 +0000 Subject: [PATCH 4/7] Instead of accepting any Composer arguments, explicitly run composer update --prefer-lowest if the COMPOSER_LOWEST env variable is set --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59ea9df..5b3d2f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: - php: 7.2 env: WP_VERSION=trunk - php: 7.2 - env: WP_VERSION=trunk COMPOSER_ARGS="--prefer-lowest" + env: WP_VERSION=trunk COMPOSER_LOWEST=1 - php: 7.2 env: WP_VERSION=latest RUN_PHPCS=1 RUN_CODE_COVERAGE=1 - php: 7.1 @@ -39,8 +39,10 @@ before_script: composer global require "phpunit/phpunit=4.8.*|5.7.*" fi - | - if [[ ! -z "$COMPOSER_ARGS" ]]; then - composer install --prefer-dist --no-suggest --no-autoloader $COMPOSER_ARGS + if [[ ${COMPOSER_LOWEST} ]]; then + composer update $COMPOSER_ARGS + else + composer install --prefer-dist --no-suggest --no-autoloader fi script: From a4e116e2b3f7c9d8509cf47108c27aad84d82684 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 04:58:37 +0000 Subject: [PATCH 5/7] Add a CHANGELOG entry for the lowered composer/installers requirement --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 780e422..b777deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [Unreleased] + +* Lower the minimum version of [composer/installers](https://github.com/composer/installers) to `^1.0` ([#2]). + ## [1.1.0] - 2018-04-14 * Bypass the caching operation if a callback either throws an Exception or returns a `WP_Error` object ([#1]). @@ -25,3 +29,4 @@ Initial public release of the package, including the following functions: [1.1.0]: https://github.com/stevegrunwell/wp-cache-remember/releases/tag/v1.1.0 [1.0.0]: https://github.com/stevegrunwell/wp-cache-remember/releases/tag/v1.0.0 [#1]: https://github.com/stevegrunwell/wp-cache-remember/pull/1 +[#2]: https://github.com/stevegrunwell/wp-cache-remember/issues/2 From 837c48ec3053284db3164d94af38d5a56d4ca2e8 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 05:08:41 +0000 Subject: [PATCH 6/7] Ensure @aaemnnosttv gets props, since I kind of robbed them of #3 with #4 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b777deb..cc16f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -* Lower the minimum version of [composer/installers](https://github.com/composer/installers) to `^1.0` ([#2]). +* Lower the minimum version of [composer/installers](https://github.com/composer/installers) to `^1.0` ([#2], props @aaemnnosttv). ## [1.1.0] - 2018-04-14 From a7d38263d9ff257b75874fa332b27d2c5bee37f4 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Thu, 14 Jun 2018 05:09:52 +0000 Subject: [PATCH 7/7] Version bump to 1.1.1 --- CHANGELOG.md | 3 ++- wp-cache-remember.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc16f5e..d1be802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.1.1] - 2018-06-14 * Lower the minimum version of [composer/installers](https://github.com/composer/installers) to `^1.0` ([#2], props @aaemnnosttv). @@ -26,6 +26,7 @@ Initial public release of the package, including the following functions: * `forget_site_transient()` [Unreleased]: https://github.com/stevegrunwell/wp-cache-remember/compare/master...develop +[1.1.1]: https://github.com/stevegrunwell/wp-cache-remember/releases/tag/v1.1.1 [1.1.0]: https://github.com/stevegrunwell/wp-cache-remember/releases/tag/v1.1.0 [1.0.0]: https://github.com/stevegrunwell/wp-cache-remember/releases/tag/v1.0.0 [#1]: https://github.com/stevegrunwell/wp-cache-remember/pull/1 diff --git a/wp-cache-remember.php b/wp-cache-remember.php index 520e2c5..cd011ab 100644 --- a/wp-cache-remember.php +++ b/wp-cache-remember.php @@ -5,7 +5,7 @@ * Description: Helper for the WordPress object cache and transients. * Author: Steve Grunwell * Author URI: https://stevegrunwell.com - * Version: 1.1.0 + * Version: 1.1.1 * * @package SteveGrunwell\WPCacheRemember */