From 7ac2c41415975158d3a601d8a522956913243edb Mon Sep 17 00:00:00 2001
From: Gerrit Addiks <gerrit@addiks.de>
Date: Mon, 7 Oct 2019 18:17:41 +0200
Subject: [PATCH] BlankLineBeforeStatementFixer - add "phpdoc"

---
 .gitattributes                                |  1 +
 .../BlankLineBeforeStatementFixer.php         |  2 +
 .../BlankLineBeforeStatementFixerTest.php     | 50 +++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index d63c42d9e35..96b6e11132c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,4 +17,5 @@
 *.php   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
 *.rst   text whitespace=blank-at-eol,blank-at-eof
 *.yml   text whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.png   binary eol=unset
 /tests/Fixtures/**/* -text -filter
diff --git a/src/Fixer/Whitespace/BlankLineBeforeStatementFixer.php b/src/Fixer/Whitespace/BlankLineBeforeStatementFixer.php
index 9e7cff6933c..ec0be673157 100644
--- a/src/Fixer/Whitespace/BlankLineBeforeStatementFixer.php
+++ b/src/Fixer/Whitespace/BlankLineBeforeStatementFixer.php
@@ -43,6 +43,8 @@ final class BlankLineBeforeStatementFixer extends AbstractFixer implements Confi
         'continue' => T_CONTINUE,
         'declare' => T_DECLARE,
         'default' => T_DEFAULT,
+        'die' => T_EXIT,
+        'phpdoc' => T_DOC_COMMENT,
         'do' => T_DO,
         'exit' => T_EXIT,
         'for' => T_FOR,
diff --git a/tests/Fixer/Whitespace/BlankLineBeforeStatementFixerTest.php b/tests/Fixer/Whitespace/BlankLineBeforeStatementFixerTest.php
index 0fb8083208b..b56aab8498e 100644
--- a/tests/Fixer/Whitespace/BlankLineBeforeStatementFixerTest.php
+++ b/tests/Fixer/Whitespace/BlankLineBeforeStatementFixerTest.php
@@ -1491,6 +1491,56 @@ public function label(): string {
         return "label";
     }
 }
+',
+        ];
+    }
+
+    /**
+     * @dataProvider provideFixWithDocCommentCases
+     */
+    public function testFixWithDocCommentCases(string $expected, string $input = null): void
+    {
+        $this->fixer->configure([
+            'statements' => ['phpdoc'],
+        ]);
+
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFixWithDocCommentCases(): iterable
+    {
+        yield [
+            '<?php
+/** @var int $foo */
+$foo = 123;
+
+/** @var float $bar */
+$bar = 45.6;
+
+/** @var string */
+$baz = "789";
+',
+            '<?php
+/** @var int $foo */
+$foo = 123;
+/** @var float $bar */
+$bar = 45.6;
+/** @var string */
+$baz = "789";
+',
+        ];
+
+        yield [
+            '<?php
+/* header */
+
+/**
+ * Class description
+ */
+class Foo {
+    /** test */
+    public function bar() {}
+}
 ',
         ];
     }