diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c983856..02199fee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,13 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '7.3', '7.4' ] + php-versions: [ '7.3', '7.4', '8.0', '8.1' ] wordpress-version: [ 'latest', '5.3.2' ] + exclude: + - php-versions: '8.0' + wordpress-version: '5.3.2' + - php-versions: '8.1' + wordpress-version: '5.3.2' fail-fast: false env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8916c4d0..125b601e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. ## Unreleased +- Updated: Allow composer installs on any PHP version `>=7.2` to allow installation on PHP 8.x projects. +- Updated: Use forked version of https://github.com/moderntribe/monolog-wp-cli to allow `>=7.2` installs. ## 3.6.0 - 2022-08-09 - Added: `wp s1 generate block --with-post-loop-middleware` that gives a base configuration for a block with Post Loop Middleware. diff --git a/composer.json b/composer.json index 5b59d47b..43a137ba 100644 --- a/composer.json +++ b/composer.json @@ -10,14 +10,18 @@ { "type": "vcs", "url": "https://github.com/bordoni/phpass" + }, + { + "type": "vcs", + "url": "https://github.com/moderntribe/monolog-wp-cli" } ], "require": { - "php": "^7.2", + "php": ">=7.2", "composer-plugin-api": "^1.0 || ^2.0", "enshrined/svg-sanitize": "^0.15.4", "filp/whoops": "^2.2@dev", - "mhcg/monolog-wp-cli": "^1.0", + "mhcg/monolog-wp-cli": "dev-master as 1.2.0", "monolog/monolog": "^2.0", "php-di/php-di": "^6.0", "psr/log": "^1.1 || ^2.0 || ^3.0", diff --git a/composer.lock b/composer.lock index 55d300a2..e973246f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8e1d54559e8beeafdbf4d535f61c5cfd", + "content-hash": "f2aee5b123733e1a5c8a7b33efd5bfdc", "packages": [ { "name": "enshrined/svg-sanitize", @@ -124,34 +124,39 @@ }, { "name": "mhcg/monolog-wp-cli", - "version": "v1.1.0", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/mhcg/monolog-wp-cli.git", - "reference": "33cd515fa7e5eac2ebca8aac995aa97a4ab2b77b" + "url": "https://github.com/moderntribe/monolog-wp-cli.git", + "reference": "fdf6fafe86bae3e58fbdb77fd1827f6798762c15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mhcg/monolog-wp-cli/zipball/33cd515fa7e5eac2ebca8aac995aa97a4ab2b77b", - "reference": "33cd515fa7e5eac2ebca8aac995aa97a4ab2b77b", + "url": "https://api.github.com/repos/moderntribe/monolog-wp-cli/zipball/fdf6fafe86bae3e58fbdb77fd1827f6798762c15", + "reference": "fdf6fafe86bae3e58fbdb77fd1827f6798762c15", "shasum": "" }, "require": { "monolog/monolog": "^2.0", - "php": "^7.2" + "php": ">=7.2" }, "require-dev": { "phpunit/phpunit": "8.5.* || 9.0.*", "squizlabs/php_codesniffer": "^3.5", "wp-cli/wp-cli": "^2.0" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { "MHCG\\Monolog\\": "src/Monolog" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "MHCGDev\\Monolog\\": "tests/Monolog" + } + }, "license": [ "MIT" ], @@ -171,10 +176,10 @@ ], "support": { "issues": "https://github.com/mhcg/monolog-wp-cli/issues", - "source": "https://github.com/mhcg/monolog-wp-cli", - "wiki": "https://github.com/mhcg/monolog-wp-cli/wiki" + "wiki": "https://github.com/mhcg/monolog-wp-cli/wiki", + "source": "https://github.com/mhcg/monolog-wp-cli" }, - "time": "2020-03-23T20:17:57+00:00" + "time": "2022-08-10T20:06:45+00:00" }, { "name": "monolog/monolog", @@ -2934,16 +2939,16 @@ }, { "name": "nesbot/carbon", - "version": "2.60.0", + "version": "2.61.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "00a259ae02b003c563158b54fb6743252b638ea6" + "reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/00a259ae02b003c563158b54fb6743252b638ea6", - "reference": "00a259ae02b003c563158b54fb6743252b638ea6", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bdf4f4fe3a3eac4de84dbec0738082a862c68ba6", + "reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6", "shasum": "" }, "require": { @@ -3032,7 +3037,7 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:57:48+00:00" + "time": "2022-08-06T12:41:24+00:00" }, { "name": "nette/finder", @@ -8452,15 +8457,23 @@ "time": "2021-07-11T04:52:41+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "mhcg/monolog-wp-cli", + "version": "9999999-dev", + "alias": "1.2.0", + "alias_normalized": "1.2.0.0" + } + ], "minimum-stability": "dev", "stability-flags": { - "filp/whoops": 20 + "filp/whoops": 20, + "mhcg/monolog-wp-cli": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.2", + "php": ">=7.2", "composer-plugin-api": "^1.0 || ^2.0" }, "platform-dev": [], diff --git a/src/ACF/composer.json b/src/ACF/composer.json index dc39f698..63841d4d 100644 --- a/src/ACF/composer.json +++ b/src/ACF/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-object-meta": "^3.7" }, "autoload": { diff --git a/src/Assets/composer.json b/src/Assets/composer.json index be0de9e4..a104c9c5 100644 --- a/src/Assets/composer.json +++ b/src/Assets/composer.json @@ -8,8 +8,8 @@ "preferred-install": "dist" }, "require": { - "moderntribe/square1-container": "^3.7", - "php": "^7.2" + "php": ">=7.2", + "moderntribe/square1-container": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/Blog_Copier/composer.json b/src/Blog_Copier/composer.json index b2a66421..a4a7da33 100644 --- a/src/Blog_Copier/composer.json +++ b/src/Blog_Copier/composer.json @@ -9,9 +9,9 @@ }, "minimum-stability": "dev", "require": { + "php": ">=7.2", "moderntribe/square1-container": "^3.7", - "moderntribe/square1-queues": "^3.7", - "php": "^7.2" + "moderntribe/square1-queues": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/CLI/composer.json b/src/CLI/composer.json index 3dff688a..c93c7b81 100644 --- a/src/CLI/composer.json +++ b/src/CLI/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-container": "^3.7" }, "autoload": { diff --git a/src/Cache/composer.json b/src/Cache/composer.json index a49d8ad6..6be77c55 100644 --- a/src/Cache/composer.json +++ b/src/Cache/composer.json @@ -8,9 +8,9 @@ "preferred-install": "dist" }, "require": { + "php": ">=7.2", "moderntribe/square1-cli": "^3.7", - "moderntribe/square1-container": "^3.7", - "php": "^7.2" + "moderntribe/square1-container": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/Container/composer.json b/src/Container/composer.json index 4ba2deba..59518fb7 100644 --- a/src/Container/composer.json +++ b/src/Container/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2", + "php": ">=7.2", "php-di/php-di": "^6.0" }, "autoload": { diff --git a/src/Generators/composer.json b/src/Generators/composer.json index 316e8ef1..1b406984 100644 --- a/src/Generators/composer.json +++ b/src/Generators/composer.json @@ -8,9 +8,9 @@ "preferred-install": "dist" }, "require": { + "php": ">=7.2", "moderntribe/square1-cli": "^3.7", - "moderntribe/square1-container": "^3.7", - "php": "^7.2" + "moderntribe/square1-container": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/Log/composer.json b/src/Log/composer.json index e9bbfb6d..0385a458 100644 --- a/src/Log/composer.json +++ b/src/Log/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "psr/log": "^1.1 || ^2.0 || ^3.0", "moderntribe/square1-container": "^3.7", "monolog/monolog": "^2.0", diff --git a/src/Media/composer.json b/src/Media/composer.json index c5020f6a..336adf60 100644 --- a/src/Media/composer.json +++ b/src/Media/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2", + "php": ">=7.2", "enshrined/svg-sanitize": "^0.13.3", "moderntribe/square1-container": "^3.7" }, diff --git a/src/Nav/composer.json b/src/Nav/composer.json index 0e7ddbf5..3e29f100 100644 --- a/src/Nav/composer.json +++ b/src/Nav/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2" + "php": ">=7.2" }, "autoload": { "psr-4": { diff --git a/src/Object_Meta/composer.json b/src/Object_Meta/composer.json index f6015e16..f0f96378 100644 --- a/src/Object_Meta/composer.json +++ b/src/Object_Meta/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-container": "^3.7" }, "autoload": { diff --git a/src/Oembed/composer.json b/src/Oembed/composer.json index ca80b118..a0aa53c2 100644 --- a/src/Oembed/composer.json +++ b/src/Oembed/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-cache": "^3.7" }, "autoload": { diff --git a/src/P2P/composer.json b/src/P2P/composer.json index ef2fd7f4..4bf8f5a0 100644 --- a/src/P2P/composer.json +++ b/src/P2P/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-container": "^3.7" }, "autoload": { diff --git a/src/Pipeline/composer.json b/src/Pipeline/composer.json index 20a8937b..4260730a 100644 --- a/src/Pipeline/composer.json +++ b/src/Pipeline/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-container": "^3.7" }, "autoload": { diff --git a/src/Post_Meta/composer.json b/src/Post_Meta/composer.json index 6725b219..0075ead9 100644 --- a/src/Post_Meta/composer.json +++ b/src/Post_Meta/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-object-meta": "^3.7" }, "autoload": { diff --git a/src/Post_Type/composer.json b/src/Post_Type/composer.json index cc55288c..f6c5b161 100644 --- a/src/Post_Type/composer.json +++ b/src/Post_Type/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-object-meta": "^3.7" }, "autoload": { diff --git a/src/Queues/composer.json b/src/Queues/composer.json index e4950de5..af467006 100644 --- a/src/Queues/composer.json +++ b/src/Queues/composer.json @@ -9,9 +9,9 @@ }, "minimum-stability": "dev", "require": { + "php": ">=7.2", "moderntribe/square1-cli": "^3.7", - "moderntribe/square1-container": "^3.7", - "php": "^7.2" + "moderntribe/square1-container": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/Queues_Mysql/composer.json b/src/Queues_Mysql/composer.json index 9ee80f6a..0e60a050 100644 --- a/src/Queues_Mysql/composer.json +++ b/src/Queues_Mysql/composer.json @@ -9,10 +9,10 @@ }, "minimum-stability": "dev", "require": { + "php": ">=7.2", "moderntribe/square1-cli": "^3.7", "moderntribe/square1-container": "^3.7", - "moderntribe/square1-queues": "^3.7", - "php": "^7.2" + "moderntribe/square1-queues": "^3.7" }, "autoload": { "psr-4": { diff --git a/src/Request/composer.json b/src/Request/composer.json index 4c569dd1..93e4115a 100644 --- a/src/Request/composer.json +++ b/src/Request/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2" + "php": ">=7.2" }, "autoload": { "psr-4": { diff --git a/src/Required_Page/composer.json b/src/Required_Page/composer.json index 7d2b9adf..be555968 100644 --- a/src/Required_Page/composer.json +++ b/src/Required_Page/composer.json @@ -9,8 +9,8 @@ }, "minimum-stability": "dev", "require": { - "moderntribe/square1-container": "^3.7", - "php": "^7.2" + "php": ">=7.2", + "moderntribe/square1-container": "^3.7" }, "suggest": { "moderntribe/square1-acf": "Supports automatic registration of options to manage the assigned pages" diff --git a/src/Routes/composer.json b/src/Routes/composer.json index fedeb0ce..7ce7df37 100644 --- a/src/Routes/composer.json +++ b/src/Routes/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-container": "^3.7" }, "autoload": { diff --git a/src/Schema/composer.json b/src/Schema/composer.json index 0d479bbe..2d974510 100644 --- a/src/Schema/composer.json +++ b/src/Schema/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2" + "php": ">=7.2" }, "autoload": { "psr-4": { diff --git a/src/Settings/composer.json b/src/Settings/composer.json index 68fc3cdc..e3e2e348 100644 --- a/src/Settings/composer.json +++ b/src/Settings/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2" + "php": ">=7.2" }, "autoload": { "psr-4": { diff --git a/src/Taxonomy/composer.json b/src/Taxonomy/composer.json index 072ae4c3..f9037d80 100644 --- a/src/Taxonomy/composer.json +++ b/src/Taxonomy/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-object-meta": "^3.7" }, "autoload": { diff --git a/src/Twig/composer.json b/src/Twig/composer.json index 1b0323bb..c8733010 100644 --- a/src/Twig/composer.json +++ b/src/Twig/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2", + "php": ">=7.2", "twig/twig": "^3.0" }, "autoload": { diff --git a/src/User/composer.json b/src/User/composer.json index 89fc9b68..c43e5a60 100644 --- a/src/User/composer.json +++ b/src/User/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2", + "php": ">=7.2", "moderntribe/square1-object-meta": "^3.7" }, "autoload": { diff --git a/src/Utils/composer.json b/src/Utils/composer.json index a6c35935..3805eb2b 100644 --- a/src/Utils/composer.json +++ b/src/Utils/composer.json @@ -8,7 +8,7 @@ "preferred-install": "dist" }, "require": { - "php": "^7.2" + "php": ">=7.2" }, "autoload": { "psr-4": { diff --git a/src/Whoops/composer.json b/src/Whoops/composer.json index 9f81a772..204f46c2 100644 --- a/src/Whoops/composer.json +++ b/src/Whoops/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "dev", "require": { - "php": "^7.2", + "php": ">=7.2", "filp/whoops": "^2.2@dev", "moderntribe/square1-container": "^3.7" },