Merge branch '2.15' into 2.16

Author: keradus

src/Fixer/Phpdoc/PhpdocSeparationFixer.php

@@ -102,7 +102,7 @@ private function fixDescription(DocBlock $doc)
             if ($line->containsUsefulContent()) {
                 $next = $doc->getLine($index + 1);
 
-                if ($next->containsATag()) {
+                if (null !== $next && $next->containsATag()) {
                     $line->addBlank();
 
                     break;

tests/Fixer/Phpdoc/PhpdocSeparationFixerTest.php

@@ -573,6 +573,18 @@ public function testLargerEmptyDocBlock()
      *
      */
 
+EOF;
+
+        $this->doTest($expected);
+    }
+
+    public function testOneLineDocBlock()
+    {
+        $expected = <<<'EOF'
+<?php
+    /** Foo */
+    const Foo = 1;
+
 EOF;
 
         $this->doTest($expected);