use public properties instead of private + getter

Seldaek · May 6, 2011 · e12ba70 · e12ba70
1 parent a7301d4
commit e12ba70
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 91 deletions.
diff --git a/src/Metadata/ClassHierarchyMetadata.php b/src/Metadata/ClassHierarchyMetadata.php
@@ -25,11 +25,11 @@
  */
 class ClassHierarchyMetadata
 {
-    private $classMetadata = array();
+    public $classMetadata = array();
 
     public function addClassMetadata(ClassMetadata $metadata)
     {
-        $this->classMetadata[] = $metadata;
+        $this->classMetadata[$metadata->name] = $metadata;
     }
 
     public function getRootClassMetadata()
@@ -42,11 +42,6 @@ public function getOutsideClassMetadata()
         return end($this->classMetadata);
     }
 
-    public function getClassMetadata()
-    {
-        return $this->classMetadata;
-    }
-
     public function getLastModified()
     {
         $time = 0;

diff --git a/src/Metadata/ClassMetadata.php b/src/Metadata/ClassMetadata.php
@@ -28,10 +28,10 @@
  */
 class ClassMetadata implements \Serializable
 {
-    private $name;
-    private $reflection;
-    private $methodMetadata = array();
-    private $propertyMetadata = array();
+    public $name;
+    public $reflection;
+    public $methodMetadata = array();
+    public $propertyMetadata = array();
 
     public function __construct($name)
     {
@@ -42,42 +42,12 @@ public function __construct($name)
 
     public function addMethodMetadata(MethodMetadata $metadata)
     {
-        $this->methodMetadata[$metadata->getName()] = $metadata;
+        $this->methodMetadata[$metadata->name] = $metadata;
     }
 
     public function addPropertyMetadata(PropertyMetadata $metadata)
     {
-        $this->propertyMetadata[$metadata->getName()] = $metadata;
-    }
-
-    public function hasMethodMetadata($name)
-    {
-        return isset($this->methodMetadata[$name]);
-    }
-
-    public function hasPropertyMetadata($name)
-    {
-        return isset($this->propertyMetadata[$name]);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getReflection()
-    {
-        return $this->reflection;
-    }
-
-    public function getMethodMetadata()
-    {
-        return $this->methodMetadata;
-    }
-
-    public function getPropertyMetadata()
-    {
-        return $this->propertyMetadata;
+        $this->propertyMetadata[$metadata->name] = $metadata;
     }
 
     public function getLastModified()

diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -52,7 +52,7 @@ public function getMetadataForClass($className)
             $metadata->addClassMetadata($this->loadedClassMetadata[$name]);
         }
 
-        if (!$metadata->getClassMetadata()) {
+        if (!$metadata->classMetadata) {
             throw new \RuntimeException(sprintf('There is no metadata for class "%s".', $className));
         }
 

diff --git a/src/Metadata/MethodMetadata.php b/src/Metadata/MethodMetadata.php
@@ -28,9 +28,9 @@
  */
 class MethodMetadata implements \Serializable
 {
-    private $class;
-    private $name;
-    private $reflection;
+    public $class;
+    public $name;
+    public $reflection;
 
     public function __construct($class, $name)
     {
@@ -41,21 +41,6 @@ public function __construct($class, $name)
         $this->reflection->setAccessible(true);
     }
 
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getReflection()
-    {
-        return $this->reflection;
-    }
-
     public function invoke($obj, array $args = array())
     {
         return $this->reflection->invokeArgs($obj, $args);

diff --git a/src/Metadata/PropertyMetadata.php b/src/Metadata/PropertyMetadata.php
@@ -28,9 +28,9 @@
  */
 class PropertyMetadata implements \Serializable
 {
-    private $class;
-    private $name;
-    private $reflection;
+    public $class;
+    public $name;
+    public $reflection;
 
     public function __construct($class, $name)
     {
@@ -41,21 +41,6 @@ public function __construct($class, $name)
         $this->reflection->setAccessible(true);
     }
 
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getReflection()
-    {
-        return $this->reflection;
-    }
-
     public function getValue($obj)
     {
         return $this->reflection->getValue($obj);

diff --git a/tests/Metadata/Tests/ClassMetadataTest.php b/tests/Metadata/Tests/ClassMetadataTest.php
@@ -10,8 +10,8 @@ public function testConstructor()
     {
         $metadata = new ClassMetadata('Metadata\Tests\Fixtures\TestObject');
 
-        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->getName());
-        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->getReflection()->getName());
+        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->name);
+        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->reflection->getName());
     }
 
     public function testSerializeUnserialize()

diff --git a/tests/Metadata/Tests/MetadataFactoryTest.php b/tests/Metadata/Tests/MetadataFactoryTest.php
@@ -16,22 +16,22 @@ public function testGetMetadataForClass()
             ->method('loadMetadataForClass')
             ->with($this->equalTo(new \ReflectionClass('Metadata\Tests\Fixtures\TestObject')))
             ->will($this->returnCallback(function($class) {
-                return new ClassMetadata($class);
+                return new ClassMetadata($class->getName());
             }))
         ;
         $driver
             ->expects($this->at(1))
             ->method('loadMetadataForClass')
             ->with($this->equalTo(new \ReflectionClass('Metadata\Tests\Fixtures\TestParent')))
             ->will($this->returnCallback(function($class) {
-                return new ClassMetadata($class);
+                return new ClassMetadata($class->getName());
             }))
         ;
 
         $factory = new MetadataFactory($driver);
         $metadata = $factory->getMetadataForClass('Metadata\Tests\Fixtures\TestParent');
 
         $this->assertInstanceOf('Metadata\ClassHierarchyMetadata', $metadata);
-        $this->assertEquals(2, count($metadata->getClassMetadata()));
+        $this->assertEquals(2, count($metadata->classMetadata));
     }
 }
diff --git a/tests/Metadata/Tests/MethodMetadataTest.php b/tests/Metadata/Tests/MethodMetadataTest.php
@@ -12,9 +12,9 @@ public function testConstructor()
     {
         $metadata = new MethodMetadata('Metadata\Tests\Fixtures\TestObject', 'setFoo');
 
-        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->getClass());
-        $this->assertEquals('setFoo', $metadata->getName());
-        $this->assertEquals(new \ReflectionMethod('Metadata\Tests\Fixtures\TestObject', 'setFoo'), $metadata->getReflection());
+        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->class);
+        $this->assertEquals('setFoo', $metadata->name);
+        $this->assertEquals(new \ReflectionMethod('Metadata\Tests\Fixtures\TestObject', 'setFoo'), $metadata->reflection);
     }
 
     public function testSerializeUnserialize()

diff --git a/tests/Metadata/Tests/PropertyMetadataTest.php b/tests/Metadata/Tests/PropertyMetadataTest.php
@@ -12,9 +12,9 @@ public function testConstructor()
     {
         $metadata = new PropertyMetadata('Metadata\Tests\Fixtures\TestObject', 'foo');
 
-        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->getClass());
-        $this->assertEquals('foo', $metadata->getName());
-        $this->assertEquals(new \ReflectionProperty('Metadata\Tests\Fixtures\TestObject', 'foo'), $metadata->getReflection());
+        $this->assertEquals('Metadata\Tests\Fixtures\TestObject', $metadata->class);
+        $this->assertEquals('foo', $metadata->name);
+        $this->assertEquals(new \ReflectionProperty('Metadata\Tests\Fixtures\TestObject', 'foo'), $metadata->reflection);
     }
 
     public function testSerializeUnserialize()