chore(dependencies): composer lock update + CS Fix

.php-cs-fixer.php

@@ -14,7 +14,7 @@
 		'@PSR1' => true,
 		'@PhpCsFixer' => true,
 		'@Symfony' => true,
-		'@Symfony:risky' => true,
+		'@Symfony:risky' => false,
 		'native_function_invocation' => [
 			'include' => [\PhpCsFixer\Fixer\FunctionNotation\NativeFunctionInvocationFixer::SET_INTERNAL],
 			'scope' => 'namespaced',

composer.json

@@ -29,18 +29,18 @@
     "ext-dom": "*",
     "ext-libxml": "*",
     "beberlei/assert": "@stable",
-    "jms/serializer": "^3.19.0",
+    "jms/serializer": "^3.28.0",
     "psr/log": "^1.0 || ^2.0 || ^3.0"
   },
   "suggest": {
     "symfony/routing": "If you want to use SelfAwareProfileRequestHandler"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.6.3",
-    "phpstan/phpstan": "^1.10.1",
-    "friendsofphp/php-cs-fixer": "^v3.14.4",
+    "phpunit/phpunit": "^9.6.13",
+    "phpstan/phpstan": "^1.10.41",
+    "friendsofphp/php-cs-fixer": "^v3.38.0",
     "php-parallel-lint/php-parallel-lint": "^1.3.2",
-    "enlightn/security-checker": "^1.10",
+    "enlightn/security-checker": "^1.10.0",
     "symfony/routing": "^4.4.44"
   },
   "autoload": {

src/CXml/Builder.php

@@ -30,7 +30,7 @@ class Builder
 	private ?Status $status = null;
 	private ?string $locale;
 
-	private function __construct(string $senderUserAgent, ?string $locale = null, PayloadIdentityFactoryInterface $payloadIdentityFactory = null)
+	private function __construct(string $senderUserAgent, string $locale = null, PayloadIdentityFactoryInterface $payloadIdentityFactory = null)
 	{
 		$this->locale = $locale;
 		$this->payloadIdentityFactory = $payloadIdentityFactory ?? new DefaultPayloadIdentityFactory();
@@ -42,7 +42,7 @@ public static function create(string $senderUserAgent = 'cxml-php UserAgent', st
 		return new self($senderUserAgent, $locale, $payloadIdentityFactory);
 	}
 
-	public function payload(?PayloadInterface $payload = null): self
+	public function payload(PayloadInterface $payload = null): self
 	{
 		$this->payload = $payload;
 

src/CXml/Builder/OrderRequestBuilder.php

@@ -54,9 +54,9 @@ public static function create(string $orderId, \DateTimeInterface $orderDate, st
 
 	public static function fromPunchOutOrderMessage(
 		PunchOutOrderMessage $punchOutOrderMessage,
-		?string $currency = null,
-		?string $orderId = null,
-		?\DateTimeInterface $orderDate = null,
+		string $currency = null,
+		string $orderId = null,
+		\DateTimeInterface $orderDate = null,
 		string $language = 'en'
 	): self {
 		if ($supplierOrderInfo = $punchOutOrderMessage->getPunchOutOrderMessageHeader()->getSupplierOrderInfo()) {
@@ -100,12 +100,12 @@ public static function fromPunchOutOrderMessage(
 	public function billTo(
 		string $name,
 		PostalAddress $postalAddress = null,
-		?string $addressId = null,
-		?string $addressIdDomain = null,
-		?string $email = null,
-		?string $phone = null,
-		?string $fax = null,
-		?string $url = null
+		string $addressId = null,
+		string $addressIdDomain = null,
+		string $email = null,
+		string $phone = null,
+		string $fax = null,
+		string $url = null
 	): self {
 		$this->billTo = new BillTo(
 			new Address(
@@ -212,7 +212,7 @@ public function addItem(
 		return $this;
 	}
 
-	public function addComment(?string $value = null, ?string $type = null, ?string $lang = null, ?string $attachmentUrl = null): self
+	public function addComment(string $value = null, string $type = null, string $lang = null, string $attachmentUrl = null): self
 	{
 		$this->comments[] = new Comment(
 			$value,

src/CXml/Builder/ProductActivityMessageBuilder.php

@@ -29,7 +29,7 @@ public static function create(string $messageId, string $warehouseCodeDomain): s
 		return new self($messageId, $warehouseCodeDomain);
 	}
 
-	public function addProductActivityDetail(string $sku, string $warehouseCode, int $stockLevel, ?array $extrinsics = null): self
+	public function addProductActivityDetail(string $sku, string $warehouseCode, int $stockLevel, array $extrinsics = null): self
 	{
 		$inventory = Inventory::create()
 			->setStockOnHandQuantity(new InventoryQuantity($stockLevel, 'EA'))

src/CXml/Builder/PunchOutOrderMessageBuilder.php

@@ -35,15 +35,15 @@ class PunchOutOrderMessageBuilder
 	private ?\DateTimeInterface $orderDate;
 	private ?ShipTo $shipTo = null;
 
-	private function __construct(string $language, string $buyerCookie, string $currency, ?string $operationAllowed = null)
+	private function __construct(string $language, string $buyerCookie, string $currency, string $operationAllowed = null)
 	{
 		$this->buyerCookie = $buyerCookie;
 		$this->currency = $currency;
 		$this->operationAllowed = $operationAllowed;
 		$this->language = $language;
 	}
 
-	public static function create(string $language, string $buyerCookie, string $currency, ?string $operationAllowed = null): self
+	public static function create(string $language, string $buyerCookie, string $currency, string $operationAllowed = null): self
 	{
 		return new self($language, $buyerCookie, $currency, $operationAllowed);
 	}
@@ -114,9 +114,9 @@ public function addPunchoutOrderMessageItem(
 		string $unitOfMeasure,
 		int $unitPrice,
 		array $classifications,
-		?string $manufacturerPartId = null,
-		?string $manufacturerName = null,
-		?int $leadTime = null,
+		string $manufacturerPartId = null,
+		string $manufacturerName = null,
+		int $leadTime = null,
 		array $extrinsics = null
 	): self {
 		$itemDetail = ItemDetail::create(

src/CXml/Exception/CXmlConflictException.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Exception;
 
-class CXmlConflictException extends CXmlException
-{
-}
+class CXmlConflictException extends CXmlException {}

src/CXml/Exception/CXmlExpectationFailedException.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Exception;
 
-class CXmlExpectationFailedException extends CXmlException
-{
-}
+class CXmlExpectationFailedException extends CXmlException {}

src/CXml/Exception/CXmlNotAcceptableException.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Exception;
 
-class CXmlNotAcceptableException extends CXmlException
-{
-}
+class CXmlNotAcceptableException extends CXmlException {}

src/CXml/Exception/CXmlNotImplementedException.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Exception;
 
-class CXmlNotImplementedException extends CXmlException
-{
-}
+class CXmlNotImplementedException extends CXmlException {}

src/CXml/Exception/CXmlPreconditionFailedException.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Exception;
 
-class CXmlPreconditionFailedException extends CXmlException
-{
-}
+class CXmlPreconditionFailedException extends CXmlException {}

src/CXml/Model/Address.php

@@ -53,7 +53,7 @@ class Address
 	 */
 	private ?string $url = null;
 
-	public function __construct(MultilanguageString $name, ?PostalAddress $postalAddress = null, ?string $addressId = null, ?string $addressIdDomain = null, ?string $email = null, ?string $phone = null, ?string $fax = null, ?string $url = null)
+	public function __construct(MultilanguageString $name, PostalAddress $postalAddress = null, string $addressId = null, string $addressIdDomain = null, string $email = null, string $phone = null, string $fax = null, string $url = null)
 	{
 		$this->addressId = $addressId;
 		$this->addressIdDomain = $addressIdDomain;

src/CXml/Model/CXml.php

@@ -52,10 +52,10 @@ protected function __construct(
 		string $payloadId,
 		\DateTimeInterface $timestamp,
 		?Request $request,
-		?Response $response = null,
-		?Message $message = null,
-		?Header $header = null,
-		?string $lang = null
+		Response $response = null,
+		Message $message = null,
+		Header $header = null,
+		string $lang = null
 	) {
 		$this->request = $request;
 		$this->response = $response;
@@ -66,17 +66,17 @@ protected function __construct(
 		$this->lang = $lang;
 	}
 
-	public static function forMessage(PayloadIdentity $payloadIdentity, Message $message, Header $header, ?string $lang = null): self
+	public static function forMessage(PayloadIdentity $payloadIdentity, Message $message, Header $header, string $lang = null): self
 	{
 		return new self($payloadIdentity->getPayloadId(), $payloadIdentity->getTimestamp(), null, null, $message, $header, $lang);
 	}
 
-	public static function forRequest(PayloadIdentity $payloadIdentity, Request $request, Header $header, ?string $lang = null): self
+	public static function forRequest(PayloadIdentity $payloadIdentity, Request $request, Header $header, string $lang = null): self
 	{
 		return new self($payloadIdentity->getPayloadId(), $payloadIdentity->getTimestamp(), $request, null, null, $header, $lang);
 	}
 
-	public static function forResponse(PayloadIdentity $payloadIdentity, Response $response, ?string $lang = null): self
+	public static function forResponse(PayloadIdentity $payloadIdentity, Response $response, string $lang = null): self
 	{
 		return new self($payloadIdentity->getPayloadId(), $payloadIdentity->getTimestamp(), null, $response, null, null, $lang);
 	}

src/CXml/Model/Comment.php

@@ -26,7 +26,7 @@ class Comment
 	 */
 	private ?string $type = null;
 
-	public function __construct(?string $value = null, ?string $type = null, ?string $lang = null, ?string $attachment = null)
+	public function __construct(string $value = null, string $type = null, string $lang = null, string $attachment = null)
 	{
 		$this->value = $value;
 		$this->type = $type;

src/CXml/Model/Contact.php

@@ -41,13 +41,13 @@ class Contact
 	 */
 	private ?string $email = null;
 
-	public function __construct(MultilanguageString $name, ?string $role = null)
+	public function __construct(MultilanguageString $name, string $role = null)
 	{
 		$this->role = $role;
 		$this->name = $name;
 	}
 
-	public static function create(MultilanguageString $name, ?string $role = null): self
+	public static function create(MultilanguageString $name, string $role = null): self
 	{
 		return new self($name, $role);
 	}

src/CXml/Model/Credential.php

@@ -29,7 +29,7 @@ class Credential
 	 */
 	private ?string $sharedSecret = null;
 
-	public function __construct(string $domain, string $identity, ?string $sharedSecret = null)
+	public function __construct(string $domain, string $identity, string $sharedSecret = null)
 	{
 		$this->domain = $domain;
 		$this->identity = $identity;

src/CXml/Model/Description.php

@@ -12,12 +12,12 @@ class Description extends MultilanguageString
 	 */
 	private ?string $shortName = null;
 
-	public function __construct(?string $value, ?string $type = null, string $lang = 'en')
+	public function __construct(?string $value, string $type = null, string $lang = 'en')
 	{
 		parent::__construct($value, $type, $lang);
 	}
 
-	public static function createWithShortName(string $shortName, ?string $type = null, string $lang = 'en'): self
+	public static function createWithShortName(string $shortName, string $type = null, string $lang = 'en'): self
 	{
 		$new = new self(null, $type, $lang);
 		$new->setShortname($shortName);

src/CXml/Model/Exception/CXmlModelNotFoundException.php

@@ -4,6 +4,4 @@
 
 use CXml\Exception\CXmlNotImplementedException;
 
-class CXmlModelNotFoundException extends CXmlNotImplementedException
-{
-}
+class CXmlModelNotFoundException extends CXmlNotImplementedException {}

src/CXml/Model/ItemId.php

@@ -26,7 +26,7 @@ class ItemId
 	 */
 	private ?string $buyerPartId = null;
 
-	public function __construct(string $supplierPartId, ?string $supplierPartAuxiliaryId = null, ?string $buyerPartId = null)
+	public function __construct(string $supplierPartId, string $supplierPartAuxiliaryId = null, string $buyerPartId = null)
 	{
 		$this->supplierPartId = $supplierPartId;
 		$this->supplierPartAuxiliaryId = $supplierPartAuxiliaryId;

src/CXml/Model/ItemOut.php

@@ -45,8 +45,8 @@ private function __construct(
 		int $quantity,
 		ItemId $itemId,
 		ItemDetail $itemDetail,
-		?\DateTimeInterface $requestedDeliveryDate = null,
-		?int $parentLineNumber = null
+		\DateTimeInterface $requestedDeliveryDate = null,
+		int $parentLineNumber = null
 	) {
 		$this->lineNumber = $lineNumber;
 		$this->quantity = $quantity;
@@ -61,8 +61,8 @@ public static function create(
 		int $quantity,
 		ItemId $itemId,
 		ItemDetail $itemDetail,
-		?\DateTimeInterface $requestedDeliveryDate = null,
-		?int $parentLineNumber = null
+		\DateTimeInterface $requestedDeliveryDate = null,
+		int $parentLineNumber = null
 	): self {
 		return new self(
 			$lineNumber,

src/CXml/Model/Message/MessagePayloadInterface.php

@@ -4,6 +4,4 @@
 
 use CXml\Model\PayloadInterface;
 
-interface MessagePayloadInterface extends PayloadInterface
-{
-}
+interface MessagePayloadInterface extends PayloadInterface {}

src/CXml/Model/Message/ProductActivityDetail.php

@@ -35,15 +35,15 @@ class ProductActivityDetail
 	 */
 	private ?Inventory $inventory = null;
 
-	private function __construct(ItemId $itemId, ?Inventory $inventory = null, ?Contact $contact = null, ?MultilanguageString $description = null)
+	private function __construct(ItemId $itemId, Inventory $inventory = null, Contact $contact = null, MultilanguageString $description = null)
 	{
 		$this->contact = $contact;
 		$this->description = $description;
 		$this->itemId = $itemId;
 		$this->inventory = $inventory;
 	}
 
-	public static function create(ItemId $itemId, ?Inventory $inventory = null, ?Contact $contact = null, ?MultilanguageString $description = null): self
+	public static function create(ItemId $itemId, Inventory $inventory = null, Contact $contact = null, MultilanguageString $description = null): self
 	{
 		return new self($itemId, $inventory, $contact, $description);
 	}

src/CXml/Model/Message/ProductActivityHeader.php

@@ -25,7 +25,7 @@ class ProductActivityHeader
 	 */
 	private ?\DateTimeInterface $creationDate = null;
 
-	public function __construct(string $messageId, ?string $processType = null, \DateTimeInterface $creationDate = null)
+	public function __construct(string $messageId, string $processType = null, \DateTimeInterface $creationDate = null)
 	{
 		$this->messageId = $messageId;
 		$this->processType = $processType;

src/CXml/Model/Message/ProductActivityMessage.php

@@ -22,12 +22,12 @@ class ProductActivityMessage implements MessagePayloadInterface
 	 */
 	private array $productActivityDetails = [];
 
-	private function __construct(string $messageId, ?string $processType = null, \DateTimeInterface $creationDate = null)
+	private function __construct(string $messageId, string $processType = null, \DateTimeInterface $creationDate = null)
 	{
 		$this->productActivityHeader = new ProductActivityHeader($messageId, $processType, $creationDate);
 	}
 
-	public static function create(string $messageId, ?string $processType = null, \DateTimeInterface $creationDate = null): self
+	public static function create(string $messageId, string $processType = null, \DateTimeInterface $creationDate = null): self
 	{
 		return new self($messageId, $processType, $creationDate);
 	}

src/CXml/Model/Message/PunchOutOrderMessageHeader.php

@@ -46,7 +46,7 @@ class PunchOutOrderMessageHeader
 	 */
 	private ?SupplierOrderInfo $supplierOrderInfo = null;
 
-	public function __construct(MoneyWrapper $total, ?Shipping $shipping = null, ?Tax $tax = null, ?string $operationAllowed = null)
+	public function __construct(MoneyWrapper $total, Shipping $shipping = null, Tax $tax = null, string $operationAllowed = null)
 	{
 		Assertion::inArray($operationAllowed, [self::OPERATION_CREATE, self::OPERATION_EDIT, self::OPERATION_INSPECT, null]);
 

src/CXml/Model/MultilanguageString.php

@@ -21,7 +21,7 @@ class MultilanguageString
 	 */
 	private ?string $lang = null;
 
-	public function __construct(?string $value, ?string $type = null, string $lang = 'en')
+	public function __construct(?string $value, string $type = null, string $lang = 'en')
 	{
 		$this->value = $value;
 		$this->lang = $lang;

src/CXml/Model/OrderReference.php

@@ -22,7 +22,7 @@ class OrderReference
 	 */
 	private ?\DateTimeInterface $orderDate = null;
 
-	public function __construct(DocumentReference $documentReference, ?string $orderId = null, ?\DateTimeInterface $orderDate = null)
+	public function __construct(DocumentReference $documentReference, string $orderId = null, \DateTimeInterface $orderDate = null)
 	{
 		$this->documentReference = $documentReference;
 		$this->orderId = $orderId;

src/CXml/Model/Party.php

@@ -17,7 +17,7 @@ class Party
 	 */
 	private ?string $userAgent = null;
 
-	public function __construct(Credential $credential, ?string $userAgent = null)
+	public function __construct(Credential $credential, string $userAgent = null)
 	{
 		$this->credential = $credential;
 		$this->userAgent = $userAgent;

src/CXml/Model/PayloadInterface.php

@@ -2,6 +2,4 @@
 
 namespace CXml\Model;
 
-interface PayloadInterface
-{
-}
+interface PayloadInterface {}