Merge pull request #8 from macbookandrew/develop

release 1.1.2
stevegrunwell · Jul 8, 2022 · 7ad1da1 · 7ad1da1
2 parents f37b8e7 + 9d4904f
commit 7ad1da1
Show file tree

Hide file tree

Showing 9 changed files with 317 additions and 121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: php
 dist: trusty
 
@@ -12,12 +11,16 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - php: 7.2
+    - php: 7.4
       env: WP_VERSION=trunk
-    - php: 7.2
+    - php: 7.4
       env: WP_VERSION=trunk COMPOSER_LOWEST=1
-    - php: 7.2
+    - php: 7.3
       env: WP_VERSION=latest RUN_PHPCS=1 RUN_CODE_COVERAGE=1
+    - php: 7.3
+      env: WP_VERSION=latest
+    - php: 7.2
+      env: WP_VERSION=latest
     - php: 7.1
       env: WP_VERSION=latest
     - php: 7.0
@@ -31,7 +34,7 @@ before_script:
       chmod +x coveralls.phar
       mkdir -p build/logs
     else
-      phpenv config-rm xdebug.ini
+      phpenv config-rm xdebug.ini || echo 'No xdebug config.'
     fi
   - |
     if [[ ! -z "$WP_VERSION" ]]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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).
 
+## [1.1.2] - 2022-05-26
+
+* Update PHP compatiblity checks ([#6], props @jrfnl)
+* Update test builds ([#6], props @jrfnl)
+* Allow recent versions of [composer/installers](https://github.com/composer/installers) and [dealerdirect/phpcodesniffer-composer-installer](https://github.com/PHPCSStandards/composer-installer) packages ([#7], props @macbookandrew)
+
 ## [1.1.1] - 2018-06-14
 
 * Lower the minimum version of [composer/installers](https://github.com/composer/installers) to `^1.0` ([#2], props @aaemnnosttv).

diff --git a/composer.json b/composer.json
@@ -23,12 +23,12 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.2",
-        "composer/installers": "^1.0"
+        "composer/installers": "^1.0||^2.0"
     },
     "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-        "wimg/php-compatibility": "^8.1",
-        "wp-coding-standards/wpcs": "^0.14"
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5||^0.6||^0.7",
+        "phpcompatibility/phpcompatibility-wp": "^2.1",
+        "wp-coding-standards/wpcs": "^2.2"
     },
     "autoload": {
       "files": ["wp-cache-remember.php"]