some big refactoring for the soap client

goetas-webservices · Sep 16, 2016 · 43dfa1b · 43dfa1b
1 parent 7afbbc4
commit 43dfa1b
Show file tree

Hide file tree

Showing 17 changed files with 261 additions and 199 deletions.
diff --git a/src/AbstractConverter.php b/src/AbstractConverter.php
@@ -1,14 +1,12 @@
 <?php
 namespace GoetasWebservices\Xsd\XsdToPhp;
 
-use GoetasWebservices\Xsd\XsdToPhp\Naming\NamingStrategy;
-use GoetasWebservices\XML\WSDLReader\DefinitionsReader;
 use GoetasWebservices\XML\XSDReader\Schema\Element\ElementSingle;
 use GoetasWebservices\XML\XSDReader\Schema\Schema;
 use GoetasWebservices\XML\XSDReader\Schema\Type\ComplexType;
 use GoetasWebservices\XML\XSDReader\Schema\Type\SimpleType;
 use GoetasWebservices\XML\XSDReader\Schema\Type\Type;
-use GoetasWebservices\XML\XSDReader\SchemaReader;
+use GoetasWebservices\Xsd\XsdToPhp\Naming\NamingStrategy;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -27,14 +25,6 @@ abstract class AbstractConverter
         'http://www.w3.org/XML/1998/namespace' => ''
     );
 
-    protected $baseTypes = [
-        'string',
-        'float',
-        'boolean',
-        'date',
-        'integer',
-        'mixed'
-    ];
     /**
      * @var \GoetasWebservices\Xsd\XsdToPhp\Naming\NamingStrategy
      */

diff --git a/src/Command/Convert.php b/src/Command/Convert.php
@@ -55,10 +55,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         foreach (['php', 'jms'] as $type) {
-            $converter = $this->container->get('goetas.xsd2php.converter.'.$type);
+            $converter = $this->container->get('goetas.xsd2php.converter.' . $type);
             $items = $converter->convert($schemas);
 
-            $writer = $this->container->get('goetas.xsd2php.writer.'.$type);
+            $writer = $this->container->get('goetas.xsd2php.writer.' . $type);
             $writer->write($items);
         }
         return count($items) ? 0 : 255;

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -12,47 +12,44 @@ public function getConfigTreeBuilder()
         $rootNode = $treeBuilder->root('xsd2php');
 
         $rootNode
-
             ->children()
-                ->scalarNode('naming_strategy')
-                    ->defaultValue('short')
-                    ->cannotBeEmpty()
-                ->end()
-                ->scalarNode('path_generator')
-                    ->defaultValue('psr4')
-                    ->cannotBeEmpty()
-                ->end()
-
-                ->arrayNode('namespaces')->fixXmlConfig('namespace')
-                    ->cannotBeEmpty()->isRequired()
-                    ->requiresAtLeastOneElement()
-                    ->prototype('scalar')
-                    ->end()
-                ->end()
-                ->arrayNode('known_locations')->fixXmlConfig('known_location')
-                    ->prototype('scalar')
-                    ->end()
-                ->end()
-                ->arrayNode('destinations_php')->fixXmlConfig('destination')
-                    ->cannotBeEmpty()->isRequired()
-                    ->requiresAtLeastOneElement()
-                    ->prototype('scalar')
-                    ->end()
-                ->end()
-                ->arrayNode('destinations_jms')->fixXmlConfig('destination')
-                    ->cannotBeEmpty()->isRequired()
-                    ->requiresAtLeastOneElement()
-                    ->prototype('scalar')
-                    ->end()
-                ->end()
-                ->arrayNode('aliases')->fixXmlConfig('alias')
-                    ->prototype('array')
-                        ->prototype('scalar')
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-        ;
+            ->scalarNode('naming_strategy')
+            ->defaultValue('short')
+            ->cannotBeEmpty()
+            ->end()
+            ->scalarNode('path_generator')
+            ->defaultValue('psr4')
+            ->cannotBeEmpty()
+            ->end()
+            ->arrayNode('namespaces')->fixXmlConfig('namespace')
+            ->cannotBeEmpty()->isRequired()
+            ->requiresAtLeastOneElement()
+            ->prototype('scalar')
+            ->end()
+            ->end()
+            ->arrayNode('known_locations')->fixXmlConfig('known_location')
+            ->prototype('scalar')
+            ->end()
+            ->end()
+            ->arrayNode('destinations_php')->fixXmlConfig('destination')
+            ->cannotBeEmpty()->isRequired()
+            ->requiresAtLeastOneElement()
+            ->prototype('scalar')
+            ->end()
+            ->end()
+            ->arrayNode('destinations_jms')->fixXmlConfig('destination')
+            ->cannotBeEmpty()->isRequired()
+            ->requiresAtLeastOneElement()
+            ->prototype('scalar')
+            ->end()
+            ->end()
+            ->arrayNode('aliases')->fixXmlConfig('alias')
+            ->prototype('array')
+            ->prototype('scalar')
+            ->end()
+            ->end()
+            ->end()
+            ->end();
         return $treeBuilder;
     }
 }
