diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index c41c81c..4bac94b 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -19,7 +19,7 @@ '@PSR2' => true, '@PSR1' => true, '@PhpCsFixer' => true, - '@PhpCsFixer:risky' => true, + '@PhpCsFixer:risky' => false, '@Symfony' => true, '@Symfony:risky' => false, 'nullable_type_declaration_for_default_null_value' => false, diff --git a/tests/CXmlTest/Builder/OrderRequestBuilderTest.php b/tests/CXmlTest/Builder/OrderRequestBuilderTest.php index 828d420..292ab51 100644 --- a/tests/CXmlTest/Builder/OrderRequestBuilderTest.php +++ b/tests/CXmlTest/Builder/OrderRequestBuilderTest.php @@ -43,7 +43,7 @@ public function testFromPunchOutOrderMessage(): void $expectedOrderRequest = file_get_contents(__DIR__ . '/fixtures/order_request.xml'); - self::assertXmlStringEqualsXmlString($expectedOrderRequest, $actualOrderRequest); + $this->assertXmlStringEqualsXmlString($expectedOrderRequest, $actualOrderRequest); } public function newPayloadIdentity(): PayloadIdentity diff --git a/tests/CXmlTest/Handling/HandlerTest.php b/tests/CXmlTest/Handling/HandlerTest.php index 1b015d2..db51c4b 100644 --- a/tests/CXmlTest/Handling/HandlerTest.php +++ b/tests/CXmlTest/Handling/HandlerTest.php @@ -109,6 +109,6 @@ public function handle(PayloadInterface $payload, Context $context): ?ResponsePa $endpoint->parseAndProcessStringAsCXml($requestCxml); - self::assertSame($expectedHandlerCalled, $actualHandlerCalled); + $this->assertSame($expectedHandlerCalled, $actualHandlerCalled); } } diff --git a/tests/CXmlTest/Model/OrderRequestTest.php b/tests/CXmlTest/Model/OrderRequestTest.php index cb77af6..9eb184d 100644 --- a/tests/CXmlTest/Model/OrderRequestTest.php +++ b/tests/CXmlTest/Model/OrderRequestTest.php @@ -180,10 +180,10 @@ public function testMinimumExample(): void ->payload($orderRequest) ->build(CXml::DEPLOYMENT_TEST); - self::assertSame('OrderRequest_1625586002.193314.7293@dev', (string)$cxml); + $this->assertSame('OrderRequest_1625586002.193314.7293@dev', (string)$cxml); $xml = Serializer::create()->serialize($cxml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/OrderRequest.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/OrderRequest.xml', $xml); $this->dtdValidator->validateAgainstDtd($xml); } diff --git a/tests/CXmlTest/Model/ProductActivityMessageTest.php b/tests/CXmlTest/Model/ProductActivityMessageTest.php index 60384d6..f8100a4 100644 --- a/tests/CXmlTest/Model/ProductActivityMessageTest.php +++ b/tests/CXmlTest/Model/ProductActivityMessageTest.php @@ -70,10 +70,10 @@ public function testMinimumExample(): void ->payload($productActivityMessage) ->build(); - self::assertSame('ProductActivityMessage_0c30050@supplierorg.com', (string)$cxml); + $this->assertSame('ProductActivityMessage_0c30050@supplierorg.com', (string)$cxml); $xml = Serializer::create()->serialize($cxml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/ProductActivityMessage.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/ProductActivityMessage.xml', $xml); $this->dtdValidator->validateAgainstDtd($xml); } diff --git a/tests/CXmlTest/Model/PunchOutSetupRequestTest.php b/tests/CXmlTest/Model/PunchOutSetupRequestTest.php index bd3da02..5cb98fd 100644 --- a/tests/CXmlTest/Model/PunchOutSetupRequestTest.php +++ b/tests/CXmlTest/Model/PunchOutSetupRequestTest.php @@ -141,13 +141,13 @@ public function testMinimumExample(): void ->payload($punchoutSetupRequest) ->build('test'); - self::assertSame('PunchOutSetupRequest_933695160890', (string)$cxml); + $this->assertSame('PunchOutSetupRequest_933695160890', (string)$cxml); $xml = Serializer::create()->serialize($cxml); $this->dtdValidator->validateAgainstDtd($xml); - self::assertXmlStringEqualsXmlFile(__DIR__ . '/../../metadata/cxml/samples/PunchOutSetupRequest.xml', $xml); + $this->assertXmlStringEqualsXmlFile(__DIR__ . '/../../metadata/cxml/samples/PunchOutSetupRequest.xml', $xml); } public function newPayloadIdentity(): PayloadIdentity diff --git a/tests/CXmlTest/Model/PunchoutOrderMessageAdvancedPricingTest.php b/tests/CXmlTest/Model/PunchoutOrderMessageAdvancedPricingTest.php index 3f9ce77..557ff6a 100644 --- a/tests/CXmlTest/Model/PunchoutOrderMessageAdvancedPricingTest.php +++ b/tests/CXmlTest/Model/PunchoutOrderMessageAdvancedPricingTest.php @@ -76,12 +76,12 @@ public function testMinimumExampleAdvPricing(): void ->payload($punchoutOrderMessage) ->build(); - self::assertSame('PunchOutOrderMessage_933695160894', (string)$cxml); + $this->assertSame('PunchOutOrderMessage_933695160894', (string)$cxml); $xml = Serializer::create()->serialize($cxml); $this->dtdValidator->validateAgainstDtd($xml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/PunchoutOrderMessageAdvancedPricing.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/PunchoutOrderMessageAdvancedPricing.xml', $xml); } public function newPayloadIdentity(): PayloadIdentity diff --git a/tests/CXmlTest/Model/PunchoutOrderMessageTest.php b/tests/CXmlTest/Model/PunchoutOrderMessageTest.php index 247b22b..67abe60 100644 --- a/tests/CXmlTest/Model/PunchoutOrderMessageTest.php +++ b/tests/CXmlTest/Model/PunchoutOrderMessageTest.php @@ -88,12 +88,12 @@ public function testMinimumExample(): void ->payload($punchoutOrderMessage) ->build(); - self::assertSame('PunchOutOrderMessage_933695160894', (string)$cxml); + $this->assertSame('PunchOutOrderMessage_933695160894', (string)$cxml); $xml = Serializer::create()->serialize($cxml); $this->dtdValidator->validateAgainstDtd($xml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/PunchoutOrderMessage.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/PunchoutOrderMessage.xml', $xml); } public function newPayloadIdentity(): PayloadIdentity diff --git a/tests/CXmlTest/Model/QuoteMessageTest.php b/tests/CXmlTest/Model/QuoteMessageTest.php index f22f0ba..b5ad51c 100644 --- a/tests/CXmlTest/Model/QuoteMessageTest.php +++ b/tests/CXmlTest/Model/QuoteMessageTest.php @@ -117,10 +117,10 @@ public function testMinimumExample(): void ->payload($quoteMessage) ->build(); - self::assertSame('QuoteMessage_0c30050@supplierorg.com', (string)$cxml); + $this->assertSame('QuoteMessage_0c30050@supplierorg.com', (string)$cxml); $xml = Serializer::create()->serialize($cxml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/QuoteMessage.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/QuoteMessage.xml', $xml); $this->dtdValidator->validateAgainstDtd($xml); } diff --git a/tests/CXmlTest/Model/SerializerTest.php b/tests/CXmlTest/Model/SerializerTest.php index 3b703f9..3e95e48 100644 --- a/tests/CXmlTest/Model/SerializerTest.php +++ b/tests/CXmlTest/Model/SerializerTest.php @@ -102,7 +102,7 @@ public function testSerializeSimpleRequest(): void '; - self::assertXmlStringEqualsXmlString($expectedXml, $actualXml); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } public function testSerializeSimpleMessage(): void @@ -173,7 +173,7 @@ public function testSerializeSimpleMessage(): void '; - self::assertXmlStringEqualsXmlString($expectedXml, $actualXml); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } public function testSerializeSimpleResponse(): void @@ -200,7 +200,7 @@ public function testSerializeSimpleResponse(): void '; - self::assertXmlStringEqualsXmlString($expectedXml, $actualXml); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } public function testDeserialize(): void @@ -218,7 +218,7 @@ public function testDeserialize(): void $resultingXml = $serializer->serialize($cXml); - self::assertXmlStringEqualsXmlString($xml, $resultingXml); + $this->assertXmlStringEqualsXmlString($xml, $resultingXml); } /** @@ -247,7 +247,7 @@ public function testDeserializeWithMilliseconds(): void Ping Response CXml '; - self::assertXmlStringEqualsXmlString($xmlOut, $actual); + $this->assertXmlStringEqualsXmlString($xmlOut, $actual); } public function testDeserializeWithDateTimeForDate(): void @@ -276,13 +276,13 @@ public function testDeserializeWithDateTimeForDate(): void /** @var OrderRequest $orderRequest */ $orderRequest = $cXml->getRequest()->getPayload(); - self::assertSame('2023-02-25 02:30:00', $orderRequest->getItems()[0]->getRequestedDeliveryDate()->format('Y-m-d H:i:s')); - self::assertInstanceOf(DateTime::class, $orderRequest->getItems()[0]->getRequestedDeliveryDate()); + $this->assertSame('2023-02-25 02:30:00', $orderRequest->getItems()[0]->getRequestedDeliveryDate()->format('Y-m-d H:i:s')); + $this->assertInstanceOf(DateTime::class, $orderRequest->getItems()[0]->getRequestedDeliveryDate()); - self::assertSame('2023-02-26', $orderRequest->getItems()[1]->getRequestedDeliveryDate()->format('Y-m-d')); - self::assertInstanceOf(Date::class, $orderRequest->getItems()[1]->getRequestedDeliveryDate()); + $this->assertSame('2023-02-26', $orderRequest->getItems()[1]->getRequestedDeliveryDate()->format('Y-m-d')); + $this->assertInstanceOf(Date::class, $orderRequest->getItems()[1]->getRequestedDeliveryDate()); - self::assertNull($orderRequest->getItems()[2]->getRequestedDeliveryDate()); + $this->assertNull($orderRequest->getItems()[2]->getRequestedDeliveryDate()); } public function testDeserializeInvalidDate(): void @@ -381,7 +381,7 @@ public function testSerializeDateOnly(): void '; - self::assertXmlStringEqualsXmlString($expectedXml, $actualXml); + $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); } public function testDeserializeOneRowXml(): void @@ -393,6 +393,6 @@ public function testDeserializeOneRowXml(): void $resultingXml = $serializer->serialize($cXml); - self::assertXmlStringEqualsXmlString($xml, $resultingXml); + $this->assertXmlStringEqualsXmlString($xml, $resultingXml); } } diff --git a/tests/CXmlTest/Model/ShipNoticeRequestTest.php b/tests/CXmlTest/Model/ShipNoticeRequestTest.php index f0ef940..160f04a 100644 --- a/tests/CXmlTest/Model/ShipNoticeRequestTest.php +++ b/tests/CXmlTest/Model/ShipNoticeRequestTest.php @@ -73,10 +73,10 @@ public function testMinimumExample(): void ->payload($statusUpdateRequest) ->build(); - self::assertSame('ShipNoticeRequest_0c30050@supplierorg.com', (string)$cxml); + $this->assertSame('ShipNoticeRequest_0c30050@supplierorg.com', (string)$cxml); $xml = Serializer::create()->serialize($cxml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/ShipNoticeRequest.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/ShipNoticeRequest.xml', $xml); $this->dtdValidator->validateAgainstDtd($xml); } diff --git a/tests/CXmlTest/Model/StatusUpdateRequestTest.php b/tests/CXmlTest/Model/StatusUpdateRequestTest.php index a54115d..df2fc92 100644 --- a/tests/CXmlTest/Model/StatusUpdateRequestTest.php +++ b/tests/CXmlTest/Model/StatusUpdateRequestTest.php @@ -57,10 +57,10 @@ public function testMinimumExample(): void ->payload($statusUpdateRequest) ->build(); - self::assertSame('StatusUpdateRequest_0c30050@supplierorg.com', (string)$cxml); + $this->assertSame('StatusUpdateRequest_0c30050@supplierorg.com', (string)$cxml); $xml = Serializer::create()->serialize($cxml); - self::assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/StatusUpdateRequest.xml', $xml); + $this->assertXmlStringEqualsXmlFile('tests/metadata/cxml/samples/StatusUpdateRequest.xml', $xml); $this->dtdValidator->validateAgainstDtd($xml); } diff --git a/tests/CXmlTest/Payload/DefaultPayloadIdentityFactoryTest.php b/tests/CXmlTest/Payload/DefaultPayloadIdentityFactoryTest.php index f29c54a..a3553a5 100644 --- a/tests/CXmlTest/Payload/DefaultPayloadIdentityFactoryTest.php +++ b/tests/CXmlTest/Payload/DefaultPayloadIdentityFactoryTest.php @@ -22,6 +22,6 @@ public function testGenerateNewPayloadId(): void DateTime::createFromFormat('U.v', '1650614400.400')); $actualIdentity = $pif->newPayloadIdentity(); - self::assertStringStartsWith('1650614400.400', $actualIdentity->getPayloadId()); + $this->assertStringStartsWith('1650614400.400', $actualIdentity->getPayloadId()); } }