Apply suggestions from @dunglas code review

Co-Authored-By: joelwurtz <jwurtz@jolicode.com>
symfony · joelwurtz · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019
commit bd387f58167647a65a1a8c68a30b2e3a2c4b02db
diff --git a/src/Symfony/Component/AutoMapper/AutoMapper.php b/src/Symfony/Component/AutoMapper/AutoMapper.php
@@ -38,11 +38,11 @@
 use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;

 /**
- * An auto mapper has the role of mapping a source to a target.
+ * Maps a source data structure (object or array) to a target one.
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */
-class AutoMapper implements AutoMapperInterface, AutoMapperRegistryInterface, MapperGeneratorMetadataRegistryInterface
+final class AutoMapper implements AutoMapperInterface, AutoMapperRegistryInterface, MapperGeneratorMetadataRegistryInterface
 {
    private $metadatas = [];

@@ -168,7 +168,7 @@ public function map($sourceData, $targetData, Context $context = null)
     */
    public function getMetadata(string $source, string $target): ?MapperGeneratorMetadataInterface
    {
-        if (!\array_key_exists($source, $this->metadatas) || !\array_key_exists($target, $this->metadatas[$source])) {
+        if (!isset($this->metadatas[$source][$target])) {
            if (null === $this->mapperConfigurationFactory) {
                return null;
            }

diff --git a/src/Symfony/Component/AutoMapper/AutoMapperInterface.php b/src/Symfony/Component/AutoMapper/AutoMapperInterface.php
@@ -19,7 +19,7 @@
 interface AutoMapperInterface
 {
    /**
-     * Map data from a source to a target.
+     * Maps data from a source to a target.
     *
     * @param array|object        $source  Any data object, which may be an object or an array
     * @param string|array|object $target  To which type of data, or data, the source should be mapped

diff --git a/src/Symfony/Component/AutoMapper/AutoMapperRegistryInterface.php b/src/Symfony/Component/AutoMapper/AutoMapperRegistryInterface.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\AutoMapper;

 /**
- * Allow to retrieve mapper.
+ * Allows to retrieve a mapper.
 *
 * @internal
 *
@@ -21,7 +21,7 @@
 interface AutoMapperRegistryInterface
 {
    /**
-     * Get a specific mapper for a source type and a target type.
+     * Gets a specific mapper for a source type and a target type.
     *
     * @param string $source Source type
     * @param string $target Target type

diff --git a/src/Symfony/Component/AutoMapper/Context.php b/src/Symfony/Component/AutoMapper/Context.php
@@ -16,7 +16,7 @@
 /**
 * Context for mapping.
 *
- * Allow to customize how is done the mapping
+ * Allows to customize how is done the mapping
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */

diff --git a/src/Symfony/Component/AutoMapper/Extractor/AccessorExtractorInterface.php b/src/Symfony/Component/AutoMapper/Extractor/AccessorExtractorInterface.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\AutoMapper\Extractor;

 /**
- * Extract accessor and mutator.
+ * Extracts accessor and mutator.
 *
 * @internal
 *

diff --git a/src/Symfony/Component/AutoMapper/Extractor/MappingExtractor.php b/src/Symfony/Component/AutoMapper/Extractor/MappingExtractor.php
@@ -99,7 +99,7 @@ protected function getGroups($class, $property): ?array
        $groups = [];

        foreach ($serializerClassMetadata->getAttributesMetadata() as $serializerAttributeMetadata) {
-            if (\count($serializerAttributeMetadata->getGroups()) > 0) {
+            if ($serializerAttributeMetadata->getGroups()) {
                $anyGroupFound = true;
            }


diff --git a/src/Symfony/Component/AutoMapper/Extractor/MappingExtractorInterface.php b/src/Symfony/Component/AutoMapper/Extractor/MappingExtractorInterface.php
@@ -14,7 +14,7 @@
 use Symfony\Component\AutoMapper\MapperMetadataInterface;

 /**
- * Extract mapping.
+ * Extracts mapping.
 *
 * @internal
 *
@@ -23,19 +23,19 @@
 interface MappingExtractorInterface
 {
    /**
-     * Extract properties mapped for a given source and target.
+     * Extracts properties mapped for a given source and target.
     *
     * @return PropertyMapping[]
     */
    public function getPropertiesMapping(MapperMetadataInterface $mapperMetadata): array;

    /**
-     * Extract read accessor for a given source, target and property.
+     * Extracts read accessor for a given source, target and property.
     */
    public function getReadAccessor(string $source, string $target, string $property): ?ReadAccessor;

    /**
-     * Extract write mutator for a given source, target and property.
+     * Extracts write mutator for a given source, target and property.
     */
    public function getWriteMutator(string $source, string $target, string $property): ?WriteMutator;
 }
diff --git a/src/Symfony/Component/AutoMapper/Extractor/ReflectionExtractor.php b/src/Symfony/Component/AutoMapper/Extractor/ReflectionExtractor.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\AutoMapper\Extractor;

 /**
- * Extract accessor and mutator from reflection.
+ * Extracts accessor and mutator from reflection.
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */

diff --git a/src/Symfony/Component/AutoMapper/Extractor/SourceTargetMappingExtractor.php b/src/Symfony/Component/AutoMapper/Extractor/SourceTargetMappingExtractor.php
@@ -14,7 +14,7 @@
 use Symfony\Component\AutoMapper\MapperMetadataInterface;

 /**
- * Extract mapping between two objects, only give properties that have the same name.
+ * Extracts mapping between two objects, only gives properties that have the same name.
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */

diff --git a/src/Symfony/Component/AutoMapper/Extractor/WriteMutator.php b/src/Symfony/Component/AutoMapper/Extractor/WriteMutator.php
@@ -20,7 +20,7 @@
 use Symfony\Component\AutoMapper\Exception\CompileException;

 /**
- * Write mutator tell how to write to a property.
+ * Writes mutator tell how to write to a property.
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */

diff --git a/src/Symfony/Component/AutoMapper/Extractor/WriteMutatorExtractorInterface.php b/src/Symfony/Component/AutoMapper/Extractor/WriteMutatorExtractorInterface.php
@@ -12,13 +12,13 @@
 namespace Symfony\Component\AutoMapper\Extractor;

 /**
- * Extract write mutator for property of a class.
+ * Extracts write mutator for property of a class.
 *
 * @internal
 *
 * @author Joel Wurtz <jwurtz@jolicode.com>
 */
 interface WriteMutatorExtractorInterface
 {
-    public function getWriteMutator(string $class, string $property, bool $allowConstruct = true): ?WriteMutator;
+    public function getWriteMutator(string $class, string $property, bool $allowConstructor = true): ?WriteMutator;
 }
diff --git a/src/Symfony/Component/AutoMapper/Generator/UniqueVariableScope.php b/src/Symfony/Component/AutoMapper/Generator/UniqueVariableScope.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\AutoMapper\Generator;

 /**
- * Allow to get a unique variable name for a scope (like a method).
+ * Allows to get a unique variable name for a scope (like a method).
 *
 * @internal
 *

diff --git a/src/Symfony/Component/AutoMapper/LICENSE b/src/Symfony/Component/AutoMapper/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2019 Fabien Potencier

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Symfony/Component/AutoMapper/Loader/ClassLoaderInterface.php b/src/Symfony/Component/AutoMapper/Loader/ClassLoaderInterface.php
@@ -14,7 +14,7 @@
 use Symfony\Component\AutoMapper\MapperGeneratorMetadataInterface;

 /**
- * Load (require) a mapping given metadata.
+ * Loads (require) a mapping given metadata.
 */
 interface ClassLoaderInterface
 {

diff --git a/src/Symfony/Component/AutoMapper/Loader/EvalLoader.php b/src/Symfony/Component/AutoMapper/Loader/EvalLoader.php
@@ -13,7 +13,7 @@
 use Symfony\Component\AutoMapper\MapperGeneratorMetadataInterface;

 /**
- * Use a generator and eval to requiring mapping of a class.
+ * Uses a generator and eval to requiring mapping of a class.
 */
 class EvalLoader implements ClassLoaderInterface
 {

diff --git a/src/Symfony/Component/AutoMapper/MapperMetadata.php b/src/Symfony/Component/AutoMapper/MapperMetadata.php
@@ -111,7 +111,7 @@ public function hasConstructor(): bool
            }
        }

-        if (0 === \count($mandatoryParameters)) {
+        if (!$mandatoryParameters) {
            return true;
        }
-Original file line number
+Diff line change
@@ -12,7 +12,7 @@
     namespace Symfony\Component\AutoMapper\Extractor;
                   joelwurtz marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
     /**
-     * Extract accessor and mutator from reflection.
+     * Extracts accessor and mutator from reflection.
      *
      * @author Joel Wurtz <jwurtz@jolicode.com>
      */
-          Expand Down