Merge branch 'master' into master

.scrutinizer.yml

@@ -29,4 +29,7 @@ build:
  php: 7.1
  php72:
  environment:
- php: 7.2
+ php: 7.2
+ php73:
+ environment:
+ php: 7.3

.styleci.yml

@@ -2,4 +2,4 @@ preset: psr2
 
 finder:
  exclude:
- - "tests"
+ - "tests"

.travis.yml

@@ -1,12 +1,15 @@
 language: php
 
+dist: trusty
+
 php:
  - '5.4'
  - '5.5'
  - '5.6'
  - '7.0'
  - '7.1'
  - '7.2'
+ - '7.3'
 
 install:
  - composer require satooshi/php-coveralls:~1.0@stable

CHANGELOG.md

@@ -2,9 +2,16 @@
 * Added support for Ticketing Price Scheme option in ``Fare_MasterPricerTravelBoardSearch`` (https://github.com/amabnl/amadeus-ws-client/pull/193) - Artem Zakharchenko
 * Added support for cabin options on itinerary-level in ``Fare_MasterPricerTravelBoardSearch`` (https://github.com/amabnl/amadeus-ws-client/pull/202) - Michal Hernas
 * Added support for OptionDetails when proving pricing options overrides in ``Fare_PricePNRWithBookingClass`` (v13+) and associated messages (https://github.com/amabnl/amadeus-ws-client/pull/217) - LeoTravel
+* Added support for providing a Company and date in combination with a Record Locator in ``Air_RetrieveSeatMap`` (https://github.com/amabnl/amadeus-ws-client/issues/219)
+* Added support for requesting Most Restrictive display ``Air_RetrieveSeatMap``
+* Fixed a bug with a double authentication when using ``Security_Authenticate`` on a SoapHeader 4 WSAP (https://github.com/amabnl/amadeus-ws-client/pull/234) - Artem Zakharchenko
 * Implemented ``Ticket_RetrieveListOfTSM`` (https://github.com/amabnl/amadeus-ws-client/pull/194) - Michal Hernas
 * Implemented ``Ticket_CreateTASF`` (https://github.com/amabnl/amadeus-ws-client/pull/197) - Artem Zakharchenko
 * Implemented ``PNR_Ignore`` (https://github.com/amabnl/amadeus-ws-client/pull/198) - Michael Mueller
+* Implemented ``SalesReports_DisplayDailyOrSummarizedReport`` and ``SalesReports_DisplayNetRemitReport`` (https://github.com/amabnl/amadeus-ws-client/pull/241) - Artem Zakharchenko
+
+# Release 1.7.1 (23 September 2018)
+* Fixed a bug with wrong date format in dateOfBirth for ``PNR_AddMultiElements`` (https://github.com/amabnl/amadeus-ws-client/pull/231) - Artem Zakharchenko
 
 # Release 1.7.0 (30 April 2018)
 * Implemented support for ``TransactionFlowLink`` SOAP header (https://github.com/amabnl/amadeus-ws-client/issues/146)

README.md

@@ -53,7 +53,7 @@ Once the client is installed, read the [About & Get Started](docs/about-get-
 
 # Release history
 
-The current release is version 1.7.0. 
+The current release is version 1.7.1. 
 
 See the [Changelog](CHANGELOG.md).
 

docs/how-to.rst

@@ -56,7 +56,7 @@ After doing multiple calls with a stateful session, there are two ways to end th
 
 .. code-block:: php
 
- $client->signOut(); //Terminates an active stateful session. There is no active session with stateless messages.
+ $client->securitySignOut(); //Terminates an active stateful session. There is no active session with stateless messages.
 
 - set an 'endSession' message option on the last call you want to make:
 

docs/list-of-supported-messages.rst

@@ -20,6 +20,7 @@ This is the list of messages that are at least partially supported at this time:
 - Queue_RemoveItem
 - Queue_MoveItem
 - Fare_MasterPricerTravelBoardSearch
+- Fare_MasterPricerExpertSearch
 - Fare_MasterPricerCalendar
 - Fare_PricePNRWithBookingClass
 - Fare_PricePNRWithLowerFares
@@ -79,6 +80,8 @@ This is the list of messages that are at least partially supported at this time:
 - Command_Cryptic
 - PriceXplorer_ExtremeSearch
 - SalesReports_DisplayQueryReport
+- SalesReports_DisplayDailyOrSummarizedReport
+- SalesReports_DisplayNetRemitReport
 
 **********
 To-do list

docs/samples.rst

@@ -695,11 +695,54 @@ Move a PNR from one queue to another:
 ****
 Fare
 ****
+
+----------------------------------
+Fare_MasterPricerExpertSearch
+----------------------------------
+
+The Expert Search is nearly identical to the Travelboard search, except it focus on business flights.
+
+It supports all features of the Travelboard Search, but not the options "noAirportChange" and "maxElapsedFlyingTime"
+
+Make a simple Masterpricer Expert availability & fare search:
+
+.. code-block:: php
+
+ use Amadeus\Client\RequestOptions\FareMasterPricerExSearch;
+ use Amadeus\Client\RequestOptions\Fare\MPPassenger;
+ use Amadeus\Client\RequestOptions\Fare\MPItinerary;
+ use Amadeus\Client\RequestOptions\Fare\MPDate;
+ use Amadeus\Client\RequestOptions\Fare\MPLocation;
+
+ $opt = new FareMasterPricerExSearch([
+ 'nrOfRequestedResults' => 200,
+ 'nrOfRequestedPassengers' => 1,
+ 'passengers' => [
+ new MPPassenger([
+ 'type' => MPPassenger::TYPE_ADULT,
+ 'count' => 1
+ ])
+ ],
+ 'itinerary' => [
+ new MPItinerary([
+ 'departureLocation' => new MPLocation(['city' => 'BRU']),
+ 'arrivalLocation' => new MPLocation(['city' => 'LON']),
+ 'date' => new MPDate([
+ 'dateTime' => new \DateTime('2017-01-15T00:00:00+0000', new \DateTimeZone('UTC'))
+ ])
+ ])
+ ]
+ ]);
+
+ $recommendations = $client->fareMasterPricerExpertSearch($opt);
+
+Since the Expert Search is nearly similar to the Travelboard Search, check out the Travelboard Search examples too
+
 ----------------------------------
 Fare_MasterPricerTravelboardSearch
 ----------------------------------
 
-Make a simple Masterpricer availability & fare search:
+Make a simple Masterpricer Travelboard availability & fare search:
 
 .. code-block:: php
 
@@ -1536,6 +1579,33 @@ Complex example: Seat Map with Prices
  ])
  );
 
+Most restrictive Seat Map request:
+
+- Multiple passenger context
+- Requesting the most restrictive seat map display
+
+.. code-block:: php
+
+ use Amadeus\Client\RequestOptions\AirRetrieveSeatMapOptions;
+ use Amadeus\Client\RequestOptions\Air\RetrieveSeatMap\FlightInfo;
+
+ $seatmapInfo = $client->airRetrieveSeatMap(
+ new AirRetrieveSeatMapOptions([
+ 'flight' => new FlightInfo([
+ 'departureDate' => \DateTime::createFromFormat('Ymd', '20150615'),
+ 'departure' => 'CDG',
+ 'arrival' => 'YUL',
+ 'airline' => 'AF',
+ 'flightNumber' => '0346',
+ 'bookingClass' => 'Y'
+ ]),
+ 'recordLocator' => '7BFHEJ',
+ 'company' => '1A',
+ 'date' => \DateTime::createFromFormat('Ymd', '20150610'),
+ 'mostRestrictive' => true
+ ])
+ );
+
 --------------------
 Air_RebookAirSegment
 --------------------
@@ -3689,9 +3759,13 @@ Request a basic Extreme Search result:
 
  $extremeSearchResult = $client->priceXplorerExtremeSearch($opt);
 
-*******************************
+************
+SalesReports
+************
+
+-------------------------------
 SalesReports_DisplayQueryReport
-*******************************
+-------------------------------
 
 Request a sales report from a certain date to another date, issued in all offices sharing the same IATA number;
 
@@ -3711,4 +3785,39 @@ Request a sales report from a certain date to another date, issued in all office
 
  $salesReportResult = $client->salesReportsDisplayQueryReport($opt);
 
+-------------------------------------------
+SalesReports_DisplayDailyOrSummarizedReport
+-------------------------------------------
+
+SalesReports_DisplayDailyOrSummarizedReport request options are exact the same as for SalesReports_DisplayQueryReport except
+this have SalesReportIdentification options and request doesn't have scrolling options.
+
+.. code-block:: php
+
+ use Amadeus\Client\RequestOptions\SalesReportsDisplayDailyOrSummarizedReportRequestOptions;
+
+ $opt = new SalesReportsDisplayDailyOrSummarizedReportRequestOptions([
+ 'salesReportIdentificationNumber' => 197,
+ 'salesReportIdentificationType' => SalesReportsDisplayDailyOrSummarizedReportOptions::SALES_REPORT_IDENTIFICATION_TYPE_NUMBER
+ ]);
+
+ $salesReportResult = $client->salesReportsDisplayQueryReport($opt);
+
+----------------------------------
+SalesReports_DisplayNetRemitReport
+----------------------------------
+
+SalesReports_DisplayNetRemitReport request options are exactly the same as for SalesReports_DisplayQueryReport except
+that 'salesIndicator' option here named as 'documentInfo' and request doesn't have scrolling options:
+
+.. code-block:: php
+
+ use Amadeus\Client\RequestOptions\SalesReportsDisplayNetRemitReportOptions;
+
+ $opt = new SalesReportsDisplayNetRemitReportOptions([
+ 'documentInfo' => SalesReportsDisplayNetRemitReportOptions::SALESIND_DOMESTIC
+ ]);
+
+ $salesReportResult = $client->salesReportsDisplayQueryReport($opt);
+