diff --git a/src/DependencyInjection/Xsd2PhpExtension.php b/src/DependencyInjection/Xsd2PhpExtension.php
@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container)
 
 
         $schemaReader = $container->getDefinition('goetas.xsd2php.schema_reader');
-        foreach ($config['known_locations'] as $namespace => $location){
+        foreach ($config['known_locations'] as $namespace => $location) {
             $schemaReader->addMethodCall('addKnownSchemaLocation', [$namespace, $location]);
         }
 

diff --git a/src/Jms/YamlConverter.php b/src/Jms/YamlConverter.php
@@ -3,8 +3,6 @@
 
 use Doctrine\Common\Inflector\Inflector;
 use Exception;
-use GoetasWebservices\Xsd\XsdToPhp\AbstractConverter;
-use GoetasWebservices\Xsd\XsdToPhp\Naming\NamingStrategy;
 use GoetasWebservices\XML\XSDReader\Schema\Attribute\AttributeContainer;
 use GoetasWebservices\XML\XSDReader\Schema\Attribute\AttributeItem;
 use GoetasWebservices\XML\XSDReader\Schema\Element\Element;
@@ -19,6 +17,8 @@
 use GoetasWebservices\XML\XSDReader\Schema\Type\ComplexType;
 use GoetasWebservices\XML\XSDReader\Schema\Type\SimpleType;
 use GoetasWebservices\XML\XSDReader\Schema\Type\Type;
+use GoetasWebservices\Xsd\XsdToPhp\AbstractConverter;
+use GoetasWebservices\Xsd\XsdToPhp\Naming\NamingStrategy;
 
 class YamlConverter extends AbstractConverter
 {

diff --git a/src/Naming/LongNamingStrategy.php b/src/Naming/LongNamingStrategy.php
@@ -7,6 +7,19 @@
 
 class LongNamingStrategy implements NamingStrategy
 {
+    protected $reservedWords = [
+        'int',
+        'float',
+        'bool',
+        'string',
+        'true',
+        'false',
+        'null',
+        'resource',
+        'object',
+        'mixed',
+        'numeric',
+    ];
 
     public function getTypeName(Type $type)
     {
@@ -20,7 +33,11 @@ public function getAnonymousTypeName(Type $type, $parentName)
 
     public function getItemName(Item $item)
     {
-        return $this->classify($item->getName());
+        $name = $this->classify($item->getName());
+        if (in_array(strtolower($name), $this->reservedWords)) {
+            $name .= 'Xsd';
+        }
+        return $name;
     }
 
     public function getPropertyName($item)
@@ -32,4 +49,4 @@ private function classify($name)
     {
         return Inflector::classify(str_replace(".", " ", $name));
     }
-}
+}
diff --git a/src/Naming/ShortNamingStrategy.php b/src/Naming/ShortNamingStrategy.php
@@ -7,6 +7,19 @@
 
 class ShortNamingStrategy implements NamingStrategy
 {
+    protected $reservedWords = [
+        'int',
+        'float',
+        'bool',
+        'string',
+        'true',
+        'false',
+        'null',
+        'resource',
+        'object',
+        'mixed',
+        'numeric',
+    ];
 
     public function getTypeName(Type $type)
     {
@@ -29,11 +42,15 @@ public function getPropertyName($item)
 
     public function getItemName(Item $item)
     {
-        return $this->classify($item->getName());
+        $name = $this->classify($item->getName());
+        if (in_array(strtolower($name), $this->reservedWords)) {
+            $name .= 'Xsd';
+        }
+        return $name;
     }
 
     private function classify($name)
     {
         return Inflector::classify(str_replace(".", " ", $name));
     }
-}
+}
diff --git a/src/PathGenerator/Psr4PathGenerator.php b/src/PathGenerator/Psr4PathGenerator.php
@@ -17,10 +17,7 @@ public function setTargets($namespaces)
 
         foreach ($this->namespaces as $namespace => $dir) {
             if (!is_dir($dir)) {
-                throw new PathGeneratorException("The folder '$dir' does not exist.");
-            }
-            if (!is_writable($dir)) {
-                throw new PathGeneratorException("The folder '$dir' is not writable.");
+                mkdir($dir, 0777, true);
             }
         }
     }