Merge branch 'develop'

.travis.yml

@@ -1,10 +1,23 @@
 language: php
+sudo: false
 
 php:
   - 5.5
+  - 5.6
+  - 7.0
+
+matrix:
+    include:
+        - php: 5.5
+          env: dependencies=lowest
 
 before_script:
-    - composer self-update
-    - composer install --dev
+  - composer install --no-interaction -o
+  - if [ "$dependencies" = "lowest" ]; then composer update -o --prefer-lowest; fi;
+
+script:
+  - mkdir -p build/logs
+  - bin/phpunit
 
-script: phpunit
+after_script:
+  - bin/coveralls -v

LICENSE

@@ -1,20 +1,22 @@
-Copyright (c) 2014, Sierra Bravo Corp., dba The Nerdery
+The MIT License (MIT)
 
-All rights reserved.
+Copyright (c) 2016 epfremmer
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-    - Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
-    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
-      following disclaimer in the documentation and/or other materials provided with the distribution.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THIS SOFTWARE IS PROVIDED BY THE NERDERY AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE NERDERY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+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.
 

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "epfremme/swagger-php",
-  "license": "Nerdery",
+  "license": "MIT",
   "type": "package",
   "description": "Library for parsing swagger documentation into PHP entities for use in testing and code generation",
   "authors" : [
@@ -11,18 +11,28 @@
   ],
   "autoload": {
     "psr-4": {
-      "Nerdery\\Swagger\\": "src/",
-      "Nerdery\\Swagger\\Tests\\": "tests/"
+      "Epfremme\\Swagger\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Epfremme\\Swagger\\Tests\\": "tests/"
     }
   },
   "require": {
     "php": ">=5.5",
     "jms/serializer": "^1.1",
     "doctrine/collections": "^1.3",
-    "symfony/validator": "^2.4|^3.0"
+    "doctrine/annotations": "^1.2",
+    "symfony/yaml": "^2.7|^3.1",
+    "phpoption/phpoption": "^1.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.1",
-    "mockery/mockery": "^0.9.4"
+    "phpunit/phpunit": "~4.8|~5.0",
+    "mockery/mockery": "^0.9.4",
+    "satooshi/php-coveralls": "^1.0"
+  },
+  "config": {
+    "bin-dir": "bin"
   }
 }