Markdown is not required, so move to suggest

Markdown is only used once and a check is in place to see if the markdown classes exists. So perhaps it is better to move this to suggest instead of require, so the people who don't need it, don't have to download it.

.travis.yml

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

composer.json

@@ -6,13 +6,20 @@
         {"name": "Mike van Riel", "email": "[email protected]"}
     ],
     "require": {
-        "php": ">=5.3.3",
-        "dflydev/markdown": "1.0.*"
+        "php": ">=5.3.3"
     },
     "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,14 +209,12 @@ class Description implements \Reflector
     }
 
     /**
-     * Returns the exported information (we should use the export static method
-     * BUT this throws an exception at this point).
+     * Returns the long description as a string.
      *
      * @return string
-     * @codeCoverageIgnore Not yet implemented
      */
     public function __toString()
     {
-        return 'Not yet implemented';
+        return $this->getContents();
     }
 }

src/phpDocumentor/Reflection/DocBlock/Serializer.php

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

src/phpDocumentor/Reflection/DocBlock/Tag.php

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