Addressed @xabbuh and @fabpot comments

symfony · lrlopez · Mar 4, 2016 · Mar 6, 2016 · Mar 16, 2016 · Mar 17, 2016
commit 1e29523a430e54e86fcd49c67d2be02eae98da9a
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -25,6 +25,8 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\PropertyAccess\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\PropertyAccess\Mapping\Loader\YamlFileLoader;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
@@ -915,13 +917,6 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
        }
    }

-    /**
-     * Loads the PropertyAccess configuration.
-     *
-     * @param array            $config    A serializer configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
    private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
    {
        $loader->load('property_access.xml');
@@ -937,7 +932,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::class,
+                AnnotationLoader::class,
                array(new Reference('annotation_reader'))
            );
            $annotationLoader->setPublic(false);
@@ -951,15 +946,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::class, array(realpath($file)));
+                $definition = new Definition(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::class, array(realpath($file)));
+                $definition = new Definition(YamlFileLoader::class, array(realpath($file)));
                $definition->setPublic(false);

                $serializerLoaders[] = $definition;
@@ -968,13 +963,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::class, array($file->getRealpath()));
+                    $definition = new Definition(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::class, array($file->getRealpath()));
+                    $definition = new Definition(YamlFileLoader::class, array($file->getRealpath()));
                    $definition->setPublic(false);

                    $serializerLoaders[] = $definition;

diff --git a/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml b/...mfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/property_accessor.yml
@@ -2,4 +2,4 @@ framework:
    property_access:
        magic_call: true
        throw_exception_on_invalid_index: true
-        enable_annotations: true
+        enable_annotations: false
diff --git a/src/Symfony/Component/PropertyAccess/CHANGELOG.md b/src/Symfony/Component/PropertyAccess/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========

-3.1.0
+3.2.0
 ------
 * added custom method calling for properties.


diff --git a/src/Symfony/Component/PropertyAccess/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/PropertyAccess/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -43,21 +43,21 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
     *
     * @var LoaderInterface|null
     */
-    protected $loader;
+    private $loader;

    /**
     * The cache for caching class metadata.
     *
     * @var CacheItemPoolInterface|null
     */
-    protected $cache;
+    private $cache;

    /**
     * The loaded metadata, indexed by class name.
     *
     * @var ClassMetadata[]
     */
-    protected $loadedClasses = array();
+    private $loadedClasses = array();

    /**
     * Creates a new metadata factory.

diff --git a/src/Symfony/Component/PropertyAccess/Mapping/Factory/MetadataFactoryInterface.php b/src/Symfony/Component/PropertyAccess/Mapping/Factory/MetadataFactoryInterface.php
@@ -17,8 +17,6 @@
 /**
 * Returns {@link \Symfony\Component\PropertyAccess\Mapping\MetadataInterface} instances for values.
 *
- * @since  3.1
- *
 * @author Luis Ramón López <lrlopez@gmail.com>
 */
 interface MetadataFactoryInterface

diff --git a/src/Symfony/Component/PropertyAccess/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/PropertyAccess/Mapping/Loader/AnnotationLoader.php
@@ -28,14 +28,8 @@
 */
 class AnnotationLoader implements LoaderInterface
 {
-    /**
-     * @var Reader
-     */
    private $reader;

-    /**
-     * @param Reader $reader
-     */
    public function __construct(Reader $reader)
    {
        $this->reader = $reader;

diff --git a/src/Symfony/Component/PropertyAccess/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/PropertyAccess/Mapping/Loader/LoaderChain.php
@@ -27,9 +27,6 @@
 */
 class LoaderChain implements LoaderInterface
 {
-    /**
-     * @var LoaderInterface[]
-     */
    private $loaders;

    /**
-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     CHANGELOG
     =========
-.1.0
+.2.0
     ------
      * added custom method calling for properties.
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            dunglas
  

      

      

      


        Jul 5, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      This is unclear.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            lrlopez
  

      

      

      


        Jul 5, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Ok, I'll add a more thoughtful explanation
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
-          Expand Down