.cspell-project-words.txt

+BYDAY
+BYHOUR
+BYMINUTE
+BYMONTH
+BYMONTHDAY
+BYSECOND
+BYSETPOS
+BYWEEKNO
+BYYEARDAY
+Chuuk
+DDTHH
+DTSTART
+EXDATE
+Exdate
+exdate
+EXRULE
+Granularities
+granularities
+Kaya
+Lanvin
+Moresby
+myfield
+Precreate
+precreate
+RDATE
+Rdate
+Rdates
+Rlanvin
+rlanvin
+RRULE
+Rrule
+rrule
+RRULE's
+RRULEs
+weekdaily
+WKST

.drupalci/.gitlab-single-pipeline.yml

@@ -49,6 +49,9 @@ include:
 ################
 # variables:
 #   SKIP_ESLINT: '1'
+variables:
+  # https://git.drupalcode.org/project/gitlab_templates/-/commit/1b6e9ff965a417882c3142453a647008b6902c0f
+  IGNORE_PROJECT_DRUPAL_CORE_VERSION: 1
 
 
 ###################################################################################

.gitlab-ci.yml

@@ -22,17 +22,17 @@ deploystacks:
       # from `include.drupalci.variables.yml`. Until then define the strings
       # manually https://gitlab.com/gitlab-org/gitlab/-/issues/11549
       # Valid tags for databases are at https://git.drupalcode.org/project/drupalci_environments/-/tree/dev/db
-      - _TARGET_CORE: ["10.2.x-dev"]
-        _TARGET_PHP: [ "8.1", "8.2"]
+      - _TARGET_CORE: ["11.x-dev" ]
+        _TARGET_PHP: [ "8.3" ]
         _TARGET_DB_TYPE: "mysql"
-        _TARGET_DB_VERSION: "5.7"
+        _TARGET_DB_VERSION: "8"
 
-      - _TARGET_CORE: ["10.2.x-dev"]
-        _TARGET_PHP: [ "8.1"]
+      - _TARGET_CORE: ["10.3.x-dev" ]
+        _TARGET_PHP: [ "8.3" ]
         _TARGET_DB_TYPE: "pgsql"
         _TARGET_DB_VERSION: "16"
 
-      - _TARGET_CORE: ["10.2.x-dev"]
-        _TARGET_PHP: [ "8.1"]
+      - _TARGET_CORE: ["10.3.x-dev" ]
+        _TARGET_PHP: [ "8.3" ]
         _TARGET_DB_TYPE: "sqlite"
         _TARGET_DB_VERSION: "3"

composer.json

@@ -19,14 +19,14 @@
         }
     },
     "require": {
-        "php": ">=8.1",
-        "drupal/core": "^10.2",
+        "php": ">=8.3",
+        "drupal/core": "^10.3 || ^11",
         "rlanvin/php-rrule": "^2"
     },
     "require-dev": {
         "composer/installers": "^2",
         "dealerdirect/phpcodesniffer-composer-installer": "^1",
-        "drupal/core-dev": "^10.1",
+        "drupal/core-dev": "^10.3 || ^11",
         "drupal/token": "^1.5",
         "micheh/phpcs-gitlab": "^1.1",
         "mockery/mockery": "^1.5",

date_recur.info.yml

 name: Recurring Dates Field
 type: module
 description: Provides a recurring/repeating dates field.
-core_version_requirement: ^10.2
-php: 8.1
+core_version_requirement: '^10.3 || ^11'
+php: 8.3
 package: Field types
 dependencies:
   - drupal:system (>=9.0.x)

date_recur.install

@@ -5,8 +5,9 @@
  * Install, update and uninstall functions for date_recur module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
@@ -404,7 +405,13 @@ function date_recur_update_8208(&$sandbox): void {
     // Iterate over all date_recur field definitions for this entity type.
     foreach ($fieldDefinitions as $fieldDefinition) {
       $tableName = DateRecurOccurrences::getOccurrenceCacheStorageTableName($fieldDefinition);
-      $schema->addPrimaryKey($tableName, $primaryKey);
+      try {
+        $schema->addPrimaryKey($tableName, $primaryKey);
+      }
+      catch (SchemaObjectExistsException $e) {
+        // Somehow people already have primary keys set, so ignore.
+        continue;
+      }
     }
   }
 }

