Unverified Commit 35a81fff authored by Mitch Portier's avatar Mitch Portier Committed by GitHub
Browse files

fix(VariableComment): Add support for union types (#3249360 by Arkener) 



Co-authored-by: default avatarMitch Portier <mitch.portier@indicia.nl>
parent 54e8b472

coder_sniffer/Drupal/Sniffs/Commenting/VariableCommentSniff.php

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ class VariableCommentSniff extends AbstractVariableSniff 
            T_STRING,

            T_NS_SEPARATOR,

            T_NULLABLE,

            T_TYPE_UNION,

            T_FALSE,

            T_NULL,

        ];



        $commentEnd = $phpcsFile->findPrevious($ignore, ($stackPtr - 1), null, true);

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
    "require": {

        "php": ">=7.0.8",

        "ext-mbstring": "*",

        "squizlabs/php_codesniffer": "^3.5.6",

        "squizlabs/php_codesniffer": "^3.6.0",

        "symfony/yaml": ">=2.0.5",

        "sirbrillig/phpcs-variable-analysis": "^2.10"

    },

tests/Drupal/Commenting/VariableCommentUnitTest.inc

+7 −0
Original line number Diff line number Diff line
@@ -51,4 +51,11 @@ class Test { 
   */

  public ?Bar $bar;



  /**

   * Property fooBar.

   *

   * @var Foo|Bar|false|null

   */

  public Foo|Bar|FALSE|NULL $fooBar;



}

tests/Drupal/Commenting/VariableCommentUnitTest.inc.fixed

+7 −0
Original line number Diff line number Diff line
@@ -55,4 +55,11 @@ class Test { 
   */

  public ?Bar $bar;



  /**

   * Property fooBar.

   *

   * @var Foo|Bar|false|null

   */

  public Foo|Bar|FALSE|NULL $fooBar;



}