Merge pull request #121 from martin-georgiev/master

Back-port changes from eLama's fork (RAML 1.0 support)

LICENCE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Alec Sammon
+Copyright (c) 2014 Alec Sammon, 2016 eLama Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,5 +1,27 @@
 # PHP RAML Parser
 
+## **!!Attention!!** this is a work-in-progress of the RAML 1.0 specification, for RAML 0.8 see the [master branch](https://github.com/alecsammon/php-raml-parser/tree/master)
+
+### What is done and should work
+  - Part of RAML 1.0 [type expressions](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#type-expressions)
+  - Enums
+  - Union type expression (the "or" `|` operator)
+  - Array of types
+  - `discriminator` and `discriminatorValue` facets
+
+### Still TODO:
+- [Libraries](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#libraries)
+- [User defined facets](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#user-defined-facets)
+- Full implementation of [type expressions](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#type-expressions)
+	- The shorthand array and the union type have been implemented
+	- Bi-dimensional array and the array-union combination have **NOT** been implemented yet.
+- [Multiple inheritance](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#multiple-inheritance)
+- [Annotations](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#annotations)
+- [Overlays and Extensions](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#overlays-and-extensions)
+- [Improved Security Schemes](https://github.com/raml-org/raml-spec/blob/master/versions/raml-10/raml-10.md/#security-schemes)
+
+## Original documentation
+
 Parses a RAML file into a PHP object.
 
 [![Build Status](https://travis-ci.org/alecsammon/php-raml-parser.svg?branch=master)](https://travis-ci.org/alecsammon/php-raml-parser)
@@ -13,7 +35,7 @@ Requires:
 - composer (see [https://getcomposer.org](https://getcomposer.org))
 
 ```bash
-composer require alecsammon/php-raml-parser --dev
+composer require alecsammon/php-raml-parser
 ```
 
 ```php

composer.json

@@ -8,7 +8,13 @@
   "authors": [
     {
       "name": "Alec Sammon",
-      "email": "alec.sammon@googlemail.com"
+      "email": "alec.sammon@googlemail.com",
+      "role": "Developer"
+    },
+    {
+      "name": "eLama Team",
+      "email": "dev@elama.ru",
+      "role": "Developer"
     }
   ],
 
@@ -19,17 +25,18 @@
   },
 
   "require-dev": {
-    "satooshi/php-coveralls": "~0.6",
+    "satooshi/php-coveralls": "~2.0",
     "phpunit/phpunit": "4.*",
     "squizlabs/php_codesniffer": "@dev"
   },
 
   "require": {
     "php": ">=5.5.9",
-    "justinrainbow/json-schema": "~1.5",
+    "justinrainbow/json-schema": "~5.0",
     "symfony/yaml": "~3.0|~4.0",
     "symfony/routing": "~3.0|~4.0",
     "oodle/inflect": "~0.2",
-    "psr/http-message": "^1.0"
+    "psr/http-message": "^1.0",
+    "willdurand/negotiation": "^2.2.1"
   }
 }

phpunit.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     colors="true"
-    convertErrorsToExceptions="false"
+    convertErrorsToExceptions="true"
     convertNoticesToExceptions="false"
-    convertWarningsToExceptions="false"
+    convertWarningsToExceptions="true"
     stopOnFailure="false"
     bootstrap="vendor/autoload.php"
     verbose="true"