From 8dea960fda34fdf9ee2fa0595d5eace41af9197e Mon Sep 17 00:00:00 2001
From: Piegefull <Piegefull@3526109.no-reply.drupal.org>
Date: Fri, 28 Feb 2020 09:48:28 +0100
Subject: [PATCH] Issue #3115174 by Piegefull, Grimreaper: Fix Pareview,
 strict_types

---
 composer.json                                        |  1 +
 ...tityVisibilityPreviewSimpleGrantsGrantsHelper.php | 12 ++++++------
 ...ilityPreviewSimpleGrantsGrantsHelperInterface.php |  2 ++
 ...stMultipleSegmentPreviewSearchApiDbAccessTest.php |  2 +-
 .../NodeListMultipleSegmentSearchApiDbAccessTest.php |  2 +-
 .../NodeListPreviewSearchApiDbAccessTest.php         |  2 +-
 .../NodeListSearchApiDbAccessTest.php                |  2 +-
 src/Form/SettingsForm.php                            |  2 ++
 .../TaxonomyConditionGlobalConfigurationForm.php     |  2 ++
 src/Service/EntityVisibilityPreviewFieldHelper.php   |  4 +++-
 .../EntityVisibilityPreviewFieldHelperInterface.php  |  5 ++++-
 .../EntityVisibilityPreviewTaxonomyHelper.php        |  2 ++
 ...ntityVisibilityPreviewTaxonomyHelperInterface.php |  2 ++
 13 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 8d23204..7fc6fbe 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
     },
     "license": "GPL-2.0+",
     "require-dev": {
+        "drupal/jsonapi_extras": "~3.13",
         "drupal/search_api": "~1.0"
     }
 }
