From 2d0ed2ddae3eb9f200f633c8881cdbb228c5d931 Mon Sep 17 00:00:00 2001 From: Dieter Devlieghere Date: Mon, 25 Apr 2016 21:13:22 +0200 Subject: [PATCH] Replace 'tatoo' by 'tattoo' --- docs/samples.rst | 10 +-- docs/samples/pnr-create-modify.rst | 6 +- .../Fare/PricePnrBcFareBasis.php | 2 +- .../RequestOptions/Offer/PassengerDef.php | 2 +- .../RequestOptions/OfferConfirmAirOptions.php | 2 +- .../Client/RequestOptions/Pnr/Reference.php | 12 ++-- .../RequestOptions/PnrCancelOptions.php | 4 +- .../Client/Struct/Offer/ConfirmAir.php | 8 +-- .../Offer/{OfferTatoo.php => OfferTattoo.php} | 4 +- .../Struct/Offer/PassengerReference.php | 6 +- .../Client/Struct/Offer/PaxReference.php | 2 +- src/Amadeus/Client/Struct/Offer/Reference.php | 4 +- src/Amadeus/Client/Struct/Offer/Verify.php | 6 +- .../Client/Struct/Pnr/AddMultiElements.php | 64 +++++++++---------- .../AddMultiElements/DataElementsIndiv.php | 8 +-- .../ElementManagementData.php | 8 +-- .../ElementManagementItinerary.php | 6 +- .../Pnr/AddMultiElements/ItineraryInfo.php | 6 +- .../Struct/Pnr/AddMultiElements/Reference.php | 8 +-- src/Amadeus/Client/Struct/Pnr/Cancel.php | 12 ++-- .../Client/Struct/Pnr/Cancel/Element.php | 18 +++--- .../Client/RequestCreator/BaseTest.php | 10 +-- .../Struct/Offer/ConfirmAirOfferTest.php | 10 +-- .../Struct/Pnr/AddMultiElementsTest.php | 6 +- .../Amadeus/Client/Struct/Pnr/CancelTest.php | 18 +++--- tests/Amadeus/ClientTest.php | 16 +++-- 26 files changed, 129 insertions(+), 129 deletions(-) rename src/Amadeus/Client/Struct/Offer/{OfferTatoo.php => OfferTattoo.php} (97%) diff --git a/docs/samples.rst b/docs/samples.rst index cac15d1fc..642163cdf 100644 --- a/docs/samples.rst +++ b/docs/samples.rst @@ -235,7 +235,7 @@ Cancel the entire itinerary of the PNR in context and do an end transact to save ); -Cancel a PNR element with tatoo number 15 and do an End and Retrieve (ER) to receive the resulting PNR_Reply: +Cancel a PNR element with tattoo number 15 and do an End and Retrieve (ER) to receive the resulting PNR_Reply: .. code-block:: php @@ -243,7 +243,7 @@ Cancel a PNR element with tatoo number 15 and do an End and Retrieve (ER) to rec $cancelReply = $client->pnrCancel( new PnrCancelOptions([ - 'elementsByTatoo' => [15], + 'elementsByTattoo' => [15], 'actionCode' => PnrCancelOptions::ACTION_END_TRANSACT_RETRIEVE ]) ); @@ -257,7 +257,7 @@ Same as before, but this time without having a PNR in context (you must provide $cancelReply = $client->pnrCancel( new PnrCancelOptions([ 'recordLocator' => 'ABC123, - 'elementsByTatoo' => [15], + 'elementsByTattoo' => [15], 'actionCode' => PnrCancelOptions::ACTION_END_TRANSACT_RETRIEVE ]) ); @@ -600,7 +600,7 @@ Verify if an offer is still valid: --------------------- Offer_ConfirmAirOffer --------------------- -Confirm a given AIR offer by providing office reference / tatoo: +Confirm a given AIR offer by providing office reference / tattoo: .. code-block:: php @@ -608,7 +608,7 @@ Confirm a given AIR offer by providing office reference / tatoo: $response = $client->offerConfirmAir( new OfferConfirmAirOptions([ - 'tatooNumber' => 1 + 'tattooNumber' => 1 ]) ); diff --git a/docs/samples/pnr-create-modify.rst b/docs/samples/pnr-create-modify.rst index 50de4784d..161fe4db8 100644 --- a/docs/samples/pnr-create-modify.rst +++ b/docs/samples/pnr-create-modify.rst @@ -157,7 +157,7 @@ Provide mandatory SR DOCS with APIS information for flights to the US *(must be ], 'references' => [ new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 1 ]) ] @@ -262,7 +262,7 @@ Add a structured billing address element (e.g. ``AB //CY-COMPANY/NA-NAME/A1-LINE 'zipCode' => 'ZIP CODE', 'references' => [ new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 1 ]) ] @@ -289,7 +289,7 @@ Add a manual Frequent Flyer number (e.g. ``SR FQTV SN-SN 111111111/P2``) 'number' => '111111111', 'references' => [ new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 2 ]) ] diff --git a/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php b/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php index f5aa4d64e..12fe685c5 100644 --- a/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php +++ b/src/Amadeus/Client/RequestOptions/Fare/PricePnrBcFareBasis.php @@ -44,7 +44,7 @@ class PricePnrBcFareBasis extends LoadParamsFromArray public $fareBasisCode; /** - * The key is the segment tatoo number, the value is the segment type (self::SEGREFTYPE_*) + * The key is the segment tattoo number, the value is the segment type (self::SEGREFTYPE_*) * * @var array */ diff --git a/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php b/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php index 91a2bb6ce..7c9d40c87 100644 --- a/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php +++ b/src/Amadeus/Client/RequestOptions/Offer/PassengerDef.php @@ -49,5 +49,5 @@ class PassengerDef extends LoadParamsFromArray /** * @var int */ - public $passengerTatoo; + public $passengerTattoo; } \ No newline at end of file diff --git a/src/Amadeus/Client/RequestOptions/OfferConfirmAirOptions.php b/src/Amadeus/Client/RequestOptions/OfferConfirmAirOptions.php index dd44b4b4e..d937a5525 100644 --- a/src/Amadeus/Client/RequestOptions/OfferConfirmAirOptions.php +++ b/src/Amadeus/Client/RequestOptions/OfferConfirmAirOptions.php @@ -33,7 +33,7 @@ class OfferConfirmAirOptions extends Base /** * @var int */ - public $tatooNumber; + public $tattooNumber; /** * @var Offer\PassengerReAssocOptions[] diff --git a/src/Amadeus/Client/RequestOptions/Pnr/Reference.php b/src/Amadeus/Client/RequestOptions/Pnr/Reference.php index 94e20f8a1..5f48b650a 100644 --- a/src/Amadeus/Client/RequestOptions/Pnr/Reference.php +++ b/src/Amadeus/Client/RequestOptions/Pnr/Reference.php @@ -32,11 +32,11 @@ */ class Reference extends LoadParamsFromArray { - const TYPE_PASSENGER_TATOO = "PT"; + const TYPE_PASSENGER_TATTOO = "PT"; const TYPE_PASSENGER_REQUEST = "PR"; - const TYPE_SEGMENT_TATOO = "ST"; + const TYPE_SEGMENT_TATTOO = "ST"; const TYPE_SEGMENT_REQUEST = "SR"; @@ -48,12 +48,12 @@ class Reference extends LoadParamsFromArray * 002 Corporate identification number * D Dominant segment in a marriage * N Non dominant segment in a marriage - * OT Other element tatoo reference number + * OT Other element tattoo reference number * PR Passenger Client-request-message-defined ref. nbr - * PT Passenger tatoo reference number + * PT Passenger tattoo reference number * SR Segment Client-request-message-defined ref. nbr - * SS Segment Tatoo+SubTatoo reference number - * ST Segment Tatoo reference number + * SS Segment Tattoo+SubTattoo reference number + * ST Segment Tattoo reference number * * @var */ diff --git a/src/Amadeus/Client/RequestOptions/PnrCancelOptions.php b/src/Amadeus/Client/RequestOptions/PnrCancelOptions.php index f5976e05b..02016235b 100644 --- a/src/Amadeus/Client/RequestOptions/PnrCancelOptions.php +++ b/src/Amadeus/Client/RequestOptions/PnrCancelOptions.php @@ -67,11 +67,11 @@ class PnrCancelOptions extends PnrBase public $passengers = []; /** - * All elements by Tatoo number to be removed + * All elements by Tattoo number to be removed * * @var int[] */ - public $elementsByTatoo = []; + public $elementsByTattoo = []; /** * Set to true if you want to cancel the entire itinerary of the PNR. diff --git a/src/Amadeus/Client/Struct/Offer/ConfirmAir.php b/src/Amadeus/Client/Struct/Offer/ConfirmAir.php index 9af99c985..ea47066f4 100644 --- a/src/Amadeus/Client/Struct/Offer/ConfirmAir.php +++ b/src/Amadeus/Client/Struct/Offer/ConfirmAir.php @@ -34,11 +34,11 @@ class ConfirmAir extends BaseWsMessage { /** - * Offer tatoo to be confirmed + * Offer tattoo to be confirmed * - * @var OfferTatoo + * @var OfferTattoo */ - public $offerTatoo; + public $offerTattoo; /** * Group for pax reconciliation between Pax PNR and passenger types prices at offer creation time @@ -53,7 +53,7 @@ class ConfirmAir extends BaseWsMessage public function __construct($options = null) { if (!is_null($options)) { - $this->offerTatoo = new OfferTatoo($options->tatooNumber); + $this->offerTattoo = new OfferTattoo($options->tattooNumber); foreach($options->passengerReassociation as $reAssoc) { $this->passengerReassociation[] = new PassengerReassociation( diff --git a/src/Amadeus/Client/Struct/Offer/OfferTatoo.php b/src/Amadeus/Client/Struct/Offer/OfferTattoo.php similarity index 97% rename from src/Amadeus/Client/Struct/Offer/OfferTatoo.php rename to src/Amadeus/Client/Struct/Offer/OfferTattoo.php index e721994f8..67d940539 100644 --- a/src/Amadeus/Client/Struct/Offer/OfferTatoo.php +++ b/src/Amadeus/Client/Struct/Offer/OfferTattoo.php @@ -23,12 +23,12 @@ namespace Amadeus\Client\Struct\Offer; /** - * OfferTatoo + * OfferTattoo * * @package Amadeus\Client\Struct\Offer * @author Dieter Devlieghere */ -class OfferTatoo +class OfferTattoo { /** * AIR Air segment diff --git a/src/Amadeus/Client/Struct/Offer/PassengerReference.php b/src/Amadeus/Client/Struct/Offer/PassengerReference.php index a3caebcce..dca1667aa 100644 --- a/src/Amadeus/Client/Struct/Offer/PassengerReference.php +++ b/src/Amadeus/Client/Struct/Offer/PassengerReference.php @@ -84,12 +84,12 @@ class PassengerReference public $value; /** - * @param int $tatoo + * @param int $tattoo * @param string $type */ - public function __construct($tatoo, $type) + public function __construct($tattoo, $type) { - $this->value = $tatoo; + $this->value = $tattoo; $this->type = $type; } } diff --git a/src/Amadeus/Client/Struct/Offer/PaxReference.php b/src/Amadeus/Client/Struct/Offer/PaxReference.php index 60c95f134..517d22058 100644 --- a/src/Amadeus/Client/Struct/Offer/PaxReference.php +++ b/src/Amadeus/Client/Struct/Offer/PaxReference.php @@ -45,7 +45,7 @@ public function __construct($paxRefs = null) if (!is_null($paxRefs)) { foreach ($paxRefs as $paxRef) { $this->passengerReference[] = new PassengerReference( - $paxRef->passengerTatoo, + $paxRef->passengerTattoo, $paxRef->passengerType ); } diff --git a/src/Amadeus/Client/Struct/Offer/Reference.php b/src/Amadeus/Client/Struct/Offer/Reference.php index 372ff9fb0..72799ab60 100644 --- a/src/Amadeus/Client/Struct/Offer/Reference.php +++ b/src/Amadeus/Client/Struct/Offer/Reference.php @@ -33,12 +33,12 @@ class Reference /** * Offer Other element Tattoo reference number */ - const TYPE_OFFER_TATOO = "OOT"; + const TYPE_OFFER_TATTOO = "OOT"; /** * @var string */ - public $type = self::TYPE_OFFER_TATOO; + public $type = self::TYPE_OFFER_TATTOO; /** * Identification number. diff --git a/src/Amadeus/Client/Struct/Offer/Verify.php b/src/Amadeus/Client/Struct/Offer/Verify.php index 5721245ff..b38279a6d 100644 --- a/src/Amadeus/Client/Struct/Offer/Verify.php +++ b/src/Amadeus/Client/Struct/Offer/Verify.php @@ -33,9 +33,9 @@ class Verify extends BaseWsMessage { /** - * @var OfferTatoo + * @var OfferTattoo */ - public $offerTatoo; + public $offerTattoo; /** * @param string $referenceNr @@ -43,6 +43,6 @@ class Verify extends BaseWsMessage */ public function __construct($referenceNr, $segmentName) { - $this->offerTatoo = new OfferTatoo($referenceNr, $segmentName); + $this->offerTattoo = new OfferTattoo($referenceNr, $segmentName); } } diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php index c7a423afc..684458bae 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements.php @@ -36,7 +36,6 @@ use Amadeus\Client\Struct\Pnr\AddMultiElements\AirAuxItinerary; use Amadeus\Client\Struct\Pnr\AddMultiElements\DataElementsIndiv; use Amadeus\Client\Struct\Pnr\AddMultiElements\DataElementsMaster; -use Amadeus\Client\Struct\Pnr\AddMultiElements\DateAndTimeDetails; use Amadeus\Client\Struct\Pnr\AddMultiElements\DateOfBirth; use Amadeus\Client\Struct\Pnr\AddMultiElements\ElementManagementData; use Amadeus\Client\Struct\Pnr\AddMultiElements\ElementManagementItinerary; @@ -52,7 +51,6 @@ use Amadeus\Client\Struct\Pnr\AddMultiElements\NewFopsDetails; use Amadeus\Client\Struct\Pnr\AddMultiElements\OriginDestinationDetails; use Amadeus\Client\Struct\Pnr\AddMultiElements\Passenger; -use Amadeus\Client\Struct\Pnr\AddMultiElements\PassengerData; use Amadeus\Client\Struct\Pnr\AddMultiElements\Reference; use Amadeus\Client\Struct\Pnr\AddMultiElements\ReferenceForDataElement; use Amadeus\Client\Struct\Pnr\AddMultiElements\ReferenceForSegment; @@ -126,18 +124,18 @@ protected function loadBare(PnrAddMultiElementsOptions $params) $this->reservationInfo = new AddMultiElements\ReservationInfo($params->recordLocator); } - $tatooCounter = 0; + $tattooCounter = 0; $this->addTravellers($params->travellers); if (!empty($params->tripSegments)) { - $this->addSegments($params->tripSegments, $tatooCounter); + $this->addSegments($params->tripSegments, $tattooCounter); } if (!empty($params->elements)) { $this->addElements( $params->elements, - $tatooCounter, + $tattooCounter, $params->receivedFrom ); } elseif (!is_null($params->receivedFrom)) { @@ -145,10 +143,10 @@ protected function loadBare(PnrAddMultiElementsOptions $params) $this->dataElementsMaster = new DataElementsMaster(); } - $tatooCounter++; + $tattooCounter++; $this->dataElementsMaster->dataElementsIndiv[] = $this->createElement( - new ReceivedFrom(['receivedFrom' => $params->receivedFrom]), $tatooCounter + new ReceivedFrom(['receivedFrom' => $params->receivedFrom]), $tattooCounter ); } } @@ -165,7 +163,7 @@ protected function loadCreatePnr(PnrCreatePnrOptions $params) $params->actionCode ); - $tatooCounter = 0; + $tattooCounter = 0; if ($params->travellerGroup !== null) { $this->addTravellerGroup($params->travellerGroup); @@ -173,25 +171,25 @@ protected function loadCreatePnr(PnrCreatePnrOptions $params) $this->addTravellers($params->travellers); } - $this->addSegments($params->tripSegments, $tatooCounter); + $this->addSegments($params->tripSegments, $tattooCounter); $this->addElements( $params->elements, - $tatooCounter, + $tattooCounter, $params->receivedFrom ); } /** * @param Segment[] $segments - * @param int $tatooCounter + * @param int $tattooCounter */ - protected function addSegments($segments, &$tatooCounter) + protected function addSegments($segments, &$tattooCounter) { $tmpOrigDest = new OriginDestinationDetails(); foreach ($segments as $segment) { - $tmpOrigDest->itineraryInfo[] = $this->createSegment($segment, $tatooCounter); + $tmpOrigDest->itineraryInfo[] = $this->createSegment($segment, $tattooCounter); } $this->originDestinationDetails[] = $tmpOrigDest; @@ -199,14 +197,14 @@ protected function addSegments($segments, &$tatooCounter) /** * @param Segment $segment - * @param $tatooCounter + * @param $tattooCounter * @return ItineraryInfo */ - protected function createSegment($segment, &$tatooCounter) + protected function createSegment($segment, &$tattooCounter) { $createdSegment = null; - $tatooCounter++; + $tattooCounter++; $reflect = new \ReflectionClass($segment); $segmentType = $reflect->getShortName(); @@ -214,7 +212,7 @@ protected function createSegment($segment, &$tatooCounter) switch ($segmentType) { case 'Miscellaneous': /** @var Segment\Miscellaneous $segment */ - $createdSegment = new ItineraryInfo($tatooCounter, ElementManagementItinerary::SEGMENT_MISCELLANEOUS); + $createdSegment = new ItineraryInfo($tattooCounter, ElementManagementItinerary::SEGMENT_MISCELLANEOUS); $createdSegment->airAuxItinerary = new AirAuxItinerary($segmentType, $segment); break; case 'Air': @@ -304,10 +302,10 @@ protected function addTravellerGroup($group) /** * @param Element[] $elements - * @param int $tatooCounter (BYREF) + * @param int $tattooCounter (BYREF) * @param string|null $receivedFromString */ - protected function addElements($elements, &$tatooCounter, $receivedFromString = null) + protected function addElements($elements, &$tattooCounter, $receivedFromString = null) { if ($this->dataElementsMaster === null) { $this->dataElementsMaster = new DataElementsMaster(); @@ -318,7 +316,7 @@ protected function addElements($elements, &$tatooCounter, $receivedFromString = foreach ($elements as $element) { if ($element instanceof Element) { - $this->dataElementsMaster->dataElementsIndiv[] = $this->createElement($element, $tatooCounter); + $this->dataElementsMaster->dataElementsIndiv[] = $this->createElement($element, $tattooCounter); } if ($element instanceof ReceivedFrom) { @@ -328,22 +326,22 @@ protected function addElements($elements, &$tatooCounter, $receivedFromString = if ($receivedFromString !== null && !$explicitRf) { $this->dataElementsMaster->dataElementsIndiv[] = $this->createElement( - new ReceivedFrom(['receivedFrom' => $receivedFromString]), $tatooCounter + new ReceivedFrom(['receivedFrom' => $receivedFromString]), $tattooCounter ); } } /** * @param Element $element - * @param int $tatooCounter (BYREF) + * @param int $tattooCounter (BYREF) * @throws InvalidArgumentException * @return DataElementsIndiv */ - protected function createElement($element, &$tatooCounter) + protected function createElement($element, &$tattooCounter) { $createdElement = null; - $tatooCounter++; + $tattooCounter++; $reflect = new \ReflectionClass($element); $elementType = $reflect->getShortName(); @@ -351,7 +349,7 @@ protected function createElement($element, &$tatooCounter) switch ($elementType) { case 'Contact': /** @var Element\Contact $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_CONTACT_ELEMENT, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_CONTACT_ELEMENT, $tattooCounter); $createdElement->freetextData = new FreetextData( $element->value, $element->type @@ -359,7 +357,7 @@ protected function createElement($element, &$tatooCounter) break; case 'FormOfPayment': /** @var Element\FormOfPayment $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_FORM_OF_PAYMENT, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_FORM_OF_PAYMENT, $tattooCounter); $createdElement->formOfPayment = new FormOfPayment($element->type); if ($element->type === Fop::IDENT_CREDITCARD) { $createdElement->formOfPayment->fop->creditCardCode = $element->creditCardType; @@ -381,7 +379,7 @@ protected function createElement($element, &$tatooCounter) break; case 'MiscellaneousRemark': /** @var Element\MiscellaneousRemark $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_GENERAL_REMARK, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_GENERAL_REMARK, $tattooCounter); $createdElement->miscellaneousRemark = new MiscellaneousRemark( $element->text, $element->type, @@ -390,7 +388,7 @@ protected function createElement($element, &$tatooCounter) break; case 'ReceivedFrom': /** @var Element\ReceivedFrom $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_RECEIVE_FROM, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_RECEIVE_FROM, $tattooCounter); $createdElement->freetextData = new FreetextData( $element->receivedFrom, FreetextDetail::TYPE_RECEIVE_FROM @@ -398,22 +396,22 @@ protected function createElement($element, &$tatooCounter) break; case 'ServiceRequest': /** @var Element\ServiceRequest $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_SPECIAL_SERVICE_REQUEST, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_SPECIAL_SERVICE_REQUEST, $tattooCounter); $createdElement->serviceRequest = new ServiceRequest($element); break; case 'Ticketing': /** @var Element\Ticketing $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_TICKETING_ELEMENT, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_TICKETING_ELEMENT, $tattooCounter); $createdElement->ticketElement = new TicketElement($element); break; case 'AccountingInfo': /** @var Element\AccountingInfo $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_ACCOUNTING_INFORMATION, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_ACCOUNTING_INFORMATION, $tattooCounter); $createdElement->accounting = new Accounting($element); break; case 'Address': /** @var Element\Address $element */ - $createdElement = new DataElementsIndiv($element->type, $tatooCounter); + $createdElement = new DataElementsIndiv($element->type, $tattooCounter); if ($element->type === ElementManagementData::SEGNAME_ADDRESS_BILLING_UNSTRUCTURED || $element->type === ElementManagementData::SEGNAME_ADDRESS_MAILING_UNSTRUCTURED) { $createdElement->freetextData = new FreetextData($element->freeText, FreetextDetail::TYPE_MAILING_ADDRESS); } else { @@ -422,7 +420,7 @@ protected function createElement($element, &$tatooCounter) break; case 'FrequentFlyer': /** @var Element\FrequentFlyer $element */ - $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_SPECIAL_SERVICE_REQUEST, $tatooCounter); + $createdElement = new DataElementsIndiv(ElementManagementData::SEGNAME_SPECIAL_SERVICE_REQUEST, $tattooCounter); $createdElement->serviceRequest = new ServiceRequest(); $createdElement->serviceRequest->ssr->type = 'FQTV'; $createdElement->serviceRequest->ssr->companyId = $element->airline; diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/DataElementsIndiv.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/DataElementsIndiv.php index 35ff65878..559402132 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/DataElementsIndiv.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/DataElementsIndiv.php @@ -22,8 +22,6 @@ namespace Amadeus\Client\Struct\Pnr\AddMultiElements; -use Amadeus\Client\RequestOptions\PnrCancelOptions; - /** * DataElementsIndiv * @@ -125,10 +123,10 @@ class DataElementsIndiv /** * @param string $segmentName One of the constants ElementManagementData::SEGNAME_* - * @param int $tatoo Unique tatoo number for this element + * @param int $tattoo Unique tattoo number for this element */ - public function __construct($segmentName = null, $tatoo = null) + public function __construct($segmentName = null, $tattoo = null) { - $this->elementManagementData = new ElementManagementData($segmentName, $tatoo); + $this->elementManagementData = new ElementManagementData($segmentName, $tattoo); } } diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementData.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementData.php index 568f359f7..f4aa2c5e2 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementData.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementData.php @@ -127,15 +127,15 @@ class ElementManagementData * Create new ElementManagementData * * @param string|null $segmentName one of the constants SEGNAME_* defined in this class - * @param int|null $tatoo Optional tatoo nr to reference this element + * @param int|null $tattoo Optional tattoo nr to reference this element */ - public function __construct($segmentName = null, $tatoo = null) + public function __construct($segmentName = null, $tattoo = null) { if (!is_null($segmentName)) { $this->segmentName = $segmentName; } - if (!is_null($tatoo) && is_int($tatoo)) { - $this->reference = new Reference(Reference::QUAL_OTHER, $tatoo); + if (!is_null($tattoo) && is_int($tattoo)) { + $this->reference = new Reference(Reference::QUAL_OTHER, $tattoo); } } } diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php index f6ed8dc23..ecb568c37 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ElementManagementItinerary.php @@ -95,12 +95,12 @@ class ElementManagementItinerary /** * ElementManagementItinerary constructor. * - * @param int $tatooNr + * @param int $tattooNr * @param string $segmentName */ - public function __construct($tatooNr, $segmentName) + public function __construct($tattooNr, $segmentName) { $this->segmentName = $segmentName; - $this->reference = new Reference(Reference::QUAL_OTHER, $tatooNr); + $this->reference = new Reference(Reference::QUAL_OTHER, $tattooNr); } } diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php index edd728ad6..a320243ac 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/ItineraryInfo.php @@ -48,11 +48,11 @@ class ItineraryInfo /** * ItineraryInfo constructor. * - * @param int $tatooNr + * @param int $tattooNr * @param string $segmentName */ - public function __construct($tatooNr, $segmentName) + public function __construct($tattooNr, $segmentName) { - $this->elementManagementItinerary = new ElementManagementItinerary($tatooNr, $segmentName); + $this->elementManagementItinerary = new ElementManagementItinerary($tattooNr, $segmentName); } } diff --git a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Reference.php b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Reference.php index 116bc6077..0990cb985 100644 --- a/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Reference.php +++ b/src/Amadeus/Client/Struct/Pnr/AddMultiElements/Reference.php @@ -46,12 +46,12 @@ class Reference * 002 Corporate identification number * D Dominant segment in a marriage * N Non dominant segment in a marriage - * OT Other element tatoo reference number + * OT Other element tattoo reference number * PR Passenger Client-request-message-defined ref. nbr - * PT Passenger tatoo reference number + * PT Passenger tattoo reference number * SR Segment Client-request-message-defined ref. nbr - * SS Segment Tatoo+SubTatoo reference number - * ST Segment Tatoo reference number + * SS Segment Tattoo+SubTattoo reference number + * ST Segment Tattoo reference number * * @var string */ diff --git a/src/Amadeus/Client/Struct/Pnr/Cancel.php b/src/Amadeus/Client/Struct/Pnr/Cancel.php index 8c101a3f5..d43b8e415 100644 --- a/src/Amadeus/Client/Struct/Pnr/Cancel.php +++ b/src/Amadeus/Client/Struct/Pnr/Cancel.php @@ -68,11 +68,11 @@ public function __construct(PnrCancelOptions $params) $this->cancelElements[] = new Cancel\Elements(Elements::ENTRY_ITINERARY); } - if (!empty($params->elementsByTatoo)) { + if (!empty($params->elementsByTattoo)) { $tmp = new Cancel\Elements(Elements::ENTRY_ELEMENT); - foreach ($params->elementsByTatoo as $tatoo) { - $tmp->element[] = new Element($tatoo, Element::IDENT_OTHER_TATOO); + foreach ($params->elementsByTattoo as $tattoo) { + $tmp->element[] = new Element($tattoo, Element::IDENT_OTHER_TATTOO); } $this->cancelElements[] = $tmp; @@ -82,7 +82,7 @@ public function __construct(PnrCancelOptions $params) $tmp = new Cancel\Elements(Elements::ENTRY_NAME_INTEGRATION); foreach ($params->groupPassengers as $offerRef) { - $tmp->element[] = new Element($offerRef, Element::IDENT_PASSENGER_TATOO); + $tmp->element[] = new Element($offerRef, Element::IDENT_PASSENGER_TATTOO); } $this->cancelElements[] = $tmp; @@ -92,7 +92,7 @@ public function __construct(PnrCancelOptions $params) $tmp = new Cancel\Elements(Elements::ENTRY_ELEMENT); foreach ($params->passengers as $offerRef) { - $tmp->element[] = new Element($offerRef, Element::IDENT_PASSENGER_TATOO); + $tmp->element[] = new Element($offerRef, Element::IDENT_PASSENGER_TATTOO); } $this->cancelElements[] = $tmp; @@ -102,7 +102,7 @@ public function __construct(PnrCancelOptions $params) $tmp = new Cancel\Elements(Elements::ENTRY_ELEMENT); foreach ($params->offers as $offerRef) { - $tmp->element[] = new Element($offerRef, Element::IDENT_OFFER_TATOO); + $tmp->element[] = new Element($offerRef, Element::IDENT_OFFER_TATTOO); } $this->cancelElements[] = $tmp; diff --git a/src/Amadeus/Client/Struct/Pnr/Cancel/Element.php b/src/Amadeus/Client/Struct/Pnr/Cancel/Element.php index 2609526d8..e1f2e3cbe 100644 --- a/src/Amadeus/Client/Struct/Pnr/Cancel/Element.php +++ b/src/Amadeus/Client/Struct/Pnr/Cancel/Element.php @@ -30,13 +30,13 @@ */ class Element { - const IDENT_SEGMENT_TATOO = "ST"; + const IDENT_SEGMENT_TATTOO = "ST"; - const IDENT_PASSENGER_TATOO = "PT"; + const IDENT_PASSENGER_TATTOO = "PT"; - const IDENT_OFFER_TATOO = "OOT"; + const IDENT_OFFER_TATTOO = "OOT"; - const IDENT_OTHER_TATOO = "OT"; + const IDENT_OTHER_TATTOO = "OT"; /** @@ -51,13 +51,13 @@ class Element * ESI ES element with receiver type I * ESP ES element with receiver type P * N Non dominant segment in a marriage - * OOT Offers - Other element tatoo reference number - * OT Other element tatoo reference number + * OOT Offers - Other element tattoo reference number + * OT Other element tattoo reference number * PR Passenger Client-request-message-defined ref. nbr - * PT Passenger tatoo reference number + * PT Passenger tattoo reference number * SR Segment Client-request-message-defined ref. nbr - * SS Segment Tatoo+SubTatoo reference number - * ST Segment Tatoo reference number + * SS Segment Tattoo+SubTattoo reference number + * ST Segment Tattoo reference number * * @var string */ diff --git a/tests/Amadeus/Client/RequestCreator/BaseTest.php b/tests/Amadeus/Client/RequestCreator/BaseTest.php index 5477e43fc..1265c2812 100644 --- a/tests/Amadeus/Client/RequestCreator/BaseTest.php +++ b/tests/Amadeus/Client/RequestCreator/BaseTest.php @@ -154,11 +154,11 @@ public function testCanCreateOfferVerifyMessage() $this->assertInstanceOf('Amadeus\Client\Struct\Offer\Verify', $message); /** @var Verify $message */ - $this->assertInstanceOf('Amadeus\Client\Struct\Offer\OfferTatoo', $message->offerTatoo); - $this->assertEquals('AIR', $message->offerTatoo->segmentName); - $this->assertInstanceOf('Amadeus\Client\Struct\Offer\Reference', $message->offerTatoo->reference); - $this->assertEquals(Reference::TYPE_OFFER_TATOO, $message->offerTatoo->reference->type); - $this->assertEquals(1, $message->offerTatoo->reference->value); + $this->assertInstanceOf('Amadeus\Client\Struct\Offer\OfferTattoo', $message->offerTattoo); + $this->assertEquals('AIR', $message->offerTattoo->segmentName); + $this->assertInstanceOf('Amadeus\Client\Struct\Offer\Reference', $message->offerTattoo->reference); + $this->assertEquals(Reference::TYPE_OFFER_TATTOO, $message->offerTattoo->reference->type); + $this->assertEquals(1, $message->offerTattoo->reference->value); } public function testCanCreateQueueListMessage() diff --git a/tests/Amadeus/Client/Struct/Offer/ConfirmAirOfferTest.php b/tests/Amadeus/Client/Struct/Offer/ConfirmAirOfferTest.php index efa5cec9e..96cf2cde1 100644 --- a/tests/Amadeus/Client/Struct/Offer/ConfirmAirOfferTest.php +++ b/tests/Amadeus/Client/Struct/Offer/ConfirmAirOfferTest.php @@ -37,14 +37,14 @@ class ConfirmAirOfferTest extends BaseTestCase public function testCanMakeMessageWithPassengerReassociation() { $opt = new OfferConfirmAirOptions([ - 'tatooNumber' => 2, + 'tattooNumber' => 2, 'passengerReassociation' => [ new PassengerReAssocOptions([ 'pricingReference' => 5, 'paxReferences' => [ new PassengerDef([ 'passengerType' => "PA", //ADULT - 'passengerTatoo' => 1 + 'passengerTattoo' => 1 ]) ] ]) @@ -53,9 +53,9 @@ public function testCanMakeMessageWithPassengerReassociation() $message = new ConfirmAir($opt); - $this->assertEquals(2, $message->offerTatoo->reference->value); - $this->assertEquals(Reference::TYPE_OFFER_TATOO, $message->offerTatoo->reference->type); - $this->assertEquals(OfferTatoo::SEGMENT_AIR, $message->offerTatoo->segmentName); + $this->assertEquals(2, $message->offerTattoo->reference->value); + $this->assertEquals(Reference::TYPE_OFFER_TATTOO, $message->offerTattoo->reference->type); + $this->assertEquals(OfferTattoo::SEGMENT_AIR, $message->offerTattoo->segmentName); $this->assertEquals('PA', $message->passengerReassociation[0]->paxReference->passengerReference[0]->type); $this->assertEquals(1, $message->passengerReassociation[0]->paxReference->passengerReference[0]->value); $this->assertEquals(PricingRecordId::REFTYPE_PRODQUOTREC, $message->passengerReassociation[0]->pricingRecordId->referenceType); diff --git a/tests/Amadeus/Client/Struct/Pnr/AddMultiElementsTest.php b/tests/Amadeus/Client/Struct/Pnr/AddMultiElementsTest.php index 901413be2..b983742ff 100644 --- a/tests/Amadeus/Client/Struct/Pnr/AddMultiElementsTest.php +++ b/tests/Amadeus/Client/Struct/Pnr/AddMultiElementsTest.php @@ -165,7 +165,7 @@ public function testCanCreateMessageToCreateBasicPnrWithSrDocs() ], 'references' => [ new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 1 ]) ] @@ -654,11 +654,11 @@ public function testCanCreateSegmentWithMultiPassengerAssociation() 'company' => '1A', 'references' => [ new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 1 ]), new Reference([ - 'type' => Reference::TYPE_PASSENGER_TATOO, + 'type' => Reference::TYPE_PASSENGER_TATTOO, 'id' => 2 ]) ] diff --git a/tests/Amadeus/Client/Struct/Pnr/CancelTest.php b/tests/Amadeus/Client/Struct/Pnr/CancelTest.php index 4813f4855..780c8323e 100644 --- a/tests/Amadeus/Client/Struct/Pnr/CancelTest.php +++ b/tests/Amadeus/Client/Struct/Pnr/CancelTest.php @@ -48,18 +48,18 @@ public function testCanMakeCancelMessageForOffer() $this->assertEquals(1, count($message->cancelElements)); $this->assertEquals(Cancel\Elements::ENTRY_ELEMENT, $message->cancelElements[0]->entryType); $this->assertEquals(1, count($message->cancelElements[0]->element)); - $this->assertEquals(Cancel\Element::IDENT_OFFER_TATOO, $message->cancelElements[0]->element[0]->identifier); + $this->assertEquals(Cancel\Element::IDENT_OFFER_TATTOO, $message->cancelElements[0]->element[0]->identifier); $this->assertEquals(2, $message->cancelElements[0]->element[0]->number); $this->assertNull($message->cancelElements[0]->element[0]->subElement); } - public function testCanMakeCancelByTatooMessageWithPnrRetrieve() + public function testCanMakeCancelByTattooMessageWithPnrRetrieve() { $message = new Cancel( new PnrCancelOptions([ 'recordLocator' => 'ABC123', 'actionCode' => 0, - 'elementsByTatoo' => [14, 16, 20] + 'elementsByTattoo' => [14, 16, 20] ]) ); @@ -68,11 +68,11 @@ public function testCanMakeCancelByTatooMessageWithPnrRetrieve() $this->assertEquals(1, count($message->cancelElements)); $this->assertEquals(Cancel\Elements::ENTRY_ELEMENT, $message->cancelElements[0]->entryType); $this->assertEquals(3, count($message->cancelElements[0]->element)); - $this->assertEquals(Cancel\Element::IDENT_OTHER_TATOO, $message->cancelElements[0]->element[0]->identifier); + $this->assertEquals(Cancel\Element::IDENT_OTHER_TATTOO, $message->cancelElements[0]->element[0]->identifier); $this->assertEquals(14, $message->cancelElements[0]->element[0]->number); - $this->assertEquals(Cancel\Element::IDENT_OTHER_TATOO, $message->cancelElements[0]->element[1]->identifier); + $this->assertEquals(Cancel\Element::IDENT_OTHER_TATTOO, $message->cancelElements[0]->element[1]->identifier); $this->assertEquals(16, $message->cancelElements[0]->element[1]->number); - $this->assertEquals(Cancel\Element::IDENT_OTHER_TATOO, $message->cancelElements[0]->element[2]->identifier); + $this->assertEquals(Cancel\Element::IDENT_OTHER_TATTOO, $message->cancelElements[0]->element[2]->identifier); $this->assertEquals(20, $message->cancelElements[0]->element[2]->number); } @@ -105,7 +105,7 @@ public function testCanMakeCancelPassengerMessage() $this->assertEquals(1, count($message->cancelElements)); $this->assertEquals(Cancel\Elements::ENTRY_ELEMENT, $message->cancelElements[0]->entryType); $this->assertEquals(1, count($message->cancelElements[0]->element)); - $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATOO, $message->cancelElements[0]->element[0]->identifier); + $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATTOO, $message->cancelElements[0]->element[0]->identifier); $this->assertEquals(3, $message->cancelElements[0]->element[0]->number); } @@ -123,9 +123,9 @@ public function testCanMakeCancelGroupPassengerMessage() $this->assertEquals(1, count($message->cancelElements)); $this->assertEquals(Cancel\Elements::ENTRY_NAME_INTEGRATION, $message->cancelElements[0]->entryType); $this->assertEquals(2, count($message->cancelElements[0]->element)); - $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATOO, $message->cancelElements[0]->element[0]->identifier); + $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATTOO, $message->cancelElements[0]->element[0]->identifier); $this->assertEquals(5, $message->cancelElements[0]->element[0]->number); - $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATOO, $message->cancelElements[0]->element[1]->identifier); + $this->assertEquals(Cancel\Element::IDENT_PASSENGER_TATTOO, $message->cancelElements[0]->element[1]->identifier); $this->assertEquals(6, $message->cancelElements[0]->element[1]->number); } diff --git a/tests/Amadeus/ClientTest.php b/tests/Amadeus/ClientTest.php index 3ab45ba67..c52829d41 100644 --- a/tests/Amadeus/ClientTest.php +++ b/tests/Amadeus/ClientTest.php @@ -660,7 +660,7 @@ public function testCanDoOfferVerifyCall() $expectedMessageResult = new Client\Struct\Offer\Verify( 1, - Client\Struct\Offer\OfferTatoo::SEGMENT_AIR + Client\Struct\Offer\OfferTattoo::SEGMENT_AIR ); $mockSessionHandler @@ -877,7 +877,7 @@ public function testCanDoOfferConfirmAirOffer() $expectedMessageResult = new Client\Struct\Offer\ConfirmAir( new Client\RequestOptions\OfferConfirmAirOptions([ - 'tatooNumber' => 1 + 'tattooNumber' => 1 ]) ); @@ -905,7 +905,7 @@ public function testCanDoOfferConfirmAirOffer() $response = $client->offerConfirmAir( new Client\RequestOptions\OfferConfirmAirOptions([ - 'tatooNumber' => 1 + 'tattooNumber' => 1 ]) ); @@ -1311,7 +1311,7 @@ public function testCanFarePricePnrWithBookingClassVersion14() $mockSessionHandler = $this->getMockBuilder('Amadeus\Client\Session\Handler\HandlerInterface')->getMock(); - $messageResult = 'dummyfarepricepnrwithbookingclassmessage'; + //$messageResult = 'dummyfarepricepnrwithbookingclassmessage'; $mockSessionHandler ->expects($this->never()) @@ -1489,8 +1489,9 @@ public function testCanGetSessionInfo() } - - + /** + * @return array + */ public function dataProviderMakeMessageOptions() { return [ @@ -1572,6 +1573,9 @@ protected function makeClientWithMockedSessionHandler() return new Client($par); } + /** + * @return string + */ protected function makePathToDummyWSDL() { return realpath(