Merge upstream changes from fork

.gitignore

@@ -3,4 +3,3 @@ build
 vendor
 .php_cs.cache
 composer.lock
-composer.phar

src/NamedParameter.php

@@ -17,6 +17,10 @@ class NamedParameter implements ArrayInstantiationInterface
     const TYPE_DATE = 'date';
     const TYPE_BOOLEAN = 'boolean';
     const TYPE_FILE = 'file';
+    const TYPE_DATE_ONLY = 'date-only';
+    const TYPE_TIME_ONLY = 'time-only';
+    const TYPE_DATETIME_ONLY = 'datetime-only';
+    const TYPE_DATETIME = 'datetime';
     const TYPE_ARRAY = 'array';
 
     // Validation exception codes
@@ -46,6 +50,10 @@ class NamedParameter implements ArrayInstantiationInterface
         self::TYPE_DATE,
         self::TYPE_BOOLEAN,
         self::TYPE_FILE,
+        self::TYPE_DATETIME_ONLY,
+        self::TYPE_DATE_ONLY,
+        self::TYPE_TIME_ONLY,
+        self::TYPE_DATETIME,
         self::TYPE_ARRAY,
     ];
 
@@ -175,12 +183,19 @@ class NamedParameter implements ArrayInstantiationInterface
      */
     private $default;
 
+    /**
+     * DateTime format (for datetime type only)
+     *
+     * @var string
+     */
+    private $format;
+
     // ---
 
     /**
      * Create a new Query Parameter
      *
-     * @param string  $key
+     * @param string $key
      */
     public function __construct($key)
     {
@@ -207,7 +222,7 @@ public function getKey()
      * [
      *  displayName:        ?string
      *  description:        ?string
-     *  type:               ?["string","number","integer","date","boolean","file"]
+     *  type:               ?["string","number","integer","date","boolean","file", ...]
      *  enum:               ?array
      *  pattern:            ?string
      *  validationPattern:  ?string
@@ -220,6 +235,7 @@ public function getKey()
      *  repeat:             ?boolean
      *  required:           ?boolean
      *  default:            ?string
+     *  format:             ?string
      * ]
      *
      * @throws \Exception
@@ -297,6 +313,10 @@ public static function createFromArray($key, array $data = [])
             }
         }
 
+        if (isset($data['format'])) {
+            $namedParameter->setFormat($data['format']);
+        }
+
         return $namedParameter;
     }
 
@@ -618,6 +638,22 @@ public function getDefault()
         return $this->default;
     }
 
+    /**
+     * @return string
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+
+    /**
+     * @param string $format
+     */
+    public function setFormat($format)
+    {
+        $this->format = $format;
+    }
+
     /**
      * Set the default
      *
@@ -705,6 +741,7 @@ public function validate($param)
                 }
 
                 // no break
+
             case static::TYPE_STRING:
 
                 // Must be a string
@@ -794,6 +831,24 @@ public function validate($param)
             case static::TYPE_FILE:
                 // File type cannot be reliably validated based on its type alone.
 
+                break;
+
+            case static::TYPE_TIME_ONLY:
+            case static::TYPE_DATE_ONLY:
+            case static::TYPE_DATETIME_ONLY:
+            case static::TYPE_DATETIME:
+                $typeObject = ApiDefinition::determineType(
+                    $this->key,
+                    [
+                        'type' => $this->getType(),
+                        'format' => $this->getFormat(),
+                    ]
+                );
+                $typeObject->validate($param);
+                if (!$typeObject->isValid()) {
+                    throw new ValidationException($typeObject->getErrors()[0]);
+                }
+
                 break;
         }
 

src/Parser.php

@@ -504,7 +504,19 @@ private function addNamespacePrefix($nameSpace, array $definition)
                     }
                 } else {
                     if (!in_array($item, ApiDefinition::getStraightForwardTypes(), true)) {
-                        $definition[$key] = $nameSpace . '.' . $item;
+                        if (mb_strpos($item, '|') !== false) {
+                            $definition[$key] = implode(
+                                '|',
+                                array_map(
+                                    function ($v) use ($nameSpace) {
+                                        return $nameSpace . '.' . trim($v);
+                                    },
+                                    explode('|', $item)
+                                )
+                            );
+                        } else {
+                            $definition[$key] = $nameSpace . '.' . $item;
+                        }
                     }
                 }
             } elseif (is_array($definition[$key])) {
@@ -518,7 +530,7 @@ private function addNamespacePrefix($nameSpace, array $definition)
     /**
      * Parse the traits
      *
-     * @param mixed $ramlData
+     * @param array $ramlData
      *
      * @return array
      */

