Merge branch 'develop'

Conflicts:
	README.md
	composer.json
	composer.lock
	src/Amadeus/Client/Struct/Pnr/Cancel.php
	tests/Amadeus/Client/Struct/Pnr/CancelTest.php

.scrutinizer.yml

@@ -1,14 +1,13 @@
 filter:
     excluded_paths:
-        - tests/*
+          - tests/*
 checks:
     php: true
 coding_style:
-  php:
-      indentation:
-          general:
-              size: 1
-build: true
-  environment:
-      php:
-          version: 5.6
+    php:
+        indentation:
+            general:
+                size: 1
+build: 
+    environment:
+        php: 5.6

.styleci.yml

@@ -0,0 +1,5 @@
+preset: psr2
+
+finder:
+  exclude:
+    - "tests"

CHANGELOG.md

@@ -0,0 +1,46 @@
+# 2016-09
+
+* Implemented SalesReports_DisplayQueryReport
+* Implemented Air_MultiAvailability
+* Added support for multiple WSDL's (interfaces) in a WSAP (https://github.com/amabnl/amadeus-ws-client/issues/5)
+* PSR-2 code style enforced via StyleCI
+
+# 2016-08
+
+* Implemented PNR_DisplayHistory
+* Implemented Fare_InformativePricingWithoutPNR (https://github.com/amabnl/amadeus-ws-client/issues/13)
+
+# 2016-07
+
+* Implemented Air_RetrieveSeatMap
+
+# 2016-06
+
+* Implemented Fare_PricePNRWithBookingClass version 13 and up (https://github.com/amabnl/amadeus-ws-client/issues/6)
+* Implemented DocIssuance_IssueTicket (https://github.com/amabnl/amadeus-ws-client/issues/7)
+* Implemented Info_EncodeDecodeCity
+* Implemented Offer_ConfirmCarOffer
+* Implemented checking for response errors for all supported messages _except Command_Cryptic_. For Command_Cryptic, you need to parse the response yourself to check for errors.
+* Removed the 'asString' request option - the `Amadeus\Client\Result` object now always contains the result XML in the `responseXml` property.
+
+# 2016-05
+
+Completely re-worked the Result being returned by Web Service calls: the XML or PHP object is now encapsulated in an `Amadeus\Client\Result` object which makes checking for errors or warnings much easier. 
+
+The library now always returns both the PHP object generated by `\SoapClient` as well as the result string. 
+
+The Result object also has a `status` property which contains the status of the message performed: FATAL, OK, WARN or INFO. 
+
+The library will now also convert `\SoapFault` exceptions to a FATAL result status. 
+
+(https://github.com/amabnl/amadeus-ws-client/issues/2)
+
+# 2016-04
+
+* Added support for providing custom `\SoapClient` options (https://github.com/amabnl/amadeus-ws-client/issues/4)
+* Implemented Amadeus SoapHeader 2 support (https://github.com/amabnl/amadeus-ws-client/issues/3)
+* Changed all references 'tatoo' to 'tattoo' for consistency (https://github.com/amabnl/amadeus-ws-client/issues/1)
+
+# UNSTABLE
+
+The library's API will be unstable until we release version 0.1.

README.md

@@ -1,6 +1,6 @@
 # amadeus-ws-client: PHP client for the Amadeus GDS SOAP Web Service interface
 
-[![Build Status](https://travis-ci.org/amabnl/amadeus-ws-client.svg?branch=master)](https://travis-ci.org/amabnl/amadeus-ws-client) [![Coverage Status](https://coveralls.io/repos/github/amabnl/amadeus-ws-client/badge.svg?branch=master)](https://coveralls.io/github/amabnl/amadeus-ws-client?branch=master)
+[![Build Status](https://travis-ci.org/amabnl/amadeus-ws-client.svg?branch=master)](https://travis-ci.org/amabnl/amadeus-ws-client) [![Coverage Status](https://coveralls.io/repos/github/amabnl/amadeus-ws-client/badge.svg?branch=master)](https://coveralls.io/github/amabnl/amadeus-ws-client?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/amabnl/amadeus-ws-client/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/amabnl/amadeus-ws-client/?branch=master) [![Style Status - PSR-2](https://styleci.io/repos/49078536/shield?branch=master)](https://styleci.io/repos/49078536)
 
 This client library provides access to the Amadeus GDS SOAP Web Service interface. 
 
@@ -14,7 +14,7 @@ The Amadeus documentation portal can be found at https://webservices.amadeus.com
 
 * PHP 5.4+
 * SOAP and XSL extensions activated
-* A WSDL & authentication details from Amadeus
+* A WSDL & authentication details from Amadeus _(SoapHeader 4 or SoapHeader 2)_
 
 # Installation
 
@@ -46,5 +46,13 @@ For now, if you want the bleeding edge, point your composer.json towards `dev-de
 
 # Usage
 
-- [About & Get Started](docs/about-get-started.rst)
+- [About & Get Started](docs/about-get-started.rst)
+- [List of supported messages](docs/list-of-supported-messages.rst)
+- [How to](docs/how-to.rst)
 - [Examples](docs/samples.rst)
+
+---------------------------------------
+
+[Changelog](CHANGELOG.md)
+
+[Example applications](docs/sample-applications.rst)

composer.json

@@ -2,7 +2,7 @@
   "name": "amabnl/amadeus-ws-client",
   "type": "library",
   "description": "SOAP Web Service client library for interacting with the Amadeus GDS through its SOAP interface",
-  "keywords": ["amadeus", "gds", "service", "webservice", "soap", "wsdl", "client", "xml", "travel", "airline", "hotel", "booking", "car", "rental"],
+  "keywords": ["amadeus", "gds", "service", "webservice", "soap", "wsdl", "client", "xml", "travel", "airline", "hotel", "booking", "car", "rental", "offer", "masterpricer"],
   "minimum-stability": "stable",
   "homepage": "https://github.com/amabnl/amadeus-ws-client",
   "license": "Apache-2.0",
@@ -17,11 +17,13 @@
   "require": {
     "php": ">=5.4.11",
     "ext-soap": "*",
+    "ext-dom": "*",
     "ext-xsl": "*",
     "psr/log": "1.0.0"
   },
   "require-dev": {
     "symfony/yaml": "2.8",
+    "phpdocumentor/reflection-docblock": "2.0.*",
     "phpunit/phpunit": "4.8.*"
   },
   "autoload": {