Merge branch 'master' of github.com:phpDocumentor/ReflectionCommon

Author: mvriel

src/Fqsen.php

@@ -23,6 +23,11 @@ final class Fqsen
      */
     private $fqsen;
 
+    /**
+     * @var string name of the element without path.
+     */
+    private $name;
+
     /**
      * Initializes the object.
      *
@@ -32,14 +37,23 @@ final class Fqsen
      */
     public function __construct($fqsen)
     {
-        $result = preg_match('/^\\\\([A-Za-z_\\\\]+)(::\\$?[a-zA-Z_]+)?(\\(\\))?$/', $fqsen);
+        $matches = array();
+        $result = preg_match('/^\\\\([\\w_\\\\]*)(?:[:]{2}\\$?([\\w_]+))?(?:\\(\\))?$/', $fqsen, $matches);
+
         if ($result === 0) {
             throw new \InvalidArgumentException(
                 sprintf('"%s" is not a valid Fqsen.', $fqsen)
             );
         }
 
         $this->fqsen = $fqsen;
+
+        if (isset($matches[2])) {
+            $this->name = $matches[2];
+        } else {
+            $matches = explode('\\', $fqsen);
+            $this->name = trim(end($matches), '()');
+        }
     }
 
     /**
@@ -51,4 +65,14 @@ public function __toString()
     {
         return $this->fqsen;
     }
+
+    /**
+     * Returns the name of the element without path.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 }

src/Project.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * phpDocumentor
+ *
+ * PHP Version 5.5
+ *
+ * @copyright 2010-2015 Mike van Riel / Naenius (http://www.naenius.com)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for project. Since the definition of a project can be different per factory this interface will be small.
+ */
+interface Project
+{
+    /**
+     * Returns the name of the project.
+     *
+     * @return string
+     */
+    public function getName();
+}

src/ProjectFactory.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * phpDocumentor
+ *
+ * PHP Version 5.5
+ *
+ * @copyright 2010-2015 Mike van Riel / Naenius (http://www.naenius.com)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      http://phpdoc.org
+ */
+namespace phpDocumentor\Reflection;
+
+/**
+ * Interface for project factories. A project factory shall convert a set of files
+ * into an object implementing the Project interface.
+ */
+interface ProjectFactory
+{
+    /**
+     * Creates a project from the set of files.
+     *
+     * @param string[] $files
+     * @return Project
+     */
+    public function create(array $files);
+}

tests/unit/FqsenTest.php

@@ -22,9 +22,10 @@ class FqsenTest extends \PHPUnit_Framework_TestCase
      * @covers ::__construct
      * @dataProvider validFqsenProvider
      */
-    public function testValidFormats($fqsen)
+    public function testValidFormats($fqsen, $name)
     {
-        new Fqsen($fqsen);
+        $instance  = new Fqsen($fqsen);
+        $this->assertEquals($name, $instance->getName());
     }
 
     /**
@@ -35,15 +36,17 @@ public function testValidFormats($fqsen)
     public function validFqsenProvider()
     {
         return [
-            ['\My\Space'],
-            ['\My\Space\myFunction()'],
-            ['\My\Space\MY_CONSTANT'],
-            ['\My\Space\MyClass'],
-            ['\My\Space\MyInterface'],
-            ['\My\Space\MyTrait'],
-            ['\My\Space\MyClass::myMethod()'],
-            ['\My\Space\MyClass::$my_property'],
-            ['\My\Space\MyClass::MY_CONSTANT'],
+            ['\\', ''],
+            ['\My\Space', 'Space'],
+            ['\My\Space\myFunction()', 'myFunction'],
+            ['\My\Space\MY_CONSTANT', 'MY_CONSTANT'],
+            ['\My\Space\MY_CONSTANT2', 'MY_CONSTANT2'],
+            ['\My\Space\MyClass', 'MyClass'],
+            ['\My\Space\MyInterface', 'MyInterface'],
+            ['\My\Space\MyTrait', 'MyTrait'],
+            ['\My\Space\MyClass::myMethod()', 'myMethod'],
+            ['\My\Space\MyClass::$my_property', 'my_property'],
+            ['\My\Space\MyClass::MY_CONSTANT', 'MY_CONSTANT'],
         ];
     }