src/Types/ArrayType.php

@@ -2,6 +2,7 @@
 
 namespace Raml\Types;
 
+use Raml\ApiDefinition;
 use Raml\Type;
 use Raml\TypeCollection;
 use Raml\TypeInterface;
@@ -21,6 +22,9 @@ class ArrayType extends Type
         'string',
         'boolean',
         'number',
+        'datetime-only',
+        'date-only',
+        'time-only',
     ];
 
     /**
@@ -175,48 +179,16 @@ public function validate($value)
 
     private function validateScalars($value)
     {
-        foreach ($value as $valueItem) {
-            switch ($this->items) {
-                case 'integer':
-                    if (!is_int($valueItem)) {
-                        $this->errors[] = TypeValidationError::unexpectedArrayValueType(
-                            $this->getName(),
-                            'integer',
-                            $valueItem
-                        );
-                    }
+        $typeObject = ApiDefinition::determineType('item', ['type' => $this->items]);
 
-                    break;
-                case 'string':
-                    if (!is_string($valueItem)) {
-                        $this->errors[] = TypeValidationError::unexpectedArrayValueType(
-                            $this->getName(),
-                            'string',
-                            $valueItem
-                        );
-                    }
-
-                    break;
-                case 'boolean':
-                    if (!is_bool($valueItem)) {
-                        $this->errors[] = TypeValidationError::unexpectedArrayValueType(
-                            $this->getName(),
-                            'boolean',
-                            $valueItem
-                        );
-                    }
-
-                    break;
-                case 'number':
-                    if (!is_float($valueItem) && !is_int($valueItem)) {
-                        $this->errors[] = TypeValidationError::unexpectedArrayValueType(
-                            $this->getName(),
-                            'number',
-                            $valueItem
-                        );
-                    }
-
-                    break;
+        foreach ($value as $valueItem) {
+            $typeObject->validate($valueItem);
+            if (!$typeObject->isValid()) {
+                $this->errors[] = TypeValidationError::unexpectedArrayValueType(
+                    $this->getName(),
+                    $this->items,
+                    $valueItem
+                );
             }
         }
     }

src/Types/DatetimeOnlyType.php

@@ -15,8 +15,8 @@ class DatetimeOnlyType extends Type
     /**
     * Create a new DateTimeOnlyType from an array of data
     *
-    * @param string    $name
-    * @param array     $data
+    * @param string $name
+    * @param array $data
     *
     * @return self
     */

src/Types/DatetimeType.php

@@ -10,6 +10,7 @@
  */
 class DatetimeType extends Type
 {
+    const DEFAULT_FORMAT = DATE_RFC3339;
     /**
      * DateTime format to use
      *
@@ -20,8 +21,8 @@ class DatetimeType extends Type
     /**
      * Create a new DatetimeType from an array of data
      *
-     * @param string    $name
-     * @param array     $data
+     * @param string $name
+     * @param array $data
      *
      * @return DatetimeType
      */
@@ -70,11 +71,15 @@ public function validate($value)
     {
         parent::validate($value);
 
-        $format = $this->format ?: DATE_RFC3339;
+        $format = $this->format ?: self::DEFAULT_FORMAT;
         $d = DateTime::createFromFormat($format, $value);
 
-        if ($d && $d->format($format) !== $value) {
-            $this->errors[] = TypeValidationError::unexpectedValueType($this->getName(), 'datetime', $value);
+        if (!$d || $d->format($format) !== $value) {
+            $this->errors[] = TypeValidationError::unexpectedValueType(
+                $this->getName(),
+                'datetime with format ' . $this->format,
+                $value
+            );
         }
     }
 }

src/Types/TimeOnlyType.php

@@ -34,8 +34,8 @@ public function validate($value)
 
         $d = DateTime::createFromFormat(self::FORMAT, $value);
 
-        if ($d && $d->format(self::FORMAT) !== $value) {
-            $this->errors[] = TypeValidationError::unexpectedValueType($this->getName(), self::FORMAT, $value);
+        if (!$d || $d->format(self::FORMAT) !== $value) {
+            $this->errors[] = TypeValidationError::unexpectedValueType($this->getName(), 'time-only', $value);
         }
     }
 }