Merge branch 'develop' of github.com:phpDocumentor/phpDocumentor2 int…

…o develop
phpDocumentor · Jun 27, 2014 · f6bba74 · f6bba74
2 parents 47e0c74 + 3eb14b9
commit f6bba74
Show file tree

Hide file tree

Showing 20 changed files with 402 additions and 142 deletions.
diff --git a/src/phpDocumentor/Application.php b/src/phpDocumentor/Application.php
@@ -57,7 +57,7 @@ public function __construct($autoloader = null)
     {
         $this->defineIniSettings();
 
-        self::$VERSION = file_get_contents(__DIR__ . '/../../VERSION');
+        self::$VERSION = trim(file_get_contents(__DIR__ . '/../../VERSION'));
 
         parent::__construct('phpDocumentor', self::$VERSION);
 

diff --git a/src/phpDocumentor/Descriptor/Builder/Reflector/ConstantAssembler.php b/src/phpDocumentor/Descriptor/Builder/Reflector/ConstantAssembler.php
@@ -36,7 +36,8 @@ public function create($data)
             '\\' . (strtolower($data->getNamespace()) == 'global' ? '' :$data->getNamespace())
         );
         $constantDescriptor->setFullyQualifiedStructuralElementName(
-            $constantDescriptor->getNamespace() . '\\' . $data->getShortName()
+            (trim($constantDescriptor->getNamespace(), '\\') ? $constantDescriptor->getNamespace() : '')
+            . '\\' . $data->getShortName()
         );
 
         $this->assembleDocBlock($data->getDocBlock(), $constantDescriptor);

diff --git a/src/phpDocumentor/Descriptor/Builder/Reflector/FunctionAssembler.php b/src/phpDocumentor/Descriptor/Builder/Reflector/FunctionAssembler.php
@@ -109,6 +109,10 @@ protected function createArgumentDescriptor($functionDescriptor, $argument)
     {
         $params = $functionDescriptor->getTags()->get('param', array());
 
+        if (!$this->argumentAssembler->getBuilder()) {
+            $this->argumentAssembler->setBuilder($this->builder);
+        }
+
         return $this->argumentAssembler->create($argument, $params);
     }
 

diff --git a/src/phpDocumentor/Plugin/Core/ServiceProvider.php b/src/phpDocumentor/Plugin/Core/ServiceProvider.php
@@ -42,6 +42,9 @@ public function register(Application $app)
         $writerCollection['checkstyle']->setTranslator($translator);
         $writerCollection['xml']->setTranslator($translator);
 
+        Xslt\Extension::$routers           = $app['transformer.routing.queue'];
+        Xslt\Extension::$descriptorBuilder = $app['descriptor.builder'];
+
         $app->register(new \phpDocumentor\Plugin\Graphs\ServiceProvider());
         $app->register(new \phpDocumentor\Plugin\Twig\ServiceProvider());
         $app->register(new \phpDocumentor\Plugin\Pdf\ServiceProvider());

