Merge branch '2.15' into 2.16

* 2.15:
  DX: Travis CI config - fix warnings and infos
  Fix handling `/**` and `*/` on the same line as the first and/or last annotation

Author: SpacePossum

.travis.yml

@@ -1,3 +1,6 @@
+dist: xenial
+os: linux
+
 language: php
 
 git:
@@ -145,10 +148,10 @@ jobs:
                 - test $(php dev-tools/info-extractor.php | jq .version.vnumber) == "\"$TRAVIS_TAG\""
             deploy:
                 provider: releases
-                api_key:
+                token:
                     secure: K9NKi7X1OPz898fxtVc1RfWrSI+4hTFFYOik932wTz1jC4dQJ64Khh1LV9frA1+JiDS3+R6TvmQtpzbkX3y4L75UrSnP1ADH5wfMYIVmydG3ZjTMo8SWQWHmRMh3ORAKTMMpjl4Q7EkRkLp6RncKe+FAFPP5mgv55mtIMaE4qUk=
                 file: php-cs-fixer.phar
-                skip_cleanup: true
+                cleanup : false
                 on:
                     repo: FriendsOfPHP/PHP-CS-Fixer
                     tags: true

src/DocBlock/Annotation.php

@@ -248,7 +248,23 @@ public function getNormalizedTypes()
     public function remove()
     {
         foreach ($this->lines as $line) {
-            $line->remove();
+            if ($line->isTheStart() && $line->isTheEnd()) {
+                // Single line doc block, remove entirely
+                $line->remove();
+            } elseif ($line->isTheStart()) {
+                // Multi line doc block, but start is on the same line as the first annotation, keep only the start
+                $content = Preg::replace('#(\s*/\*\*).*#', '$1', $line->getContent());
+
+                $line->setContent($content);
+            } elseif ($line->isTheEnd()) {
+                // Multi line doc block, but end is on the same line as the last annotation, keep only the end
+                $content = Preg::replace('#(\s*)\S.*(\*/.*)#', '$1$2', $line->getContent());
+
+                $line->setContent($content);
+            } else {
+                // Multi line doc block, neither start nor end on this line, can be removed safely
+                $line->remove();
+            }
         }
 
         $this->clearCache();
@@ -286,7 +302,7 @@ private function getTypesContent()
             }
 
             $matchingResult = Preg::match(
-                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:\h.*)?$}sx',
+                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:[*\h].*)?$}sx',
                 $this->lines[0]->getContent(),
                 $matches
             );

tests/DocBlock/AnnotationTest.php

@@ -213,6 +213,58 @@ public function provideRemoveCases()
         return $cases;
     }
 
+    /**
+     * @param string $expected
+     * @param string $input
+     *
+     * @dataProvider provideRemoveEdgeCasesCases
+     */
+    public function testRemoveEdgeCases($expected, $input)
+    {
+        $doc = new DocBlock($input);
+        $annotation = $doc->getAnnotation(0);
+
+        $annotation->remove();
+        static::assertSame($expected, $doc->getContent());
+    }
+
+    public function provideRemoveEdgeCasesCases()
+    {
+        return [
+            // Single line
+            ['', '/** @return null*/'],
+            ['', '/** @return null */'],
+            ['', '/** @return null  */'],
+
+            // Multi line, annotation on start line
+            [
+                '/**
+                 */',
+                '/** @return null
+                 */',
+            ],
+            [
+                '/**
+                 */',
+                '/** @return null '.'
+                 */',
+            ],
+            // Multi line, annotation on end line
+            [
+                '/**
+                 */',
+                '/**
+                 * @return null*/',
+            ],
+            [
+                '/**
+                 */',
+                '/**
+                 * @return null */',
+            ],
+        ];
+    }
+
     /**
      * @param string   $input
      * @param string[] $expected

tests/Fixer/Phpdoc/PhpdocNoEmptyReturnFixerTest.php

@@ -58,6 +58,44 @@ public function testFixNull()
      * @return null
      */
 
+EOF;
+
+        $this->doTest($expected, $input);
+    }
+
+    public function testFixNullWithEndOnSameLine()
+    {
+        $expected = <<<'EOF'
+<?php
+    /**
+     */
+
+EOF;
+
+        $input = <<<'EOF'
+<?php
+    /**
+     * @return null */
+
+EOF;
+
+        $this->doTest($expected, $input);
+    }
+
+    public function testFixNullWithEndOnSameLineNoSpace()
+    {
+        $expected = <<<'EOF'
+<?php
+    /**
+     */
+
+EOF;
+
+        $input = <<<'EOF'
+<?php
+    /**
+     * @return null*/
+
 EOF;
 
         $this->doTest($expected, $input);