Renamed Attribute to Property on most classes and methods

symfony · lrlopez · Mar 4, 2016 · Mar 6, 2016 · Mar 16, 2016 · Mar 17, 2016
commit 00a26eb53bf4087a4d192fe6c0ec5f7b57c08c20
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -940,7 +940,7 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
         $serializerLoaders = array();
         if (isset($config['enable_annotations']) && $config['enable_annotations']) {
             $annotationLoader = new Definition(
-                'Symfony\Component\PropertyAccess\Mapping\Loader\AnnotationLoader',
+                \Symfony\Component\PropertyAccess\Mapping\Loader\AnnotationLoader::class,
                 array(new Reference('annotation_reader'))
             );
             $annotationLoader->setPublic(false);
@@ -954,15 +954,15 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
             $dirname = dirname($reflection->getFileName());
 
             if (is_file($file = $dirname.'/Resources/config/property_access.xml')) {
-                $definition = new Definition('Symfony\Component\PropertyAccess\Mapping\Loader\XmlFileLoader', array(realpath($file)));
+                $definition = new Definition(\Symfony\Component\PropertyAccess\Mapping\Loader\XmlFileLoader::class, array(realpath($file)));
                 $definition->setPublic(false);
 
                 $serializerLoaders[] = $definition;
                 $container->addResource(new FileResource($file));
             }
 
             if (is_file($file = $dirname.'/Resources/config/property_access.yml')) {
-                $definition = new Definition('Symfony\Component\PropertyAccess\Mapping\Loader\YamlFileLoader', array(realpath($file)));
+                $definition = new Definition(\Symfony\Component\PropertyAccess\Mapping\Loader\YamlFileLoader::class, array(realpath($file)));
                 $definition->setPublic(false);
 
                 $serializerLoaders[] = $definition;
@@ -971,13 +971,13 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
 
             if (is_dir($dir = $dirname.'/Resources/config/property_access')) {
                 foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
-                    $definition = new Definition('Symfony\Component\PropertyAccess\Mapping\Loader\XmlFileLoader', array($file->getRealpath()));
+                    $definition = new Definition(\Symfony\Component\PropertyAccess\Mapping\Loader\XmlFileLoader::class, array($file->getRealpath()));
                     $definition->setPublic(false);
 
                     $serializerLoaders[] = $definition;
                 }
                 foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
-                    $definition = new Definition('Symfony\Component\PropertyAccess\Mapping\Loader\YamlFileLoader', array($file->getRealpath()));
+                    $definition = new Definition(\Symfony\Component\PropertyAccess\Mapping\Loader\YamlFileLoader::class, array($file->getRealpath()));
                     $definition->setPublic(false);
 
                     $serializerLoaders[] = $definition;

diff --git a/src/Symfony/Component/PropertyAccess/Annotation/ConfigurationAnnotation.php b/src/Symfony/Component/PropertyAccess/Annotation/ConfigurationAnnotation.php
diff --git a/src/Symfony/Component/PropertyAccess/Annotation/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/Annotation/PropertyAccessor.php
@@ -19,53 +19,33 @@
  *
  * @author Luis Ramón López <lrlopez@gmail.com>
  */
-class PropertyAccessor extends ConfigurationAnnotation
+class PropertyAccessor
 {
-    protected $setter;
-
-    protected $getter;
-
-    protected $adder;
-
-    protected $remover;
-
-    public function getSetter()
-    {
-        return $this->setter;
-    }
-
-    public function setSetter($setter)
-    {
-        $this->setter = $setter;
-    }
-
-    public function getGetter()
-    {
-        return $this->getter;
-    }
-
-    public function setGetter($getter)
-    {
-        $this->getter = $getter;
-    }
-
-    public function getAdder()
-    {
-        return $this->adder;
-    }
-
-    public function setAdder($adder)
-    {
-        $this->adder = $adder;
-    }
-
-    public function getRemover()
-    {
-        return $this->remover;
-    }
-
-    public function setRemover($remover)
-    {
-        $this->remover = $remover;
-    }
+    /**
+     * Custom setter method for the property
+     *
+     * @var string $setter
+     */
+    public $setter;
+
+    /**
+     * Custom getter method for the property
+     *
+     * @var string $setter
+     */
+    public $getter;
+
+    /**
+     * Custom adder method for the property
+     *
+     * @var string $setter
+     */
+    public $adder;
+
+    /**
+     * Custom remover method for the property
+     *
+     * @var string $setter
+     */
+    public $remover;
 }
diff --git a/src/Symfony/Component/PropertyAccess/Exception/MappingException.php b/src/Symfony/Component/PropertyAccess/Exception/MappingException.php
@@ -14,7 +14,7 @@
 /**
  * MappingException.
  *
- * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Luis Ramón López <lrlopez@gmail.com>
  */
 class MappingException extends RuntimeException
 {

diff --git a/src/Symfony/Component/PropertyAccess/Mapping/AttributeMetadataInterface.php b/src/Symfony/Component/PropertyAccess/Mapping/AttributeMetadataInterface.php
diff --git a/src/Symfony/Component/PropertyAccess/Mapping/ClassMetadata.php b/src/Symfony/Component/PropertyAccess/Mapping/ClassMetadata.php
@@ -14,9 +14,9 @@
 /**
  * {@inheritdoc}
  *
- * @author Kévin Dunglas <dunglas@gmail.com>
+ * @author Luis Ramón López <lrlopez@gmail.com>
  */
-class ClassMetadata implements ClassMetadataInterface
+class ClassMetadata
 {
     /**
      * @var string
@@ -28,13 +28,13 @@ class ClassMetadata implements ClassMetadataInterface
     public $name;
 
     /**
-     * @var AttributeMetadataInterface[]
+     * @var PropertyMetadata[]
      *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
-     *           {@link getAttributesMetadata()} instead.
+     *           {@link getPropertiesMetadata()} instead.
      */
-    public $attributesMetadata = array();
+    public $propertiesMetadata = array();
 
     /**
      * @var \ReflectionClass
@@ -52,45 +52,55 @@ public function __construct($class)
     }
 
     /**
-     * {@inheritdoc}
+     * Returns the name of the backing PHP class.
+     *
+     * @return string The name of the backing class.
      */
     public function getName()
     {
         return $this->name;
     }
 
     /**
-     * {@inheritdoc}
+     * Adds an {@link AttributeMetadataInterface}.
+     *
+     * @param PropertyMetadata $propertyMetadata
      */
-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
+    public function addPropertyMetadata(PropertyMetadata $propertyMetadata)
     {
-        $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
+        $this->propertiesMetadata[$propertyMetadata->getName()] = $propertyMetadata;
     }
 
     /**
-     * {@inheritdoc}
+     * Gets the list of {@link PropertyMetadata}.
+     *
+     * @return PropertyMetadata[]
      */
-    public function getAttributesMetadata()
+    public function getPropertiesMetadata()
     {
-        return $this->attributesMetadata;
+        return $this->propertiesMetadata;
     }
 
     /**
-     * {@inheritdoc}
+     * Merges a {@link ClassMetadata} into the current one.
+     *
+     * @param ClassMetadata $classMetadata
      */
-    public function merge(ClassMetadataInterface $classMetadata)
+    public function merge(ClassMetadata $classMetadata)
     {
-        foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
-            if (isset($this->attributesMetadata[$attributeMetadata->getName()])) {
-                $this->attributesMetadata[$attributeMetadata->getName()]->merge($attributeMetadata);
+        foreach ($classMetadata->getPropertiesMetadata() as $attributeMetadata) {
+            if (isset($this->propertiesMetadata[$attributeMetadata->getName()])) {
+                $this->propertiesMetadata[$attributeMetadata->getName()]->merge($attributeMetadata);
             } else {
-                $this->addAttributeMetadata($attributeMetadata);
+                $this->addPropertyMetadata($attributeMetadata);
             }
         }
     }
 
     /**
-     * {@inheritdoc}
+     * Returns a {@link \ReflectionClass} instance for this class.
+     *
+     * @return \ReflectionClass
      */
     public function getReflectionClass()
     {
@@ -110,7 +120,7 @@ public function __sleep()
     {
         return array(
             'name',
-            'attributesMetadata',
+            'propertiesMetadata',
         );
     }
 }