From 930a32886376582a7dee39b8f3535af0cad8f41d Mon Sep 17 00:00:00 2001
From: Alexander Varwijk <alexander@getopensocial.com>
Date: Mon, 20 Sep 2021 17:46:20 +0200
Subject: [PATCH] Allow property types instead of @var annotation in coding
 standards

---
 composer.json | 3 +++
 phpcs.xml     | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index a025377295c..15f08d92021 100644
--- a/composer.json
+++ b/composer.json
@@ -53,6 +53,9 @@
                 "Broken title in modal dialog when title is a render array": "https://www.drupal.org/files/issues/2019-10-21/2663316-76.drupal.Broken-title-in-modal-dialog-when-title-is-a-render-array.patch",
                 "PHPDocs with wrong parameters": "https://www.drupal.org/files/issues/2019-09-03/queryinterface-range-updated-phpdocs.patch"
             },
+            "drupal/coder": {
+                "Allow class property types instead of @var comments": "https://www.drupal.org/files/issues/2021-09-20/coder-3123282-2.patch"
+            },
             "drupal/flag": {
                 "Add relationship to flagged entities when Flagging is base table": "https://www.drupal.org/files/issues/2723703_31.patch"
             },
diff --git a/phpcs.xml b/phpcs.xml
index 589f46b926c..c86fb3f1e81 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -42,15 +42,9 @@
     <!--
       The social_graphql module expects PHP 7.4 but the Drupal coding standards does not yet allow
       nullable class property types. See https://www.drupal.org/project/coder/issues/3191651
-
-      Similarly we ignore missing variable annotation warnings because we use class property types
-      that already contain that information.
     -->
     <rule ref="Squiz.WhiteSpace.OperatorSpacing.NoSpaceAfter">
       <exclude-pattern>./modules/custom/social_graphql/*</exclude-pattern>
     </rule>
-    <rule ref="Drupal.Commenting.VariableComment.MissingVar">
-      <exclude-pattern>./modules/custom/social_graphql/*</exclude-pattern>
-    </rule>
 
 </ruleset>