Merge pull request #150 from goetas-webservices/valid-types

Valid types
goetas-webservices · Sep 14, 2022 · df731b2 · df731b2
2 parents b76f9ae + 19637aa
commit df731b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/DependencyInjection/Xsd2PhpExtension.php b/src/DependencyInjection/Xsd2PhpExtension.php
@@ -64,7 +64,7 @@ protected static function sanitizePhp($ns)
         return strtr($ns, '/', '\\');
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'xsd2php';
     }

diff --git a/src/Jms/YamlConverter.php b/src/Jms/YamlConverter.php
@@ -480,7 +480,7 @@ protected function getElementNamespace(Schema $schema, ElementItem $element)
      * @param Element  $element
      * @param bool     $arrayize
      *
-     * @return \GoetasWebservices\Xsd\XsdToPhp\Php\Structure\PHPProperty
+     * @return array
      */
     protected function &visitElement(&$class, Schema $schema, ElementItem $element, $arrayize = true)
     {

diff --git a/src/Jms/YamlValidatorConverter.php b/src/Jms/YamlValidatorConverter.php
@@ -77,12 +77,19 @@ private function loadValidatorType(array &$property, Type $type, $arrayized = fa
         $rules = [];
 
         if (($restrictions = $type->getRestriction()) && $checks = $restrictions->getChecks()) {
+            $propertyType = isset($property['type']) ? $property['type'] : null;
             foreach ($checks as $key => $check) {
                 switch ($key) {
                     case 'enumeration':
                         $rules[] = [
                             'Choice' => [
-                                'choices' => array_map(function ($enum) {
+                                'choices' => array_map(function ($enum) use ($propertyType) {
+                                    if ($propertyType === 'int') {
+                                        return (int)$enum['value'];
+                                    }
+                                    if ($propertyType === 'float') {
+                                        return (float)$enum['value'];
+                                    }
                                     return $enum['value'];
                                 }, $check),
                             ],
@@ -250,7 +257,7 @@ private function loadValidatorElement(array &$property, ElementItem $element)
      * from a schema attribute including required rule.
      *
      * @param AttributeItem $element
-     * @param bool          $arrayize
+     * @param bool $arrayize
      */
     private function loadValidatorAttribute(array &$property, AttributeItem $attribute)
     {
@@ -273,8 +280,8 @@ private function loadValidatorAttribute(array &$property, AttributeItem $attribu
      * Override necessary to improve method to load validations from schema type.
      *
      * @param PHPClass $class
-     * @param array    $data
-     * @param string   $name
+     * @param array $data
+     * @param string $name
      */
     protected function visitSimpleType(&$class, &$data, SimpleType $type, $name)
     {
@@ -295,7 +302,7 @@ protected function visitSimpleType(&$class, &$data, SimpleType $type, $name)
      * Override necessary to improve method to load validations from schema element.
      *
      * @param PHPClass $class
-     * @param bool     $arrayize
+     * @param bool $arrayize
      *
      * @return PHPProperty
      */
@@ -328,8 +335,8 @@ protected function &visitAttribute(&$class, Schema $schema, AttributeItem $attri
      * Responsible for handler all properties from extension types.
      *
      * @param PHPClass $class
-     * @param array    $data
-     * @param string   $parentName
+     * @param array $data
+     * @param string $parentName
      */
     protected function &handleClassExtension(&$class, &$data, Type $type, $parentName)
     {