Skip to content

Commit

Permalink
EWPP-4991: Use drupal code review component from openeuropa.
Browse files Browse the repository at this point in the history
  • Loading branch information
nagyad committed Jan 17, 2025
1 parent 076739d commit 82a2715
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 37 deletions.
22 changes: 16 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"drush/drush": "^12",
"mikey179/vfsstream": "^1.6",
"openeuropa/behat-transformation-context": "^0.2",
"openeuropa/code-review": "^2.0",
"openeuropa/code-review-drupal": "^1.0.0-alpha",
"openeuropa/oe_media": "^1.23",
"openeuropa/oe_multilingual": "^1.13",
"openeuropa/rdf_skos": "^1.0.0-alpha10",
Expand All @@ -38,12 +38,20 @@
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
"post-update-cmd": "./vendor/bin/run drupal:site-setup"
},
"repositories": {
"drupal": {
"repositories": [
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "git",
"url": "https://github.com/openeuropa/DrupalDriver.git"
},
{
"type": "git",
"url": "https://github.com/openeuropa/code-review-drupal.git"
}
},
],
"autoload": {
"psr-4": {
"Drupal\\oe_webtools\\": "./src/"
Expand Down Expand Up @@ -79,10 +87,12 @@
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"drupal/core-composer-scaffold": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": true,
"php-http/discovery": false,
"phpro/grumphp": true,
"php-http/discovery": false
"phpro/grumphp-shim": true,
"phpstan/extension-installer": true
}
}
}
35 changes: 7 additions & 28 deletions grumphp.yml.dist
Original file line number Diff line number Diff line change
@@ -1,33 +1,12 @@
imports:
- { resource: vendor/openeuropa/code-review/dist/drupal-conventions.yml }
parameters:
tasks.phpcs.ignore_patterns:
- vendor/
- node_modules/
- build/
tasks.phpcs.triggered_by:
- php
- module
- inc
- module
- install

extra_tasks:
- { resource: ./vendor/openeuropa/code-review-drupal/dist/oe-component-conventions.yml }
grumphp:
tasks:
phpparser:
ignore_patterns:
- vendor/
- build/
visitors:
declare_strict_types: ~
triggered_by:
- php
- module
- inc
- theme
- install

grumphp:
- vendor/
git_hook_variables:
EXEC_GRUMPHP_COMMAND: 'docker-compose exec -T web'
extensions:
- OpenEuropa\CodeReview\ExtraTasksExtension

parameters:
tasks.phpstan.configuration: phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ oe_webtools_cookie_consent.settings:
base_route_name: oe_webtools_cookie_consent.settings
names:
- oe_webtools_cookie_consent.settings

3 changes: 2 additions & 1 deletion modules/oe_webtools_media/oe_webtools_media.install
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
declare(strict_types=1);

use Drupal\Core\File\Exception\FileException;
use Drupal\Core\File\FileExists;
use Drupal\Core\File\FileSystemInterface;

/**
Expand All @@ -33,7 +34,7 @@ function oe_webtools_media_install() {
// possible to copy the files is also confusing, we silently do nothing.
if (!file_exists($destination . DIRECTORY_SEPARATOR . $file->filename)) {
try {
$file_system->copy($file->uri, $destination, FileSystemInterface::EXISTS_ERROR);
$file_system->copy($file->uri, $destination, FileExists::Error);
}
catch (FileException $e) {
// Ignore and continue.
Expand Down
3 changes: 2 additions & 1 deletion modules/oe_webtools_media/oe_webtools_media.post_update.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
declare(strict_types=1);

use Drupal\Core\File\Exception\FileException;
use Drupal\Core\File\FileExists;
use Drupal\Core\File\FileSystemInterface;
use Drupal\media\Entity\MediaType;

Expand All @@ -27,7 +28,7 @@ function oe_webtools_media_post_update_00001(): void {
foreach ($files as $file) {
if (!file_exists($destination . DIRECTORY_SEPARATOR . $file->filename)) {
try {
$file_system->copy($file->uri, $destination, FileSystemInterface::EXISTS_ERROR);
$file_system->copy($file->uri, $destination, FileExists::Error);
}
catch (FileException $e) {
// Ignore and continue.
Expand Down
5 changes: 5 additions & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
includes:
- ./vendor/openeuropa/code-review-drupal/dist/phpstan.drupal.neon
parameters:
ignoreErrors:
- identifier: class.implementsDeprecatedInterface

0 comments on commit 82a2715

Please sign in to comment.