date_recur.module

@@ -5,7 +5,7 @@
  * Contains hooks for date_recur module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Render\Element;
 use Drupal\date_recur\DateRecurCachedHooks;

phpcs.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="My Coding Standard">
+  <file>./date_recur.install</file>
+  <file>./date_recur.module</file>
   <file>./src</file>
   <file>./tests</file>
   <rule ref="PreviousNextDrupal" />

phpstan-baseline.neon

@@ -460,36 +460,11 @@ parameters:
 			count: 1
 			path: tests/src/Functional/DateRecurBasicWidgetTest.php
 
-		-
-			message: "#^Call to an undefined method Drupal\\\\Tests\\\\WebAssert\\:\\:waitForElementVisible\\(\\)\\.$#"
-			count: 1
-			path: tests/src/Functional/DateRecurInterpreterTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$button of method Drupal\\\\Tests\\\\WebAssert\\:\\:buttonExists\\(\\) expects string, Drupal\\\\Core\\\\StringTranslation\\\\TranslatableMarkup given\\.$#"
-			count: 1
-			path: tests/src/Functional/DateRecurInterpreterTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$button of method Drupal\\\\Tests\\\\WebAssert\\:\\:buttonNotExists\\(\\) expects string, Drupal\\\\Core\\\\StringTranslation\\\\TranslatableMarkup given\\.$#"
-			count: 1
-			path: tests/src/Functional/DateRecurInterpreterTest.php
-
-		-
-			message: "#^Parameter \\#2 \\$submit of method Drupal\\\\Tests\\\\BrowserTestBase\\:\\:submitForm\\(\\) expects string, Drupal\\\\Core\\\\StringTranslation\\\\TranslatableMarkup given\\.$#"
-			count: 2
-			path: tests/src/Functional/DateRecurInterpreterTest.php
-
 		-
 			message: "#^Property Drupal\\\\date_recur_entity_test\\\\Entity\\\\DrEntityTest\\:\\:\\$dr \\(Drupal\\\\Core\\\\Field\\\\FieldItemListInterface\\) does not accept array\\<string, string\\>\\.$#"
 			count: 1
 			path: tests/src/Kernel/DateRecurBaseFieldTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$content of method Drupal\\\\KernelTests\\\\KernelTestBase\\:\\:setRawContent\\(\\) expects string, Drupal\\\\Component\\\\Render\\\\MarkupInterface given\\.$#"
-			count: 1
-			path: tests/src/Kernel/DateRecurBasicFormatterTest.php
-
 		-
 			message: "#^Property Drupal\\\\date_recur_entity_test\\\\Entity\\\\DrEntityTest\\:\\:\\$dr \\(Drupal\\\\Core\\\\Field\\\\FieldItemListInterface\\) does not accept array\\<int, array\\<string, string\\>\\>\\.$#"
 			count: 2

phpstan.neon

@@ -7,8 +7,6 @@ parameters:
     - src
     - tests
   reportUnmatchedIgnoredErrors: true
-  checkMissingIterableValueType: false
-  checkGenericClassInNonGenericObjectType: false
   fileExtensions:
     - php
     - module
@@ -42,4 +40,9 @@ parameters:
   scanDirectories:
     - vendor/rlanvin/php-rrule/
     - web/core/
+  ignoreErrors:
+    -
+      identifier: missingType.generics
+    -
+      identifier: missingType.iterableValue
 

src/Annotation/DateRecurInterpreter.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur\Annotation;
 

src/DateRange.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 

src/DateRecurCachedHooks.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 

src/DateRecurGranularityMap.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 