diff --git a/src/phpDocumentor/Plugin/Core/Transformer/Writer/Pathfinder.php b/src/phpDocumentor/Plugin/Core/Transformer/Writer/Pathfinder.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace phpDocumentor\Plugin\Core\Transformer\Writer;
+
+class Pathfinder
+{
+    /**
+     * Combines the query and an object to retrieve a list of nodes that are to be used as node-point in a template.
+     *
+     * This method interprets the provided query string and walks through the given object to find the correct
+     * element. This method will silently fail if an invalid query was provided; in such a case the given object
+     * is returned.
+     *
+     * @param object $object
+     * @param string $query
+     *
+     * @return \Traversable|mixed[]
+     */
+    public function find($object, $query)
+    {
+        if ($query) {
+            $node = $this->walkObjectTree($object, $query);
+
+            if (!is_array($node) && (!$node instanceof \Traversable)) {
+                $node = array($node);
+            }
+
+            return $node;
+        }
+
+        return array($object);
+    }
+
+    /**
+     * Walks an object graph and/or array using a twig query string.
+     *
+     * @param \Traversable|mixed $objectOrArray
+     * @param string             $query         A path to walk separated by dots, i.e. `namespace.namespaces`.
+     *
+     * @return mixed
+     */
+    private function walkObjectTree($objectOrArray, $query)
+    {
+        $node = $objectOrArray;
+        $objectPath = explode('.', $query);
+
+        // walk through the tree
+        foreach ($objectPath as $pathNode) {
+            if (is_array($node)) {
+                if (isset($node[$pathNode])) {
+                    $node = $node[$pathNode];
+                    continue;
+                }
+            } elseif (is_object($node)) {
+                if (isset($node->$pathNode) || (method_exists($node, '__get') && $node->$pathNode)) {
+                    $node = $node->$pathNode;
+                    continue;
+                } elseif (method_exists($node, $pathNode)) {
+                    $node = $node->$pathNode();
+                    continue;
+                } elseif (method_exists($node, 'get' . $pathNode)) {
+                    $pathNode = 'get' . $pathNode;
+                    $node = $node->$pathNode();
+                    continue;
+                } elseif (method_exists($node, 'is' . $pathNode)) {
+                    $pathNode = 'is' . $pathNode;
+                    $node = $node->$pathNode();
+                    continue;
+                }
+            }
+
+            return null;
+        }
+
+        return $node;
+    }
+}
diff --git a/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml.php b/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml.php
@@ -217,12 +217,13 @@ protected function buildFile(\DOMElement $parent, FileDescriptor $file, Transfor
             }
         }
 
-        if (count($file->getErrors()) > 0) {
+        $errors = $file->getAllErrors();
+        if (count($errors) > 0) {
             $parse_errors = new \DOMElement('parse_markers');
             $child->appendChild($parse_errors);
 
             /** @var Error $error */
-            foreach ($file->getAllErrors() as $error) {
+            foreach ($errors as $error) {
                 $this->createErrorEntry($error, $parse_errors);
             }
         }

diff --git a/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/ArgumentConverter.php b/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/ArgumentConverter.php
@@ -12,6 +12,7 @@
 namespace phpDocumentor\Plugin\Core\Transformer\Writer\Xml;
 
 use phpDocumentor\Descriptor\ArgumentDescriptor;
+use phpDocumentor\Descriptor\DescriptorAbstract;
 
 class ArgumentConverter
 {
@@ -39,7 +40,14 @@ public function convert(\DOMElement $parent, ArgumentDescriptor $argument)
               ->appendChild(new \DOMText($argument->getDefault()));
 
         $types = $argument->getTypes();
-        $child->appendChild(new \DOMElement('type', implode('|', $types)));
+
+        $typeStrings = array();
+        foreach ($types as $type) {
+            $typeStrings[] = $type instanceof DescriptorAbstract
+                ? $type->getFullyQualifiedStructuralElementName()
+                : $type;
+        }
+        $child->appendChild(new \DOMElement('type', implode('|', $typeStrings)));
 
         return $child;
     }

diff --git a/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/ConstantConverter.php b/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/ConstantConverter.php
@@ -51,7 +51,7 @@ public function convert(\DOMElement $parent, ConstantDescriptor $constant)
         $child = new \DOMElement('constant');
         $parent->appendChild($child);
 
-        $child->setAttribute('namespace', $fullyQualifiedNamespaceName);
+        $child->setAttribute('namespace', ltrim($fullyQualifiedNamespaceName, '\\'));
         $child->setAttribute('line', $constant->getLine());
 
         $child->appendChild(new \DOMElement('name', $constant->getName()));

diff --git a/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/DocBlockConverter.php b/src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml/DocBlockConverter.php
@@ -116,7 +116,7 @@ protected function addDescription(\DOMElement $node, DescriptorAbstract $element
     protected function addTags(\DOMElement $docBlock, $descriptor)
     {
         foreach ($descriptor->getTags() as $tagGroup) {
-            if ($tagGroup === null) {
+            if (! $tagGroup) {
                 continue;
             }