Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.3.5 #246

Merged
merged 20 commits into from
Apr 7, 2023
Merged

Release 1.3.5 #246

merged 20 commits into from
Apr 7, 2023

Conversation

jazzsequence
Copy link
Contributor

@jazzsequence jazzsequence commented Apr 7, 2023

Pulls in main and resolves conflicts. Worth noting that we had a master branch that was actually more up-to-date than main. I've done some branch pruning to avoid this in the future.

This also updates the CircleCI build for the 7.4 tests to run a composer update before the composer install which we've had to do elsewhere so that the install doesn't fail due to dependencies that require PHP 8.

Also adds @jspellman814 as a contributor.

John Spellman and others added 16 commits December 20, 2022 08:58
[CMS-1141] Update images for lint and test-behat jobs
….0 (#229)

Bumps [dealerdirect/phpcodesniffer-composer-installer](https://github.com/Dealerdirect/phpcodesniffer-composer-installer) from 0.7.2 to 1.0.0.
- [Release notes](https://github.com/Dealerdirect/phpcodesniffer-composer-installer/releases)
- [Changelog](https://github.com/PHPCSStandards/composer-installer/blob/main/.github_changelog_generator)
- [Commits](PHPCSStandards/composer-installer@v0.7.2...v1.0.0)

---
updated-dependencies:
- dependency-name: dealerdirect/phpcodesniffer-composer-installer
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix GPL license version

* add a fallback
if $session is not null but the ->get_data is this creates a PHP warning
It's possible this might escallate to a fatal in PHP 8+
Originally reported in https://wordpress.org/support/topic/php-warning-session_start-failed-to-read-session-data-user/

* exclude short ternaries being disallowed
I fundamentally disagree with the guidance that they are "rarely used
correctly"
The only thing this was being used for was a readme to markdown script that we're not using.
* Update the "necessary assets" step

Replace "Confirm that the necessary assets are present in the newly created tag, and test on a WP install if desired" with the actual step for this repository.

* call out .gitattributes, specifically

Co-authored-by: John Spellman <john.spellman@pantheon.io>

* remove extra number list item

---------

Co-authored-by: John Spellman <john.spellman@pantheon.io>
Bumps [yoast/phpunit-polyfills](https://github.com/Yoast/PHPUnit-Polyfills) from 1.0.4 to 1.0.5.
- [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.4...1.0.5)

---
updated-dependencies:
- dependency-name: yoast/phpunit-polyfills
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jazzsequence jazzsequence self-assigned this Apr 7, 2023
@jazzsequence jazzsequence requested a review from a team as a code owner April 7, 2023 15:15
Copy link
Contributor

@jspellman814 jspellman814 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@jazzsequence jazzsequence merged commit 776840b into main Apr 7, 2023
@jazzsequence jazzsequence deleted the release-1.3.5 branch April 7, 2023 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants