Skip to content

Commit

Permalink
refactor: run rector again and disable risky cs rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@ynnoig
ynnoig committed Jun 10, 2024
1 parent e7fb8b1 commit e8f28db
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/CXmlTest/Builder/OrderRequestBuilderTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/CXmlTest/Handling/HandlerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ public function handle(PayloadInterface $payload, Context $context): ?ResponsePa

$endpoint->parseAndProcessStringAsCXml($requestCxml);

self::assertSame($expectedHandlerCalled, $actualHandlerCalled);
$this->assertSame($expectedHandlerCalled, $actualHandlerCalled);
}
}
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/OrderRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/ProductActivityMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public function testMinimumExample(): void
->payload($productActivityMessage)
->build();

self::assertSame('[email protected]', (string)$cxml);
$this->assertSame('[email protected]', (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);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/PunchOutSetupRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/PunchoutOrderMessageAdvancedPricingTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/PunchoutOrderMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/QuoteMessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ public function testMinimumExample(): void
->payload($quoteMessage)
->build();

self::assertSame('[email protected]', (string)$cxml);
$this->assertSame('[email protected]', (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);
}
Expand Down
24 changes: 12 additions & 12 deletions tests/CXmlTest/Model/SerializerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function testSerializeSimpleRequest(): void
</Request>
</cXML>';

self::assertXmlStringEqualsXmlString($expectedXml, $actualXml);
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
}

public function testSerializeSimpleMessage(): void
Expand Down Expand Up @@ -173,7 +173,7 @@ public function testSerializeSimpleMessage(): void
</Message>
</cXML>';

self::assertXmlStringEqualsXmlString($expectedXml, $actualXml);
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
}

public function testSerializeSimpleResponse(): void
Expand All @@ -200,7 +200,7 @@ public function testSerializeSimpleResponse(): void
</Response>
</cXML>';

self::assertXmlStringEqualsXmlString($expectedXml, $actualXml);
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
}

public function testDeserialize(): void
Expand All @@ -218,7 +218,7 @@ public function testDeserialize(): void

$resultingXml = $serializer->serialize($cXml);

self::assertXmlStringEqualsXmlString($xml, $resultingXml);
$this->assertXmlStringEqualsXmlString($xml, $resultingXml);
}

/**
Expand Down Expand Up @@ -247,7 +247,7 @@ public function testDeserializeWithMilliseconds(): void
<Status code="200" text="OK">Ping Response CXml</Status>
</Response>
</cXML>';
self::assertXmlStringEqualsXmlString($xmlOut, $actual);
$this->assertXmlStringEqualsXmlString($xmlOut, $actual);
}

public function testDeserializeWithDateTimeForDate(): void
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -381,7 +381,7 @@ public function testSerializeDateOnly(): void
</Request>
</cXML>';

self::assertXmlStringEqualsXmlString($expectedXml, $actualXml);
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
}

public function testDeserializeOneRowXml(): void
Expand All @@ -393,6 +393,6 @@ public function testDeserializeOneRowXml(): void

$resultingXml = $serializer->serialize($cXml);

self::assertXmlStringEqualsXmlString($xml, $resultingXml);
$this->assertXmlStringEqualsXmlString($xml, $resultingXml);
}
}
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/ShipNoticeRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ public function testMinimumExample(): void
->payload($statusUpdateRequest)
->build();

self::assertSame('[email protected]', (string)$cxml);
$this->assertSame('[email protected]', (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);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/CXmlTest/Model/StatusUpdateRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ public function testMinimumExample(): void
->payload($statusUpdateRequest)
->build();

self::assertSame('[email protected]', (string)$cxml);
$this->assertSame('[email protected]', (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);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/CXmlTest/Payload/DefaultPayloadIdentityFactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

0 comments on commit e8f28db

Please sign in to comment.