some fixes

schmittjoh · Dec 21, 2013 · f44eefc · f44eefc
1 parent 814f758
commit f44eefc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/src/Metadata/Driver/AbstractFileDriver.php b/src/Metadata/Driver/AbstractFileDriver.php
@@ -46,7 +46,7 @@ public function getAllClassNames()
      * @param \ReflectionClass $class
      * @param string           $file
      *
-     * @return \MetaData\ClassMetadata|null
+     * @return \Metadata\ClassMetadata|null
      */
     abstract protected function loadMetadataFromFile(\ReflectionClass $class, $file);
 

diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -45,7 +45,7 @@ public function __construct(DriverInterface $driver, $hierarchyMetadataClass = '
     }
 
     /**
-     * @param boolean $bool
+     * @param boolean $include
      */
     public function setIncludeInterfaces($include)
     {
@@ -60,7 +60,7 @@ public function setCache(CacheInterface $cache)
     /**
      * @param string $className
      *
-     * @return ClassMetaData
+     * @return ClassHierarchyMetadata|MergeableClassMetadata|null
      */
     public function getMetadataForClass($className)
     {
@@ -158,6 +158,9 @@ private function addClassMetadata(&$metadata, $toAdd)
         }
     }
 
+    /**
+     * @param string $class
+     */
     private function getClassHierarchy($class)
     {
         $classes = array();
@@ -193,6 +196,11 @@ private function getClassHierarchy($class)
         return $newHierarchy;
     }
 
+    /**
+     * @param NullMetadata|null $metadata
+     *
+     * @return ClassMetadata|null
+     */
     private function filterNullMetadata($metadata = null)
     {
         return !$metadata instanceof NullMetadata ? $metadata : null;

diff --git a/tests/Metadata/Tests/Cache/FileCacheTest.php b/tests/Metadata/Tests/Cache/FileCacheTest.php
@@ -3,7 +3,6 @@
 namespace Metadata\Tests\Cache;
 
 use Metadata\ClassMetadata;
-
 use Metadata\Cache\FileCache;
 
 class FileCacheTest extends \PHPUnit_Framework_TestCase

diff --git a/tests/Metadata/Tests/MergeableClassMetadataTest.php b/tests/Metadata/Tests/MergeableClassMetadataTest.php
@@ -3,7 +3,6 @@
 namespace Metadata\Tests;
 
 use Metadata\MergeableClassMetadata;
-use Metadata\ClassMetadata;
 
 class MergeableClassMetadataTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/Metadata/Tests/MethodMetadataTest.php b/tests/Metadata/Tests/MethodMetadataTest.php
@@ -3,7 +3,6 @@
 namespace Metadata\Tests;
 
 use Metadata\Tests\Fixtures\TestObject;
-
 use Metadata\MethodMetadata;
 
 class MethodMetadataTest extends \PHPUnit_Framework_TestCase

diff --git a/tests/Metadata/Tests/PropertyMetadataTest.php b/tests/Metadata/Tests/PropertyMetadataTest.php
@@ -3,7 +3,6 @@
 namespace Metadata\Tests;
 
 use Metadata\Tests\Fixtures\TestObject;
-
 use Metadata\PropertyMetadata;
 
 class PropertyMetadataTest extends \PHPUnit_Framework_TestCase