Revert description

So it is just the original, but with setType added.

.travis.yml

@@ -3,18 +3,17 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
-  - 5.5
 
 script:
- - vendor/bin/phpunit
+ - vendor/phpunit/phpunit/composer/bin/phpunit
 
 before_script:
  - sudo apt-get -qq update > /dev/null
  - phpenv rehash > /dev/null
  - composer selfupdate --quiet
- - composer install --dev --prefer-source
- - vendor/bin/phpunit
- - composer update --dev --prefer-source
+ - composer install --dev 
+ - vendor/phpunit/phpunit/composer/bin/phpunit
+ - composer update --dev 
 
 notifications:
   irc: "irc.freenode.org#phpdocumentor"

composer.json

@@ -6,20 +6,13 @@
         {"name": "Mike van Riel", "email": "[email protected]"}
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "dflydev/markdown": "1.0.*"
     },
     "autoload": {
         "psr-0": {"phpDocumentor": ["src/"]}
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*@stable"
-    },
-    "suggest": {
-        "dflydev/markdown": "1.0.*"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
     }
 }

src/phpDocumentor/Reflection/DocBlock/Description.php

@@ -209,12 +209,14 @@ class Description implements \Reflector
     }
 
     /**
-     * Returns the long description as a string.
+     * Returns the exported information (we should use the export static method
+     * BUT this throws an exception at this point).
      *
      * @return string
+     * @codeCoverageIgnore Not yet implemented
      */
     public function __toString()
     {
-        return $this->getContents();
+        return 'Not yet implemented';
     }
 }

src/phpDocumentor/Reflection/DocBlock/Serializer.php

@@ -182,7 +182,7 @@ class Serializer
 
         /** @var Tag $tag */
         foreach ($docblock->getTags() as $tag) {
-            $tagText = (string) $tag;
+            $tagText = "@{$tag->getName()} {$tag->getContent()}";
             if ($this->lineLength) {
                 $tagText = wordwrap($tagText, $wrapLength);
             }

src/phpDocumentor/Reflection/DocBlock/Tag.php

@@ -366,12 +366,14 @@ class Tag implements \Reflector
     }
 
     /**
-     * Returns the tag as a serialized string
+     * Returns the exported information (we should use the export static method
+     * BUT this throws an exception at this point).
      *
      * @return string
+     * @codeCoverageIgnore Not yet implemented
      */
     public function __toString()
     {
-        return "@{$this->getName()} {$this->getContent()}";
+        return 'Not yet implemented';
     }
 }

src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php

@@ -81,10 +81,24 @@ class ReturnTag extends Tag
         return (string) $this->getTypesCollection();
     }
 
+    /**
+     * Set the type section of the variable
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+        $this->types = null;
+        $this->content = null;
+        return $this;
+    }
+
     /**
      * Returns the type collection.
      * 
-     * @return void
+     * @return Collection
      */
     protected function getTypesCollection()
     {