diff --git a/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelper.php b/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelper.php
index e981425..8a7d4cc 100644
--- a/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelper.php
+++ b/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelper.php
@@ -83,7 +83,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getNodeGrantsIds(int $nodeId) : array {
     return $this->connection->select(self::EVP_SIMPLE_GRANTS_TABLE, 'evp')
@@ -94,7 +94,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function deleteNodeGrants(int $nodeId) : int {
     return $this->connection->delete(self::EVP_SIMPLE_GRANTS_TABLE)
@@ -103,7 +103,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function insertNodeGrants(array $grantDefinitions) : int {
     $result = 0;
@@ -123,7 +123,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function computeNodeGrantsAndSave(NodeInterface $node) : int {
     $nbGrants = 0;
@@ -167,7 +167,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getUserGrants(AccountInterface $account) : array {
     $userTaxonomies = [];
@@ -216,7 +216,7 @@ class EntityVisibilityPreviewSimpleGrantsGrantsHelper implements EntityVisibilit
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getGrantsFromConditions(array $segments, int $date) : array {
     $query = $this->connection->select(self::EVP_SIMPLE_GRANTS_TABLE, 'evpsg')
diff --git a/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelperInterface.php b/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelperInterface.php
index cdd2f31..ee22e9d 100644
--- a/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelperInterface.php
+++ b/modules/entity_visibility_preview_simple_grants/src/Service/EntityVisibilityPreviewSimpleGrantsGrantsHelperInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview_simple_grants\Service;
 
 use Drupal\Core\Session\AccountInterface;
diff --git a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentPreviewSearchApiDbAccessTest.php b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentPreviewSearchApiDbAccessTest.php
index 336cdd8..c2d15ee 100644
--- a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentPreviewSearchApiDbAccessTest.php
+++ b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentPreviewSearchApiDbAccessTest.php
@@ -42,7 +42,7 @@ class NodeListMultipleSegmentPreviewSearchApiDbAccessTest extends NodeListMultip
   ];
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function testNodeListPreviewAccessTest() {
     /** @var \Drupal\search_api\IndexInterface $index */
diff --git a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentSearchApiDbAccessTest.php b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentSearchApiDbAccessTest.php
index 7d4f7c3..2cbd32c 100644
--- a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentSearchApiDbAccessTest.php
+++ b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListMultipleSegmentSearchApiDbAccessTest.php
@@ -38,7 +38,7 @@ class NodeListMultipleSegmentSearchApiDbAccessTest extends NodeListMultipleSegme
   ];
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function testNodeListAccessTest() {
     /** @var \Drupal\search_api\IndexInterface $index */
diff --git a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListPreviewSearchApiDbAccessTest.php b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListPreviewSearchApiDbAccessTest.php
index 2f5465a..e13a862 100644
--- a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListPreviewSearchApiDbAccessTest.php
+++ b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListPreviewSearchApiDbAccessTest.php
@@ -42,7 +42,7 @@ class NodeListPreviewSearchApiDbAccessTest extends NodeListPreviewAccessTest {
   ];
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function testNodeListPreviewAccessTest() {
     /** @var \Drupal\search_api\IndexInterface $index */
diff --git a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListSearchApiDbAccessTest.php b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListSearchApiDbAccessTest.php
index e6bee71..54c27bd 100644
--- a/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListSearchApiDbAccessTest.php
+++ b/modules/entity_visibility_preview_simple_grants/tests/src/FunctionalJavascript/NodeListSearchApiDbAccessTest.php
@@ -38,7 +38,7 @@ class NodeListSearchApiDbAccessTest extends NodeListAccessTest {
   ];
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function testNodeListAccessTest() {
     /** @var \Drupal\search_api\IndexInterface $index */
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index 0b91f31..2aaadcf 100755
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
diff --git a/src/Form/TaxonomyConditionGlobalConfigurationForm.php b/src/Form/TaxonomyConditionGlobalConfigurationForm.php
index 8eefdc8..9cd511c 100755
--- a/src/Form/TaxonomyConditionGlobalConfigurationForm.php
+++ b/src/Form/TaxonomyConditionGlobalConfigurationForm.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Form;
 
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
diff --git a/src/Service/EntityVisibilityPreviewFieldHelper.php b/src/Service/EntityVisibilityPreviewFieldHelper.php
index cc9b27e..1f16ef7 100644
--- a/src/Service/EntityVisibilityPreviewFieldHelper.php
+++ b/src/Service/EntityVisibilityPreviewFieldHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Service;
 
 use Drupal\Core\Entity\EntityFieldManagerInterface;
@@ -91,7 +93,7 @@ class EntityVisibilityPreviewFieldHelper implements EntityVisibilityPreviewField
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getEntityVisibilityPreviewFieldsForBundle($entityType, $entityBundle) : array {
     $fields = $this->getAllEntityVisibilityPreviewFields();
diff --git a/src/Service/EntityVisibilityPreviewFieldHelperInterface.php b/src/Service/EntityVisibilityPreviewFieldHelperInterface.php
index 1ebadc0..813db1b 100644
--- a/src/Service/EntityVisibilityPreviewFieldHelperInterface.php
+++ b/src/Service/EntityVisibilityPreviewFieldHelperInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Service;
 
 /**
@@ -40,10 +42,11 @@ interface EntityVisibilityPreviewFieldHelperInterface {
    *   The desired entity type.
    * @param string $entityBundle
    *   The desired bundle.
-   * @see $this->getAllEntityVisibilityPreviewFields()
    *
    * @return array
    *   An array of fields.
+   *
+   * @see $this->getAllEntityVisibilityPreviewFields()
    */
   public function getEntityVisibilityPreviewFieldsForBundle($entityType, $entityBundle) : array;
 
diff --git a/src/Service/EntityVisibilityPreviewTaxonomyHelper.php b/src/Service/EntityVisibilityPreviewTaxonomyHelper.php
index 4f834a2..0806783 100644
--- a/src/Service/EntityVisibilityPreviewTaxonomyHelper.php
+++ b/src/Service/EntityVisibilityPreviewTaxonomyHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Service;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
diff --git a/src/Service/EntityVisibilityPreviewTaxonomyHelperInterface.php b/src/Service/EntityVisibilityPreviewTaxonomyHelperInterface.php
index e6d9284..2df304a 100644
--- a/src/Service/EntityVisibilityPreviewTaxonomyHelperInterface.php
+++ b/src/Service/EntityVisibilityPreviewTaxonomyHelperInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Drupal\entity_visibility_preview\Service;
 
 /**
-- 
2.17.1