Skip to content
This repository has been archived by the owner on Aug 18, 2024. It is now read-only.

#3129354 Add Drupal 9 support #640

Merged
merged 17 commits into from
Apr 22, 2020
Merged

#3129354 Add Drupal 9 support #640

merged 17 commits into from
Apr 22, 2020

Conversation

MPParsley
Copy link
Collaborator

@MPParsley MPParsley commented Apr 20, 2020

@MPParsley MPParsley requested a review from pfrenssen April 20, 2020 18:07
@MPParsley
Copy link
Collaborator Author

@pfrenssen, did you plan another alpha release for Drupal 9?

@pfrenssen
Copy link
Contributor

Thanks for working on this! I see that the Drupal 9 builds on Travis are failing due to a composer conflict with Drupal Console.

It would be great if we can get the Drupal 9 build green in this PR. I had a look but there is no Drupal 9 compatible branch of Drupal Console yet.

Still let's move forward with this. I would propose to skip the installation of Drupal Console for Drupal 9 builds and mark the DrupalConsoleAddFieldTest as skipped. When Drupal Console becomes compatible we can re-enable this test.

Copy link
Contributor

@pfrenssen pfrenssen left a comment

Choose a reason for hiding this comment

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

Let's get the Drupal 9 builds green and remove them from the allowed_failures section in .travis.yml.

@amitaibu
Copy link
Member

Travis are failing due to a composer conflict with Drupal Console.

IMO we can remove integration with Drupal Console, thus remove Drupal Console completely.

@MPParsley
Copy link
Collaborator Author

MPParsley commented Apr 21, 2020

Let's get the Drupal 9 builds green and remove them from the allowed_failures section in .travis.yml.

Removed Drupal 9 from allowed_failures

@MPParsley
Copy link
Collaborator Author

Travis are failing due to a composer conflict with Drupal Console.

IMO we can remove integration with Drupal Console, thus remove Drupal Console completely.

Removed Drupal console from travis

@MPParsley
Copy link
Collaborator Author

MPParsley commented Apr 21, 2020

@amitaibu
Seems like there was another reason to use Drupal console, or did you suggest to remove the support (OgAddFieldCommand) all together?:

1) Drupal\Tests\og\Kernel\Console\DrupalConsoleAddFieldTest::testNewGroup
Error: Class 'Drupal\Console\Core\Style\DrupalStyle' not found
/home/travis/build/Gizra/og/src/Command/OgAddFieldCommand.php:80
/home/travis/build/Gizra/drupal/vendor/symfony/console/Command/Command.php:240
/home/travis/build/Gizra/drupal/vendor/symfony/console/Tester/CommandTester.php:78
/home/travis/build/Gizra/og/tests/src/Kernel/Console/DrupalConsoleAddFieldTest.php:75
ERRORS!
Tests: 562, Assertions: 4971, Errors: 1.
 > Executing tests from /home/travis/build/Gizra/drupal/modules/og/og_ui/tests
PHPUnit 6.5.14 by Sebastian Bergmann and contributors.
Testing /home/travis/build/Gizra/drupal/modules/og/og_ui/tests

@amitaibu
Copy link
Member

did you suggest to remove the support (OgAddFieldCommand) all together?

Indeed - can be removed. It's a very old attempt in adding Drupal Console commands, and I hardly think it's needed.

@MPParsley
Copy link
Collaborator Author

did you suggest to remove the support (OgAddFieldCommand) all together?

Indeed - can be removed. It's a very old attempt in adding Drupal Console commands, and I hardly think it's needed.

Rmeoved OgAddFieldCommand & DrupalConsoleAddFieldTest. Let's see what Travis says.

@MPParsley
Copy link
Collaborator Author

PHP Fatal error: Declaration of Drupal\Tests\Listeners\DrupalListener::endTest(PHPUnit\Framework\Test $test, float $time): void must be compatible with PHPUnit\Framework\TestListener::endTest(PHPUnit\Framework\Test $test, $time) in /home/travis/build/Gizra/drupal/core/tests/Drupal/Tests/Listeners/DrupalListener.php on line 14

@heddn
Copy link

heddn commented Apr 21, 2020

I think the failures are due to PHPUnit version miss-matching.

Lucas D Hedding and others added 2 commits April 21, 2020 14:56
@pfrenssen
Copy link
Contributor

The D9 branch is green! 👍

@pfrenssen
Copy link
Contributor

I see what is wrong, I will try to fix it. We should remove the old workaround for PHP 5.6,

@pfrenssen
Copy link
Contributor

Starting to see green results. I have also enabled the Composer cache, this saves ~30 seconds on downloading dependencies. I included Drupal 9.1 in the build matrix because this is also already in development.

Out of scope for this PR but I am seeing that on Drupal 8.8+ the only test that is failing is OgComplexWidgetTest::testFields(). This is great news, once that widget is removed we can also guarantee that OG works correctly on PHP 7.4.

@MPParsley MPParsley merged commit 49e0c64 into 8.x-1.x Apr 22, 2020
@MPParsley MPParsley deleted the feature/drupal9 branch April 22, 2020 09:19
@MPParsley
Copy link
Collaborator Author

And it's in! Thanks all!

@MPParsley
Copy link
Collaborator Author

@pfrenssen can you push it to d.o so we can close https://www.drupal.org/node/3129354 (only mobile access atm)?

@pfrenssen
Copy link
Contributor

OK!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants