From 7de89757b2736e325d79089f56beba5fc05e28ca Mon Sep 17 00:00:00 2001
From: Adam Bramley <46227-acbramley@users.noreply.drupalcode.org>
Date: Thu, 17 Aug 2023 05:23:10 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3374535:=20=F0=9F=91=B7=20Fix=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.drupalci/.gitlab-single-pipeline.yml | 5 -----
composer.json | 7 +------
src/DateRecurOccurrences.php | 2 +-
src/DateRecurViewsHooks.php | 12 ++++++------
src/Event/DateRecurValueEvent.php | 2 +-
src/Plugin/DateRecurInterpreterManager.php | 3 +--
.../Field/FieldType/DateRecurFieldItemList.php | 6 +++---
tests/src/Kernel/DateRecurPartGridTest.php | 2 +-
8 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/.drupalci/.gitlab-single-pipeline.yml b/.drupalci/.gitlab-single-pipeline.yml
index 42be263..8e3d932 100644
--- a/.drupalci/.gitlab-single-pipeline.yml
+++ b/.drupalci/.gitlab-single-pipeline.yml
@@ -44,12 +44,7 @@ build app:
dpi/drupal-phpunit-bootstrap
drupal/core-dev:^${DRUPAL_CORE_CONSTRAINT}
phpspec/prophecy-phpunit:^2
- mglaman/phpstan-drupal:^1
- phpstan/phpstan-deprecation-rules:*
micheh/phpcs-gitlab
- - composer require
- drupal/coder:^8.3
- drupal/token:^1.5
- composer show
- cp modules/project/date_recur/.drupalci/* .
- mkdir -p ${BROWSERTEST_OUTPUT_DIRECTORY}
diff --git a/composer.json b/composer.json
index 18731b2..c37fb80 100644
--- a/composer.json
+++ b/composer.json
@@ -23,12 +23,7 @@
"rlanvin/php-rrule": "^1 || ^2"
},
"require-dev": {
- "drupal/coder": "^8.3",
- "drupal/token": "^1.5",
- "phpstan/phpstan": "^1",
- "mglaman/phpstan-drupal": "^1",
- "phpstan/phpstan-deprecation-rules": "*",
- "dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+ "drupal/token": "^1.5"
},
"suggest": {
"drupal/date_recur_interactive": "Provides an interactive recurring date widget."
diff --git a/src/DateRecurOccurrences.php b/src/DateRecurOccurrences.php
index f7c047d..1bf6740 100644
--- a/src/DateRecurOccurrences.php
+++ b/src/DateRecurOccurrences.php
@@ -12,9 +12,9 @@ use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeListenerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldStorageDefinitionEventSubscriberTrait;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldStorageDefinitionListenerInterface;
use Drupal\Core\TypedData\TypedDataManagerInterface;
use Drupal\date_recur\Event\DateRecurEvents;
diff --git a/src/DateRecurViewsHooks.php b/src/DateRecurViewsHooks.php
index a066a20..3dde590 100644
--- a/src/DateRecurViewsHooks.php
+++ b/src/DateRecurViewsHooks.php
@@ -4,24 +4,24 @@ declare(strict_types = 1);
namespace Drupal\date_recur;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\Core\Database\Connection;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityFieldManagerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\TypedData\TypedDataManagerInterface;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
use Drupal\field\FieldStorageConfigInterface;
use Drupal\views\Views;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
/**
* Defines Views hooks.
diff --git a/src/Event/DateRecurValueEvent.php b/src/Event/DateRecurValueEvent.php
index 9795ef4..daeefd7 100644
--- a/src/Event/DateRecurValueEvent.php
+++ b/src/Event/DateRecurValueEvent.php
@@ -4,8 +4,8 @@ declare(strict_types = 1);
namespace Drupal\date_recur\Event;
-use Drupal\date_recur\Plugin\Field\FieldType\DateRecurFieldItemList;
use Drupal\Component\EventDispatcher\Event;
+use Drupal\date_recur\Plugin\Field\FieldType\DateRecurFieldItemList;
/**
* Event dispatched when an entity containing a date recur field is modified.
diff --git a/src/Plugin/DateRecurInterpreterManager.php b/src/Plugin/DateRecurInterpreterManager.php
index b0e588f..4986b9d 100644
--- a/src/Plugin/DateRecurInterpreterManager.php
+++ b/src/Plugin/DateRecurInterpreterManager.php
@@ -4,10 +4,9 @@ declare(strict_types = 1);
namespace Drupal\date_recur\Plugin;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
//@codingStandardsIgnoreStart
/**
diff --git a/src/Plugin/Field/FieldType/DateRecurFieldItemList.php b/src/Plugin/Field/FieldType/DateRecurFieldItemList.php
index b336a5d..4902c14 100644
--- a/src/Plugin/Field/FieldType/DateRecurFieldItemList.php
+++ b/src/Plugin/Field/FieldType/DateRecurFieldItemList.php
@@ -5,13 +5,13 @@ declare(strict_types = 1);
namespace Drupal\date_recur\Plugin\Field\FieldType;
use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Field\FieldItemList;
+use Drupal\Core\Form\FormStateInterface;
use Drupal\date_recur\DateRecurPartGrid;
use Drupal\date_recur\Event\DateRecurEvents;
use Drupal\date_recur\Event\DateRecurValueEvent;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeFieldItemList;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/tests/src/Kernel/DateRecurPartGridTest.php b/tests/src/Kernel/DateRecurPartGridTest.php
index fa13cb4..bea2e1e 100644
--- a/tests/src/Kernel/DateRecurPartGridTest.php
+++ b/tests/src/Kernel/DateRecurPartGridTest.php
@@ -5,11 +5,11 @@ declare(strict_types = 1);
namespace Drupal\Tests\date_recur\Kernel;
use Drupal\Core\Field\FieldConfigInterface;
-use Drupal\KernelTests\KernelTestBase;
use Drupal\date_recur\Plugin\Field\FieldType\DateRecurItem;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
/**
* Tests field validation failures as a result part grids.
--
GitLab