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.

Sign up for GitHub

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

Jump to bottom

SITE-1240 - Add Drupal 11 compatibility #203

Merged
merged 18 commits into from
Jan 28, 2025
Merged

SITE-1240 - Add Drupal 11 compatibility #203

merged 18 commits into from
Jan 28, 2025

Conversation

stovak
Copy link
Member

@stovak stovak commented Jan 15, 2025 •
edited by pwtyler
Loading

Upgrade libraries and current code to work with drupal 11.

DEPRECATED by this release:

  • Drupal 9.x support
  • Php in versions less than 8.1

  • The target version tag for this release is 8.3 and the HEAD on 8.x.

  • Drupal 9.x installations should use version 8.2.x of the module until they upgrade to D10 or D11.

  • Drupal 8.x was deprecated by a previous release

@stovak stovak requested a review from a team as a code owner January 15, 2025 19:55
stovak and others added 13 commits January 15, 2025 11:57
@stovak
small update
9e50098
@stovak
test on newer php
4209693
@laura-johnson
update dependencies and solarium client
53f33be
@laura-johnson
remove overrides of drush logger to prevent errors
c0a306e
@laura-johnson
make submodules d11 compatible
218720c
@stovak
removing configs for possible D11 install
7f0e0d3
@stovak
event dispatcher interface
e81620c
@stovak
psr18adapter
ddf9114
@stovak
guzzle 7 is psr18 compatible
ed297a3
@stovak
Adapter Interface
7034501
@stovak
renaming because codacy blows
c4afc5c
@stovak
Squashed commit of the following:
3337e46 
commit 218720c
Author: CI Bot <[email protected]>
Date:   Thu Jan 16 10:26:22 2025 -0500

    make submodules d11 compatible

commit c0a306e
Author: CI Bot <[email protected]>
Date:   Thu Jan 16 10:11:03 2025 -0500

    remove overrides of drush logger to prevent errors

commit 53f33be
Author: CI Bot <[email protected]>
Date:   Thu Jan 16 10:00:15 2025 -0500

    update dependencies and solarium client
@stovak
Merge pull request #204 from fourkitchens/8.x
5cb267e 
Drupal 11 Compatibility
@rvtraveller
Copy link

Even if you make it past the test errors, it looks like there are still some type dependencies that need to be worked out. Seeing the below error on a site I'm working on upgrading to Drupal 11:

TypeError: Drupal\search_api_pantheon\Services\PantheonGuzzle::sendRequest(): Argument #1 ($request) must be of type Psr\Http\Message\RequestInterface, Solarium\Core\Client\Request given, called in /code/web/modules/contrib/search_api_pantheon/src/Services/PantheonGuzzle.php on line 173 in Drupal\search_api_pantheon\Services\PantheonGuzzle->sendRequest() (line 98 of /code/web/modules/contrib/search_api_pantheon/src/Services/PantheonGuzzle.php)

@stovak stovak marked this pull request as draft January 27, 2025 19:19
@stovak
Copy link
Member Author

stovak commented Jan 27, 2025

Even if you make it past the test errors, it looks like there are still some type dependencies that need to be worked out. Seeing the below error on a site I'm working on upgrading to Drupal 11:

TypeError: Drupal\search_api_pantheon\Services\PantheonGuzzle::sendRequest(): Argument #1 ($request) must be of type Psr\Http\Message\RequestInterface, Solarium\Core\Client\Request given, called in /code/web/modules/contrib/search_api_pantheon/src/Services/PantheonGuzzle.php on line 173 in Drupal\search_api_pantheon\Services\PantheonGuzzle->sendRequest() (line 98 of /code/web/modules/contrib/search_api_pantheon/src/Services/PantheonGuzzle.php)

Sorry, this should have been a draft. It wasn't ready when you were checking it.

@stovak stovak marked this pull request as ready for review January 28, 2025 19:28
@stovak stovak requested a review from kporras07 January 28, 2025 19:38
pwtyler
pwtyler reviewed Jan 28, 2025
View reviewed changes
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.codacy.yml Outdated Show resolved Hide resolved
phpcs.xml Outdated Show resolved Hide resolved
greg-1-anderson
greg-1-anderson reviewed Jan 28, 2025
View reviewed changes
composer.json Outdated Show resolved Hide resolved
pwtyler
pwtyler reviewed Jan 28, 2025
View reviewed changes
composer.json Outdated
@@ -15,7 +15,7 @@
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "8.0"
"php": "8.2"
Copy link
Member

Choose a reason for hiding this comment

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

Discussed the same in Slack as long as D10 and 8.1 are not EoL. 👍🏻

greg-1-anderson
greg-1-anderson reviewed Jan 28, 2025
View reviewed changes
composer.json Outdated Show resolved Hide resolved
greg-1-anderson
greg-1-anderson approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@greg-1-anderson greg-1-anderson left a comment

Choose a reason for hiding this comment

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

LGTM, with some small adjustments.

@stovak
Fixing issues with Event Dispatcher
8ddc50c 
restoring psr 18 code

d9 is EOL

restoring get Adapter

linting

adding import

adding factory

default configs to import

remove some dependencies from config

removing more dependencies

actually test different versions

updating testing procs

updating robofile

reformatting RoboFile

codacy config

removing unnecessary steps

updating testing

Adding codacy to  gitattributes

Back to 8.1 requirement and deprecating quay

Add phpcs to .gitattributes

composer update

restoring quay

restoring quay

reverting change
@stovak stovak merged commit fae9673 into 8.x Jan 28, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kporras07 kporras07 kporras07 left review comments

@namespacebrian namespacebrian namespacebrian approved these changes

@greg-1-anderson greg-1-anderson greg-1-anderson approved these changes

@pwtyler pwtyler pwtyler approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@stovak @rvtraveller @greg-1-anderson @kporras07 @pwtyler @namespacebrian @laura-johnson