Re-sync clean-up of development branch #344
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add our coding standard * run phpcbf * updates the ruleset name to be less generic * add rule exclusions in specific files * bump the php test version * remove excluded squiz rule we're handling that inside Pantheon-WP * manual rule exclusions * use wp_kses to sanitize output * validate & sanitize PHP superclobal * set lint php version to 8.0
Bumps [symfony/filesystem](https://github.com/symfony/filesystem) from 5.4.21 to 5.4.23. - [Release notes](https://github.com/symfony/filesystem/releases) - [Changelog](https://github.com/symfony/filesystem/blob/6.2/CHANGELOG.md) - [Commits](symfony/filesystem@v5.4.21...v5.4.23) --- updated-dependencies: - dependency-name: symfony/filesystem dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump yoast/phpunit-polyfills from 1.0.5 to 2.0.0 Bumps [yoast/phpunit-polyfills](https://github.com/Yoast/PHPUnit-Polyfills) from 1.0.5 to 2.0.0. - [Release notes](https://github.com/Yoast/PHPUnit-Polyfills/releases) - [Changelog](https://github.com/Yoast/PHPUnit-Polyfills/blob/2.x/CHANGELOG.md) - [Commits](Yoast/PHPUnit-Polyfills@1.0.5...2.0.0) --- updated-dependencies: - dependency-name: yoast/phpunit-polyfills dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Phil Tyler <[email protected]>
This was referenced Jun 20, 2023
jazzsequence
approved these changes
Jun 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To get out of the mess of squash merges and merge conflicts on these branches, I backed up and deleted the
developbranch and force-pushedmaster's history back todevelop.Develop pre-cleanup is backed up to https://github.com/pantheon-systems/wp-saml-auth/tree/develop-stash.
commits have been cherry-picked over to this PR branch, and I manually re-applied #342.
Also re-applies #339 #341 #343.
Following this, we should be in better shape to work through development and releases as described in CONTRIBUTING.MD and modeled in https://github.com/pantheon-systems/plugin-pipeline-example.
This PR should rebased, not squashed or merged.