src/DateRecurHelper.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 
@@ -11,7 +11,7 @@ use Drupal\date_recur\Rl\RlHelper;
  * Helper for recurring rules.
  *
  * Provides a helper for getting occurrences from a RRULE. The class can be
- * iterated apon, producing occurrence objects beginning at the first
+ * iterated upon, producing occurrence objects beginning at the first
  * occurrence.
  *
  * This helper is a proxy to the default helper. It should be used if there is
@@ -46,7 +46,7 @@ final class DateRecurHelper implements DateRecurHelperInterface {
    * @throws \Exception
    *   Throws various exceptions if string is invalid.
    */
-  public static function create(string $string, \DateTimeInterface $dtStart, \DateTimeInterface $dtStartEnd = NULL): static {
+  public static function create(string $string, \DateTimeInterface $dtStart, ?\DateTimeInterface $dtStartEnd = NULL): static {
     // @todo Get the helper preference from Drupal module config.
     /** @var \Drupal\date_recur\DateRecurHelperInterface $dateRecurHelper */
     $dateRecurHelper = RlHelper::createInstance($string, $dtStart, $dtStartEnd);
@@ -87,7 +87,7 @@ final class DateRecurHelper implements DateRecurHelperInterface {
   /**
    * {@inheritdoc}
    */
-  public function getOccurrences(\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array {
+  public function getOccurrences(?\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array {
     return $this->dateRecurHelper->getOccurrences($rangeStart, $rangeEnd, $limit);
   }
 

src/DateRecurHelperInterface.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 
@@ -73,7 +73,7 @@ interface DateRecurHelperInterface extends \Iterator {
    * @throws \InvalidArgumentException
    *   Exceptions thrown if ranges are invalid or undefined.
    */
-  public function getOccurrences(\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array;
+  public function getOccurrences(?\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array;
 
   /**
    * Get excluded dates.
@@ -83,7 +83,7 @@ interface DateRecurHelperInterface extends \Iterator {
    * dates in the same time zone as the initial dates.
    *
    * Implementors of this method are responsible for ensuring time zone is
-   * normalised.
+   * normalized.
    *
    * @return \DateTimeInterface[]
    *   An array of excluded dates.

src/DateRecurNonRecurringHelper.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 
@@ -26,7 +26,7 @@ class DateRecurNonRecurringHelper implements DateRecurHelperInterface {
    */
   public function __construct(
       \DateTimeInterface $dtStart,
-      \DateTimeInterface $dtStartEnd = NULL,
+      ?\DateTimeInterface $dtStartEnd = NULL,
   ) {
     $dtStartEnd ??= clone $dtStart;
     $this->occurrences = [new DateRange($dtStart, $dtStartEnd)];
@@ -80,7 +80,7 @@ class DateRecurNonRecurringHelper implements DateRecurHelperInterface {
   /**
    * {@inheritdoc}
    */
-  public function getOccurrences(\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array {
+  public function getOccurrences(?\DateTimeInterface $rangeStart = NULL, ?\DateTimeInterface $rangeEnd = NULL, ?int $limit = NULL): array {
     if (isset($limit) && (!is_int($limit) || $limit < 0)) {
       // Limit must be a number and more than one.
       throw new \InvalidArgumentException('Invalid count limit.');

src/DateRecurOccurrences.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 
@@ -407,7 +407,7 @@ class DateRecurOccurrences implements EventSubscriberInterface, EntityTypeListen
   protected function getBaseFieldStorages(ContentEntityTypeInterface $entityType): array {
     $baseFields = $this->entityFieldManager->getBaseFieldDefinitions($entityType->id());
     $baseFields = array_filter($baseFields,
-      fn (FieldDefinitionInterface $fieldDefinition): bool => $this->isDateRecur($fieldDefinition->getFieldStorageDefinition())
+      fn (FieldDefinitionInterface $fieldDefinition): bool => $this->isDateRecur($fieldDefinition->getFieldStorageDefinition()),
     );
 
     return array_map(

src/DateRecurPartGrid.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;
 

src/DateRecurRruleMap.php

 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\date_recur;