Merge pull request #14 from goetas-webservices/impr

minor code improvements

Author: goetas

bin/xsd2php

@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 $paths = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php'
+    __DIR__ . '/../../../autoload.php',
+    __DIR__ . '/../vendor/autoload.php'
 ];
 foreach ($paths as $path) {
     if (is_file($path)) {

src/DependencyInjection/Configuration.php

@@ -13,42 +13,42 @@ public function getConfigTreeBuilder()
 
         $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()
+                ->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;
     }

src/Php/ClassGenerator.php

@@ -345,6 +345,7 @@ private function handleProperty(Generator\ClassGenerator $class, PHPProperty $pr
                     $tag->setTypes($t->getPhpType() . "[]");
                 }
             }
+            $generatedProp->setDefaultValue($type->getArg()->getDefault());
         } elseif ($type) {
 
             if ($type->isNativeType()) {

src/Php/PathGenerator/Psr4PathGenerator.php

@@ -10,7 +10,7 @@ class Psr4PathGenerator extends Psr4PathGeneratorBase implements PathGenerator
     public function getPath(ClassGenerator $php)
     {
         foreach ($this->namespaces as $namespace => $dir) {
-            ;
+
             if (strpos(trim($php->getNamespaceName()) . "\\", $namespace) === 0) {
                 $d = strtr(substr($php->getNamespaceName(), strlen($namespace)), "\\", "/");
                 $dir = rtrim($dir, "/") . "/" . $d;

src/Php/PhpConverter.php

@@ -167,6 +167,15 @@ public function visitElementDef(ElementDef $element, $skip = false)
             if (!$element->getType()->getName()) {
                 $this->visitTypeBase($class, $element->getType());
             } else {
+
+                if ($alias = $this->getTypeAlias($element)) {
+                    $class->setName($alias);
+                    $class->setNamespace(null);
+                    $this->classes[spl_object_hash($element)]["skip"] = true;
+                    $this->skipByType[spl_object_hash($element)] = true;
+                    return $class;
+                }
+
                 $this->handleClassExtension($class, $element->getType());
             }
         }
@@ -425,7 +434,7 @@ private function visitElement(PHPClass $class, Schema $schema, ElementSingle $el
             } elseif ($this->isArrayElement($element)) {
                 $arg = new PHPArg($this->getNamingStrategy()->getPropertyName($element));
                 $arg->setType($this->findPHPClass($class, $element));
-                $arg->setDefault('array()');
+                $arg->setDefault(array());
                 $property->setType(new PHPClassOf($arg));
                 return $property;
             }