Skip to content

Commit

Permalink
Merge pull request #55 from openeuropa/EWPP-4110
Browse files Browse the repository at this point in the history
EWPP-4110: Drop D9 and add D10.2 and php8.2 to matrix.
  • Loading branch information
nagyad authored Feb 19, 2024
2 parents 952810a + 5b944ec commit 2802003
Show file tree
Hide file tree
Showing 42 changed files with 82 additions and 51 deletions.
10 changes: 6 additions & 4 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ pipeline:

matrix:
include:
- CORE_VERSION: 9.5
PHP_VERSION: 8.0
- CORE_VERSION: 9.5
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.0
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.2
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.2
27 changes: 26 additions & 1 deletion behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,32 @@ default:
extensions:
Drupal\MinkExtension:
goutte: ~
selenium2: ~
selenium2:
wd_host: '${selenium.host}:${selenium.port}/wd/hub'
capabilities:
browser: chrome
nativeEvents: true
marionette: true
browserName: chrome
version: '*'
extra_capabilities:
chromeOptions:
w3c: false
args:
- '--no-sandbox'
- '--start-maximized'
- '--disable-gpu'
- '--window-size=1600,900'
- '--disable-dev-shm-usage'
- '--disable-setuid-sandbox'
- '--disable-web-security'
- '--DNS-prefetch-disable'
- '--disable-translate'
- '--ignore-certificate-errors'
- '--test-type'
- '--disable-extensions'
- '--incognito'
- '--disable-infobars'
ajax_timeout: 10
javascript_session: selenium2
base_url: "${drupal.base_url}"
Expand Down
18 changes: 11 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.0",
"drupal/core": "^9.5 || ^10",
"php": ">=8.1",
"drupal/core": "^10",
"drupal/embed": "^1.7"
},
"require-dev": {
"composer/installers": "^1.5",
"drupal/ckeditor": "^1.0",
"drupal/config_devel": "^1.8",
"drupal/core-composer-scaffold": "^9.5 || ^10",
"drupal/core-dev": "^9.5 || ^10",
"drupal/core-composer-scaffold": "^10",
"drupal/core-dev": "^10",
"drupal/http_request_mock": "^1.1",
"drush/drush": "^11.1",
"drush/drush": "^12",
"openeuropa/code-review": "^2.0.0-alpha6",
"openeuropa/oe_media": "^1.23",
"openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
"phpspec/prophecy-phpunit": "^2"
"phpspec/prophecy-phpunit": "^2",
"nikic/php-parser": "^4"
},
"scripts": {
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
Expand Down Expand Up @@ -56,7 +57,10 @@
"locations": {
"web-root": "./build"
}
}
},
"_readme": [
"Explicit requirement of nikic/php-parser as ^5.0 generates GrumPHP Parser issues."
]
},
"config": {
"sort-packages": true,
Expand Down
2 changes: 1 addition & 1 deletion modules/oe_oembed_server/oe_oembed_server.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Provides entry point to get entity following the oEmbed format.
package: OpenEuropa

type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- drupal:media
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Controller;

Expand Down
2 changes: 1 addition & 1 deletion modules/oe_oembed_server/src/Event/OembedResolverAlter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Event;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Event;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Oembed;

Expand Down
2 changes: 1 addition & 1 deletion modules/oe_oembed_server/src/Oembed/OembedResolver.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Oembed;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Oembed;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server\Oembed;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: OpenEuropa oEmbed Server Test
description: Test module for the oEmbed server functionality
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10
type: module
package: Testing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server_test\EventSubscriber;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server_test\EventSubscriber;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server_test\Plugin\ServiceMock;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_server_test\Plugin\ServiceMock;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed_server\Functional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed_server\Kernel;

Expand Down
2 changes: 1 addition & 1 deletion oe_oembed.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: The OpenEuropa oEmbed component provides an API to expose entity it
package: OpenEuropa

type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- embed:embed
2 changes: 1 addition & 1 deletion oe_oembed.module
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* OpenEuropa module.
*/

declare(strict_types = 1);
declare(strict_types=1);

use Drupal\Core\Entity\ContentEntityTypeInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
Expand Down
2 changes: 1 addition & 1 deletion src/Form/OembedDialog.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Form;

Expand Down
2 changes: 1 addition & 1 deletion src/OembedDataResolver.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/CKEditor4To5Upgrade/OeOembed.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Plugin\CKEditor4To5Upgrade;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/CKEditor5Plugin/OembedEntities.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Plugin\CKEditor5Plugin;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/CKEditorPlugin/OembedEntities.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Plugin\CKEditorPlugin;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/EmbedType/OEmbedEntities.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Plugin\EmbedType;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Filter/FilterOembed.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed\Plugin\Filter;

Expand Down
2 changes: 1 addition & 1 deletion tests/modules/oe_oembed_test/oe_oembed_test.info.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: OE oEmbed Test
description: Test module for embeds
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10
type: module
package: Testing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\oe_oembed_test\EventSubscriber;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/EmbedDialogTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Functional;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/EmbedFilterTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Functional;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Functional/EmbedTestBase.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Functional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\FunctionalJavascript;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\FunctionalJavascript;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/FunctionalJavascript/EmbedButtonAdminTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\FunctionalJavascript;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/FunctionalJavascript/EmbedDialogTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\FunctionalJavascript;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/FunctionalJavascript/EmbedTestBase.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\FunctionalJavascript;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/CKEditor5TestTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Traits;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/MediaCreationTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Traits;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/OembedMarkupTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Traits;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/OembedTestTrait.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\oe_oembed\Traits;

Expand Down
Loading

0 comments on commit 2802003

Please sign in to comment.