Move property name conversion into its own class

spec/SimpleXmlMapper/XmlMapperSpec.php

@@ -5,8 +5,8 @@
 use DateTime;
 use SimpleXMLElement;
 use PhpSpec\ObjectBehavior;
-use InvalidArgumentException;
 use SimpleXmlMapper\XmlMapper;
+use SimpleXmlMapper\CamelCasePropertyNameConverter;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
@@ -18,7 +18,8 @@ function let()
         $listExtractors = [new ReflectionExtractor];
         $typeExtractors = [new PhpDocExtractor];
         $extractor = new PropertyInfoExtractor($listExtractors, $typeExtractors);
-        $this->beConstructedWith($extractor);
+        $nameConverter = new CamelCasePropertyNameConverter;
+        $this->beConstructedWith($extractor, $nameConverter);
         $this->addType(DateTime::class, function ($xml) {
             return DateTime::createFromFormat('Y-m-d H:i:s', $xml);
         });

src/CamelCasePropertyNameConverter.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace SimpleXmlMapper;
+
+use Doctrine\Common\Inflector\Inflector;
+
+class CamelCasePropertyNameConverter implements PropertyNameConverterInterface
+{
+    /**
+     * Convert the specified XML property name to its PHP property name.
+     *
+     * @param string $name
+     * @return string
+     */
+    public function convert($name)
+    {
+        return Inflector::camelize($name);
+    }
+}

src/PropertyNameConverterInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace SimpleXmlMapper;
+
+interface PropertyNameConverterInterface
+{
+    /**
+     * Convert the specified XML property name to its PHP property name.
+     *
+     * @param string $name
+     * @return string
+     */
+    public function convert($name);
+}

src/XmlMapper.php

@@ -5,7 +5,6 @@
 use SimpleXMLElement;
 use InvalidArgumentException;
 use UnexpectedValueException;
-use Doctrine\Common\Inflector\Inflector;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 
@@ -18,6 +17,13 @@ class XmlMapper
      */
     protected $extractor;
 
+    /**
+     * The property name converter instance.
+     *
+     * @var PropertyNameConverterInterface|null
+     */
+    protected $nameConverter;
+
     /**
      * The default type instance.
      *
@@ -36,12 +42,13 @@ class XmlMapper
      * Create a new mapper instance.
      *
      * @param PropertyInfoExtractorInterface $extractor
-     * @param Type|null $defaultType
+     * @param PropertyNameConverterInterface|null $nameConverter
      */
-    public function __construct(PropertyInfoExtractorInterface $extractor, Type $defaultType = null)
+    public function __construct(PropertyInfoExtractorInterface $extractor, PropertyNameConverterInterface $nameConverter = null)
     {
         $this->extractor = $extractor;
-        $this->defaultType = $defaultType ?: new Type('string');
+        $this->nameConverter = $nameConverter;
+        $this->defaultType = new Type('string');
     }
 
     /**
@@ -60,10 +67,9 @@ public function addType($type, callable $callback)
      *
      * @param SimpleXMLElement $xml
      * @param string $class
-     * @param bool $camelize
      * @return mixed
      */
-    public function map(SimpleXMLElement $xml, $class, $camelize = false)
+    public function map(SimpleXMLElement $xml, $class)
     {
         if (!class_exists($class)) {
             throw new InvalidArgumentException("Class [$class] does not exist");
@@ -75,8 +81,8 @@ public function map(SimpleXMLElement $xml, $class, $camelize = false)
         foreach ($xml as $node) {
             $name = $node->getName();
 
-            if ($camelize) {
-                $name = Inflector::camelize($name);
+            if ($this->nameConverter) {
+                $name = $this->nameConverter->convert($name);
             }
 
             if (in_array($name, $properties)) {