From e9bf5d8a85cefbb761195f36d4fbb396af738eb7 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Thu, 6 Jan 2022 03:18:48 -0800 Subject: [PATCH 1/5] Update `onelogin/php-saml` to v4.0.0 --- composer.json | 2 +- composer.lock | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index b9dbf8e..74a00f7 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "onelogin/php-saml": "^3.6" + "onelogin/php-saml": "^4.0" }, "require-dev": { "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master", diff --git a/composer.lock b/composer.lock index 05d77d4..9c487c0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,38 +4,39 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ae9773c8cb26c9eff8c83b77a4751e56", + "content-hash": "87565880984835580b734b751b71adba", "packages": [ { "name": "onelogin/php-saml", - "version": "3.6.1", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/onelogin/php-saml.git", - "reference": "a7328b11887660ad248ea10952dd67a5aa73ba3b" + "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b", - "reference": "a7328b11887660ad248ea10952dd67a5aa73ba3b", + "url": "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979", + "reference": "f30f5062f3653c4d2082892d207f4dc3e577d979", "shasum": "" }, "require": { - "php": ">=5.4", + "php": ">=7.3", "robrichards/xmlseclibs": ">=3.1.1" }, "require-dev": { - "pdepend/pdepend": "^2.5.0", - "php-coveralls/php-coveralls": "^1.0.2 || ^2.0", - "phploc/phploc": "^2.1 || ^3.0 || ^4.0", - "phpunit/phpunit": "<7.5.18", - "sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0", - "squizlabs/php_codesniffer": "^3.1.1" + "pdepend/pdepend": "^2.8.0", + "php-coveralls/php-coveralls": "^2.0", + "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0", + "phpunit/phpunit": "^9.5", + "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ", + "squizlabs/php_codesniffer": "^3.5.8" }, "suggest": { "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs", - "ext-gettext": "Install gettext and php5-gettext libs to handle translations", - "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)" + "ext-dom": "Install xml lib", + "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)", + "ext-zlib": "Install zlib" }, "type": "library", "autoload": { @@ -59,7 +60,7 @@ "issues": "https://github.com/onelogin/php-saml/issues", "source": "https://github.com/onelogin/php-saml/" }, - "time": "2021-03-02T10:13:07+00:00" + "time": "2021-03-02T10:19:19+00:00" }, { "name": "robrichards/xmlseclibs", From d240093477192e01e536d7de381fb3c46acee76c Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Thu, 6 Jan 2022 03:22:04 -0800 Subject: [PATCH 2/5] Add explicit requirement statement for PHP version --- composer.json | 3 ++- composer.lock | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 74a00f7..a65a956 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "onelogin/php-saml": "^4.0" + "onelogin/php-saml": "^4.0", + "php": "^7.4 || ^8.0" }, "require-dev": { "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master", diff --git a/composer.lock b/composer.lock index 9c487c0..95986c0 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": "87565880984835580b734b751b71adba", + "content-hash": "bde2a8661d7aa1a7f0e0680520124bae", "packages": [ { "name": "onelogin/php-saml", @@ -4782,7 +4782,9 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.4 || ^8.0" + }, "platform-dev": [], "plugin-api-version": "2.1.0" } From c49d9170b7eaef4c7a92cdcbf5bf9a008c7d3687 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Thu, 6 Jan 2022 03:26:06 -0800 Subject: [PATCH 3/5] Use build tools with PHP 7.4 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cd1ec9..1b1e3a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: lint: working_directory: ~/pantheon-systems/wp-saml-auth docker: - - image: quay.io/pantheon-public/build-tools-ci:6.x + - image: quay.io/pantheon-public/build-tools-ci:7.x-php7.4 steps: - checkout - restore_cache: @@ -39,7 +39,7 @@ jobs: working_directory: ~/pantheon-systems/wp-saml-auth parallelism: 1 docker: - - image: quay.io/pantheon-public/build-tools-ci:6.x + - image: quay.io/pantheon-public/build-tools-ci:7.x-php7.4 steps: - checkout - restore_cache: From 70f8ee13b90229bfb4e165ff4505884c0cc5e818 Mon Sep 17 00:00:00 2001 From: Daniel Bachhuber Date: Thu, 6 Jan 2022 03:31:24 -0800 Subject: [PATCH 4/5] Update README for v2.0.0 --- README.md | 11 ++++++++++- readme.txt | 11 ++++++++++- wp-saml-auth.php | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6969f64..2d20970 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ **Tags:** authentication, SAML **Requires at least:** 4.4 **Tested up to:** 5.8 -**Stable tag:** 1.2.7 +**Requires PHP:** 7.4 +**Stable tag:** 2.0.0 **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html @@ -275,8 +276,16 @@ Note: the declaration does need to be at the top of `_include.php`, to ensure Wo There is no third step. Because SimpleSAMLphp loads WordPress, which has WP Native PHP Sessions active, SimpleSAMLphp and WP SAML Auth will be able to communicate to one another on a multi web node environment. +## Upgrade Notice ## + +### 2.0.0 ### +Minimum supported PHP version is 7.4. + ## Changelog ## +### 2.0.0 (January 6, 2022) ### +* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.4 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. + ### 1.2.7 (December 9, 2021) ### * Adds a `wp_saml_auth_pre_logout` action that fires before logout [[#274](https://github.com/pantheon-systems/wp-saml-auth/pull/274)]. diff --git a/readme.txt b/readme.txt index 1ee4904..fe45307 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,8 @@ Contributors: getpantheon, danielbachhuber, Outlandish Josh Tags: authentication, SAML Requires at least: 4.4 Tested up to: 5.8 -Stable tag: 1.2.7 +Requires PHP: 7.4 +Stable tag: 2.0.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -275,8 +276,16 @@ Note: the declaration does need to be at the top of `_include.php`, to ensure Wo There is no third step. Because SimpleSAMLphp loads WordPress, which has WP Native PHP Sessions active, SimpleSAMLphp and WP SAML Auth will be able to communicate to one another on a multi web node environment. +== Upgrade Notice == + += 2.0.0 = +Minimum supported PHP version is 7.4. + == Changelog == += 2.0.0 (January 6, 2022) = +* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.4 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. + = 1.2.7 (December 9, 2021) = * Adds a `wp_saml_auth_pre_logout` action that fires before logout [[#274](https://github.com/pantheon-systems/wp-saml-auth/pull/274)]. diff --git a/wp-saml-auth.php b/wp-saml-auth.php index da7bcfe..005a7c4 100644 --- a/wp-saml-auth.php +++ b/wp-saml-auth.php @@ -1,7 +1,7 @@ Date: Thu, 6 Jan 2022 03:35:26 -0800 Subject: [PATCH 5/5] As it turns out, `onelogin/php-saml` supports PHP 7.3 --- README.md | 6 +++--- composer.json | 2 +- readme.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2d20970..e88b4c2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **Tags:** authentication, SAML **Requires at least:** 4.4 **Tested up to:** 5.8 -**Requires PHP:** 7.4 +**Requires PHP:** 7.3 **Stable tag:** 2.0.0 **License:** GPLv2 or later **License URI:** http://www.gnu.org/licenses/gpl-2.0.html @@ -279,12 +279,12 @@ There is no third step. Because SimpleSAMLphp loads WordPress, which has WP Nati ## Upgrade Notice ## ### 2.0.0 ### -Minimum supported PHP version is 7.4. +Minimum supported PHP version is 7.3. ## Changelog ## ### 2.0.0 (January 6, 2022) ### -* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.4 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. +* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.3 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. ### 1.2.7 (December 9, 2021) ### * Adds a `wp_saml_auth_pre_logout` action that fires before logout [[#274](https://github.com/pantheon-systems/wp-saml-auth/pull/274)]. diff --git a/composer.json b/composer.json index a65a956..b5332b8 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "prefer-stable": true, "require": { "onelogin/php-saml": "^4.0", - "php": "^7.4 || ^8.0" + "php": "^7.3 || ^8.0" }, "require-dev": { "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master", diff --git a/readme.txt b/readme.txt index fe45307..38038b6 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: getpantheon, danielbachhuber, Outlandish Josh Tags: authentication, SAML Requires at least: 4.4 Tested up to: 5.8 -Requires PHP: 7.4 +Requires PHP: 7.3 Stable tag: 2.0.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -279,12 +279,12 @@ There is no third step. Because SimpleSAMLphp loads WordPress, which has WP Nati == Upgrade Notice == = 2.0.0 = -Minimum supported PHP version is 7.4. +Minimum supported PHP version is 7.3. == Changelog == = 2.0.0 (January 6, 2022) = -* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.4 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. +* **BREAKING**: Updates `onelogin/php-saml` to `v4.0.0`, which requires PHP 7.3 or higher [[#275](https://github.com/pantheon-systems/wp-saml-auth/pull/275)]. = 1.2.7 (December 9, 2021) = * Adds a `wp_saml_auth_pre_logout` action that fires before logout [[#274](https://github.com/pantheon-systems/wp-saml-auth/pull/274)].