2755: Applied coding standards

rimi-itk · rimi-itk · commit 1defacaf1ae8 · 2024-10-23T10:50:15.000+02:00
diff --git a/web/profiles/custom/os2loop/modules/os2loop_alert/src/Helper/Helper.php b/web/profiles/custom/os2loop/modules/os2loop_alert/src/Helper/Helper.php
@@ -110,7 +110,7 @@ public function getNumberOfUsers(): int {
    * @return array
    *   The mail addresses.
    */
-  public function getUserEmails(array $userIds = NULL): array {
+  public function getUserEmails(?array $userIds = NULL): array {
     $query = $this->database
       ->select('users_field_data', 'u')
       ->fields('u', ['mail'])
diff --git a/web/profiles/custom/os2loop/modules/os2loop_documents/modules/os2loop_documents_fixtures/src/Fixture/CollectionFixture.php b/web/profiles/custom/os2loop/modules/os2loop_documents/modules/os2loop_documents_fixtures/src/Fixture/CollectionFixture.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\os2loop_documents_fixtures\Fixture;
 
+use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\content_fixtures\Fixture\AbstractFixture;
 use Drupal\content_fixtures\Fixture\DependentFixtureInterface;
 use Drupal\content_fixtures\Fixture\FixtureGroupInterface;
-use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\node\Entity\Node;
 use Drupal\os2loop_documents\Helper\CollectionHelper;
 use Drupal\os2loop_taxonomy_fixtures\Fixture\ProfessionFixture;
diff --git a/web/profiles/custom/os2loop/modules/os2loop_documents/modules/os2loop_documents_fixtures/src/Fixture/DocumentFixture.php b/web/profiles/custom/os2loop/modules/os2loop_documents/modules/os2loop_documents_fixtures/src/Fixture/DocumentFixture.php
@@ -371,7 +371,7 @@ public function getGroups() {
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  private function createStep(array $values, Paragraph $parent = NULL): Paragraph {
+  private function createStep(array $values, ?Paragraph $parent = NULL): Paragraph {
     $step = Paragraph::create($values + ['type' => 'os2loop_documents_step']);
     $step->save();
     if (NULL !== $parent) {
diff --git a/web/profiles/custom/os2loop/modules/os2loop_documents/src/Helper/CollectionHelper.php b/web/profiles/custom/os2loop/modules/os2loop_documents/src/Helper/CollectionHelper.php
@@ -136,7 +136,7 @@ public function updateCollection(NodeInterface $node, array $data) {
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  public function addDocument(NodeInterface $collection, NodeInterface $document, NodeInterface $parent = NULL) {
+  public function addDocument(NodeInterface $collection, NodeInterface $document, ?NodeInterface $parent = NULL) {
     $items = $this->loadCollectionItems($collection);
     $weight = -1;
     foreach ($items as $item) {
@@ -313,7 +313,7 @@ public function buildTree(array $items, array &$tree = [], $depth = 0, $parent =
    * @return \Drupal\os2loop_documents\Entity\DocumentCollectionItem[]
    *   The tree.
    */
-  public function loadTree(int $collectionId, int $parent = 0, int $max_depth = NULL, bool $load_entities = FALSE) {
+  public function loadTree(int $collectionId, int $parent = 0, ?int $max_depth = NULL, bool $load_entities = FALSE) {
     $cache_key = implode(':', func_get_args());
     if (!isset($this->trees[$cache_key])) {
       // We cache trees, so it's not CPU-intensive to call on an item and its
@@ -413,7 +413,7 @@ public function loadTree(int $collectionId, int $parent = 0, int $max_depth = NU
    * @return array|DocumentCollectionItem[]
    *   The items with children.
    */
-  public function buildDocumentTree(array $items, DocumentCollectionItem $root = NULL): array {
+  public function buildDocumentTree(array $items, ?DocumentCollectionItem $root = NULL): array {
     if (NULL === $root) {
       $nodeIds = array_map(static function (DocumentCollectionItem $item) {
         return $item->getDocumentId();
diff --git a/web/profiles/custom/os2loop/modules/os2loop_media/modules/os2loop_media_fixtures/src/Fixture/MediaFixture.php b/web/profiles/custom/os2loop/modules/os2loop_media/modules/os2loop_media_fixtures/src/Fixture/MediaFixture.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\os2loop_media_fixtures\Fixture;
 
-use Drupal\content_fixtures\Fixture\AbstractFixture;
-use Drupal\content_fixtures\Fixture\FixtureGroupInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\content_fixtures\Fixture\AbstractFixture;
+use Drupal\content_fixtures\Fixture\FixtureGroupInterface;
 use Drupal\file\FileRepositoryInterface;
 use Drupal\media\Entity\Media;
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_messages/src/Helper/Helper.php b/web/profiles/custom/os2loop/modules/os2loop_messages/src/Helper/Helper.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\os2loop_messages\Helper;
 
-use Drupal\comment\CommentInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\comment\CommentInterface;
 use Drupal\message\Entity\Message;
 use Drupal\node\NodeInterface;
 use Drupal\os2loop_documents\Helper\CollectionHelper as DocumentsCollectionHelper;
diff --git a/web/profiles/custom/os2loop/modules/os2loop_revision_date/src/Plugin/Action/SetRevisionDate.php b/web/profiles/custom/os2loop/modules/os2loop_revision_date/src/Plugin/Action/SetRevisionDate.php
@@ -20,7 +20,7 @@ class SetRevisionDate extends ActionBase {
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     /** @var \Drupal\node\NodeInterface $object */
     $result = $object->access('update', $account, TRUE);
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_search_db/os2loop_search_db.module b/web/profiles/custom/os2loop/modules/os2loop_search_db/os2loop_search_db.module
@@ -5,10 +5,10 @@
  * Contains os2loop_search_db.module.
  */
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\block\Entity\Block;
 use Drupal\os2loop_search_db\Helper\Helper;
 use Drupal\search_api\Query\QueryInterface;
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_search_db/src/Helper/Helper.php b/web/profiles/custom/os2loop/modules/os2loop_search_db/src/Helper/Helper.php
@@ -2,13 +2,13 @@
 
 namespace Drupal\os2loop_search_db\Helper;
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
+use Drupal\block\Entity\Block;
 use Drupal\node\Entity\Node;
 use Drupal\os2loop_search_db\Form\SettingsForm;
 use Drupal\os2loop_settings\Settings;
diff --git a/web/profiles/custom/os2loop/modules/os2loop_section_page/modules/os2loop_section_page_fixtures/src/Fixture/FrontPageFixture.php b/web/profiles/custom/os2loop/modules/os2loop_section_page/modules/os2loop_section_page_fixtures/src/Fixture/FrontPageFixture.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\os2loop_section_page_fixtures\Fixture;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\content_fixtures\Fixture\AbstractFixture;
 use Drupal\content_fixtures\Fixture\FixtureGroupInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\node\Entity\Node;
 use Drupal\paragraphs\Entity\Paragraph;
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_settings/src/Settings.php b/web/profiles/custom/os2loop/modules/os2loop_settings/src/Settings.php
@@ -36,14 +36,14 @@ public function __construct(ConfigFactoryInterface $configFactory, EntityTypeMan
   /**
    * Get config.
    */
-  public function getConfig(string $name = NULL) {
+  public function getConfig(?string $name = NULL) {
     return $this->configFactory->get($name ?? SettingsForm::SETTINGS_NAME);
   }
 
   /**
    * Get editable config.
    */
-  public function getEditableConfig(string $name = NULL) {
+  public function getEditableConfig(?string $name = NULL) {
     return $this->configFactory->getEditable($name ?? SettingsForm::SETTINGS_NAME);
   }
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_settings/src/TwigExtension/TwigExtension.php b/web/profiles/custom/os2loop/modules/os2loop_settings/src/TwigExtension/TwigExtension.php
@@ -65,7 +65,7 @@ public function getFunctions() {
    *   Check for permission:     is_granted('administer nodes')
    *   Check for access on node: is_granted('update', node)
    */
-  public function isGranted(string $attribute = NULL, $object = NULL) {
+  public function isGranted(?string $attribute = NULL, $object = NULL) {
     if (NULL !== $attribute) {
       // If no object is passed we Check for permission or role.
       if (NULL === $object) {
@@ -106,7 +106,7 @@ public function isGranted(string $attribute = NULL, $object = NULL) {
    * @return array
    *   Array of default config or specified config.
    */
-  public function getConfig(string $config_name = NULL): array {
+  public function getConfig(?string $config_name = NULL): array {
     return $this->settings->getConfig($config_name)->get();
   }
 
diff --git a/web/profiles/custom/os2loop/modules/os2loop_subscriptions/src/EventSubscriber/SubscriptionFlagSubscriber.php b/web/profiles/custom/os2loop/modules/os2loop_subscriptions/src/EventSubscriber/SubscriptionFlagSubscriber.php
@@ -164,7 +164,7 @@ private function getActiveMessages(): array {
    * @param \Drupal\flag\FlagInterface|null $flag
    *   The flag we want to set.
    */
-  private function flagMessageRead(int $entity_id, array $active_messages, FlagInterface $flag = NULL) {
+  private function flagMessageRead(int $entity_id, array $active_messages, ?FlagInterface $flag = NULL) {
     $messages = $this->getReferencedMessages($entity_id);
     foreach ($messages as $id => $message) {
       // Check if the flag has already been set.
diff --git a/web/profiles/custom/os2loop/modules/os2loop_taxonomy/modules/os2loop_taxonomy_fixtures/src/Fixture/TaxonomyTermFixture.php b/web/profiles/custom/os2loop/modules/os2loop_taxonomy/modules/os2loop_taxonomy_fixtures/src/Fixture/TaxonomyTermFixture.php
@@ -66,7 +66,7 @@ public function load() {
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  private function createTerms(array $items, Term $parent = NULL) {
+  private function createTerms(array $items, ?Term $parent = NULL) {
     $weight = 0;
     foreach ($items as $name => $value) {
       if (is_array($value)) {
@@ -95,7 +95,7 @@ private function createTerms(array $items, Term $parent = NULL) {
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  protected function createTerm(string $name, int $weight, Term $parent = NULL) {
+  protected function createTerm(string $name, int $weight, ?Term $parent = NULL) {
     $term = Term::create([
       'vid' => static::$vocabularyId,
       'weight' => $weight,
diff --git a/web/profiles/custom/os2loop/modules/os2loop_upvote/src/EventSubscriber/UpvoteFlagSubscriber.php b/web/profiles/custom/os2loop/modules/os2loop_upvote/src/EventSubscriber/UpvoteFlagSubscriber.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\os2loop_upvote\EventSubscriber;
 
-use Drupal\comment\Entity\Comment;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\comment\Entity\Comment;
 use Drupal\flag\Event\FlagEvents;
 use Drupal\flag\Event\FlaggingEvent;
 use Drupal\flag\FlagServiceInterface;

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ public function getGroups() {`
`371`	`371`	`*`
`372`	`372`	`* @throws \Drupal\Core\Entity\EntityStorageException`
`373`	`373`	`*/`
`374`		`- private function createStep(array $values, Paragraph $parent = NULL): Paragraph {`
	`374`	`+ private function createStep(array $values, ?Paragraph $parent = NULL): Paragraph {`
`375`	`375`	`$step = Paragraph::create($values + ['type' => 'os2loop_documents_step']);`
`376`	`376`	`$step->save();`
`377`	`377`	`if (NULL !== $parent) {`