Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Update to Yoast SEO 24.6 + php 8.1 #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to Yoast SEO 24.6 + php 8.1 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97f196d
Fix sed command syntax in generate.sh for compatibility
jerturowetz Mar 14, 2025
ad708fe
Update PHP version requirements to >=8.1 and upgrade Yoast SEO to 24.6
jerturowetz Mar 14, 2025
30266ff
Update finder.php to include new PSR HTTP interfaces and Symfony depr…
jerturowetz Mar 14, 2025
37a8691
Regenerate stubs
jerturowetz Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"php-stubs/wordpress-stubs": "^5.3.0 || ^6.0"
},
"require-dev": {
"php": "~7.1",
"php": ">=8.1",
"php-stubs/generator": "^0.8"
},
"suggest": {
Expand Down
26 changes: 22 additions & 4 deletions finder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,40 @@
)
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/wordproof/wordpress-sdk/app/'])
->in(['source/wordpress-seo/vendor_prefixed/symfony/dependency-injection/'])
->files()
)
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/symfony/dependency-injection/'])
->in(['source/wordpress-seo/vendor_prefixed/psr/container/src/'])
->files()
)
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/psr/container/src/'])
->in(['source/wordpress-seo/vendor_prefixed/psr/log/Psr/Log/'])
->files()
)
// New in Yoast SEO 24.6 - PSR HTTP interfaces
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/psr/log/Psr/Log/'])
->in(['source/wordpress-seo/vendor_prefixed/psr/http-client/src/'])
->files()
)
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/psr/http-factory/src/'])
->files()
)
// New in Yoast SEO 24.6 - Symfony deprecation contracts
->append(
\StubsGenerator\Finder::create()
->in(['source/wordpress-seo/vendor_prefixed/symfony/deprecation-contracts/'])
->files()
)
// Required dependency - Yoast WHIP for PHP version checking
Copy link
Member

Choose a reason for hiding this comment

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

❌ https://github.com/search?q=repo%3AYoast%2Fwordpress-seo%20WHIPv2&type=code

->append(
\StubsGenerator\Finder::create()
->in(['source/vendor/yoast/whip/src/'])
->files()
)
->sortByName()
Expand Down
4 changes: 2 additions & 2 deletions generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ test -d "source/wordpress-seo"

# Tame wild beasts
# https://github.com/Yoast/wordpress-seo/pull/20190
sed -i -e 's#^\(\s*\*\)\s\+<?php\b.*$#\1#' "$FILE"
sed -i -e 's#^\(\s*\*\)\s\+?>.*$#\1#' "$FILE"
sed -i '' -e 's#^\(\s*\*\)\s\+<?php\b.*$#\1#' "$FILE"
sed -i '' -e 's#^\(\s*\*\)\s\+?>.*$#\1#' "$FILE"

printf '\nnamespace Yoast\\WP\\Free\\Loggers { class Migration_Logger {} }\n' >>"$FILE"

Expand Down
4 changes: 2 additions & 2 deletions source/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "~7.0",
"yoast/wordpress-seo": "20.5"
"php": ">=8.1",
"yoast/wordpress-seo": "24.6"
},
"minimum-stability": "stable",
"extra": {
Expand Down
Loading