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

@@ -1,5 +1,5 @@
 {
-    "name":    "barryvdh/reflection-docblock",
+    "name":    "phpdocumentor/reflection-docblock",
     "type":    "library",
     "license": "MIT",
     "authors": [
@@ -8,13 +8,18 @@
     "require": {
         "php": ">=5.3.3"
     },
-    "suggest": {
-        "dflydev/markdown": "1.0.*"
-    },
     "autoload": {
-        "psr-0": {"Barryvdh": ["src/"]}
+        "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.php

@@ -10,11 +10,11 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection;
+namespace phpDocumentor\Reflection;
 
-use Barryvdh\Reflection\DocBlock\Tag;
-use Barryvdh\Reflection\DocBlock\Context;
-use Barryvdh\Reflection\DocBlock\Location;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Context;
+use phpDocumentor\Reflection\DocBlock\Location;
 
 /**
  * Parses the DocBlock for any structure.

src/phpDocumentor/Reflection/DocBlock/Context.php

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock;
+namespace phpDocumentor\Reflection\DocBlock;
 
 /**
  * The context in which a DocBlock occurs.

src/phpDocumentor/Reflection/DocBlock/Description.php

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock;
+namespace phpDocumentor\Reflection\DocBlock;
 
-use Barryvdh\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock;
 
 /**
  * Parses a Description of a DocBlock or tag.

src/phpDocumentor/Reflection/DocBlock/Location.php

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock;
+namespace phpDocumentor\Reflection\DocBlock;
 
 /**
  * The location a DocBlock occurs within a file.

src/phpDocumentor/Reflection/DocBlock/Serializer.php

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock;
+namespace phpDocumentor\Reflection\DocBlock;
 
-use Barryvdh\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock;
 
 /**
  * Serializes a DocBlock instance.

src/phpDocumentor/Reflection/DocBlock/Tag.php

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock;
+namespace phpDocumentor\Reflection\DocBlock;
 
-use Barryvdh\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock;
 
 /**
  * Parses a tag definition for a DocBlock.
@@ -59,43 +59,43 @@ class Tag implements \Reflector
      */
     private static $tagHandlerMappings = array(
         'author'
-            => '\Barryvdh\Reflection\DocBlock\Tag\AuthorTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\AuthorTag',
         'covers'
-            => '\Barryvdh\Reflection\DocBlock\Tag\CoversTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\CoversTag',
         'deprecated'
-            => '\Barryvdh\Reflection\DocBlock\Tag\DeprecatedTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\DeprecatedTag',
         'example'
-            => '\Barryvdh\Reflection\DocBlock\Tag\ExampleTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\ExampleTag',
         'link'
-            => '\Barryvdh\Reflection\DocBlock\Tag\LinkTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\LinkTag',
         'method'
-            => '\Barryvdh\Reflection\DocBlock\Tag\MethodTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\MethodTag',
         'param'
-            => '\Barryvdh\Reflection\DocBlock\Tag\ParamTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\ParamTag',
         'property-read'
-            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyReadTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyReadTag',
         'property'
-            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyTag',
         'property-write'
-            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyWriteTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyWriteTag',
         'return'
-            => '\Barryvdh\Reflection\DocBlock\Tag\ReturnTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\ReturnTag',
         'see'
-            => '\Barryvdh\Reflection\DocBlock\Tag\SeeTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\SeeTag',
         'since'
-            => '\Barryvdh\Reflection\DocBlock\Tag\SinceTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\SinceTag',
         'source'
-            => '\Barryvdh\Reflection\DocBlock\Tag\SourceTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\SourceTag',
         'throw'
-            => '\Barryvdh\Reflection\DocBlock\Tag\ThrowsTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
         'throws'
-            => '\Barryvdh\Reflection\DocBlock\Tag\ThrowsTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
         'uses'
-            => '\Barryvdh\Reflection\DocBlock\Tag\UsesTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\UsesTag',
         'var'
-            => '\Barryvdh\Reflection\DocBlock\Tag\VarTag',
+            => '\phpDocumentor\Reflection\DocBlock\Tag\VarTag',
         'version'
-            => '\Barryvdh\Reflection\DocBlock\Tag\VersionTag'
+            => '\phpDocumentor\Reflection\DocBlock\Tag\VersionTag'
     );
 
     /**

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for an @author tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @covers tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag\VersionTag;
+use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
 
 /**
  * Reflection class for a @deprecated tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @example tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @link tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @method in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @param tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @property-read tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @property tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @property-write tag in a Docblock.

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

@@ -10,10 +10,10 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
-use Barryvdh\Reflection\DocBlock\Type\Collection;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Type\Collection;
 
 /**
  * Reflection class for a @return tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @see tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag\VersionTag;
+use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
 
 /**
  * Reflection class for a @since tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @source tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @throws tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @uses tag in a Docblock.

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

@@ -10,7 +10,7 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @var tag in a Docblock.

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

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Tag;
+namespace phpDocumentor\Reflection\DocBlock\Tag;
 
-use Barryvdh\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tag;
 
 /**
  * Reflection class for a @version tag in a Docblock.

src/phpDocumentor/Reflection/DocBlock/Type/Collection.php

@@ -10,9 +10,9 @@
  * @link      http://phpdoc.org
  */
 
-namespace Barryvdh\Reflection\DocBlock\Type;
+namespace phpDocumentor\Reflection\DocBlock\Type;
 
-use Barryvdh\Reflection\DocBlock\Context;
+use phpDocumentor\Reflection\DocBlock\Context;
 
 /**
  * Collection