Merge pull request #3534 from woocommerce/PCP-4570-qit-warnings

Fix QIT warnings

Author: Dinamiko

modules/ppcp-admin-notices/src/Renderer/Renderer.php

@@ -80,7 +80,7 @@ public function render(): bool {
 
 			printf(
 				'<div class="notice notice-%s %s" %s%s><p>%s</p></div>',
-				$message->type(),
+				esc_attr( $message->type() ),
 				( $message->is_dismissible() ) ? 'is-dismissible' : '',
 				( $message->wrapper() ? sprintf( 'data-ppcp-wrapper="%s"', esc_attr( $message->wrapper() ) ) : '' ),
 				// Use `empty()` in condition, to avoid false phpcs warning.

modules/ppcp-api-client/src/Endpoint/OrderEndpoint.php

@@ -176,10 +176,10 @@ public function with_bn_code( string $bn_code ): OrderEndpoint {
 	public function create(
 		array $items,
 		string $shipping_preference,
-		Payer $payer = null,
+		?Payer $payer = null,
 		string $payment_method = '',
 		array $request_data = array(),
-		PaymentSource $payment_source = null
+		?PaymentSource $payment_source = null
 	): Order {
 		$bearer = $this->bearer->bearer();
 		$data   = array(
@@ -444,9 +444,7 @@ public function order( string $id ): Order {
 		}
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
-			$error = new RuntimeException(
-				__( 'Could not retrieve order.', 'woocommerce-paypal-payments' )
-			);
+			$error = new RuntimeException( 'Could not retrieve order.' );
 			$this->logger->warning( $error->getMessage() );
 
 			throw $error;
@@ -456,7 +454,7 @@ public function order( string $id ): Order {
 
 		if ( 404 === $status_code || empty( $response['body'] ) ) {
 			$error = new RuntimeException(
-				__( 'Could not retrieve order.', 'woocommerce-paypal-payments' ),
+				'Could not retrieve order.',
 				404
 			);
 			$this->logger->warning(

modules/ppcp-api-client/src/Endpoint/WebhookEndpoint.php

@@ -113,9 +113,7 @@ public function create( Webhook $hook ): Webhook {
 		$response = $this->request( $url, $args );
 
 		if ( is_wp_error( $response ) ) {
-			throw new RuntimeException(
-				__( 'Not able to create a webhook.', 'woocommerce-paypal-payments' )
-			);
+			throw new RuntimeException( 'Not able to create a webhook.' );
 		}
 
 		$json        = json_decode( $response['body'] );
@@ -151,9 +149,7 @@ public function list(): array {
 		$response = $this->request( $url, $args );
 
 		if ( is_wp_error( $response ) ) {
-			throw new RuntimeException(
-				__( 'Not able to load webhooks list.', 'woocommerce-paypal-payments' )
-			);
+			throw new RuntimeException( 'Not able to load webhooks list.' );
 		}
 
 		$json        = json_decode( $response['body'] );
@@ -195,9 +191,7 @@ public function delete( Webhook $hook ): void {
 		$response = $this->request( $url, $args );
 
 		if ( $response instanceof WP_Error ) {
-			throw new RuntimeException(
-				__( 'Not able to delete the webhook.', 'woocommerce-paypal-payments' )
-			);
+			throw new RuntimeException( 'Not able to delete the webhook.' );
 		}
 
 		$status_code = (int) wp_remote_retrieve_response_code( $response );
@@ -250,9 +244,7 @@ public function simulate( Webhook $hook, string $event_type, ?string $resource_v
 		$response = $this->request( $url, $args );
 
 		if ( is_wp_error( $response ) ) {
-			throw new RuntimeException(
-				__( 'Not able to simulate webhook.', 'woocommerce-paypal-payments' )
-			);
+			throw new RuntimeException( 'Not able to simulate webhook.' );
 		}
 		$json        = json_decode( $response['body'] );
 		$status_code = (int) wp_remote_retrieve_response_code( $response );
@@ -312,9 +304,7 @@ public function verify_event(
 		);
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
-			$error = new RuntimeException(
-				__( 'Not able to verify webhook event.', 'woocommerce-paypal-payments' )
-			);
+			$error = new RuntimeException( 'Not able to verify webhook event.' );
 			$this->logger->log(
 				'warning',
 				$error->getMessage(),
@@ -340,9 +330,7 @@ public function verify_event(
 	public function verify_current_request_for_webhook( Webhook $webhook ): bool {
 
 		if ( ! $webhook->id() ) {
-			$error = new RuntimeException(
-				__( 'Not a valid webhook to verify.', 'woocommerce-paypal-payments' )
-			);
+			$error = new RuntimeException( 'Not a valid webhook to verify.' );
 			$this->logger->log( 'warning', $error->getMessage(), array( 'webhook' => $webhook ) );
 			throw $error;
 		}
@@ -369,11 +357,7 @@ public function verify_current_request_for_webhook( Webhook $webhook ): bool {
 
 			$error = new RuntimeException(
 				sprintf(
-					// translators: %s is the headers key.
-					__(
-						'Not a valid webhook event. Header %s is missing',
-						'woocommerce-paypal-payments'
-					),
+					'Not a valid webhook event. Header %s is missing',
 					$key
 				)
 			);

modules/ppcp-api-client/src/Entity/Amount.php

@@ -41,7 +41,7 @@ class Amount {
 	 * @param Money                $money The money.
 	 * @param AmountBreakdown|null $breakdown The breakdown.
 	 */
-	public function __construct( Money $money, AmountBreakdown $breakdown = null ) {
+	public function __construct( Money $money, ?AmountBreakdown $breakdown = null ) {
 		$this->money     = $money;
 		$this->breakdown = $breakdown;
 	}

modules/ppcp-api-client/src/Entity/AuthorizationStatus.php

@@ -62,8 +62,7 @@ public function __construct( string $status, ?AuthorizationStatusDetails $detail
 		if ( ! in_array( $status, self::VALID_STATUS, true ) ) {
 			throw new RuntimeException(
 				sprintf(
-					// translators: %s is the current status.
-					__( '%s is not a valid status', 'woocommerce-paypal-payments' ),
+					'%s is not a valid status',
 					$status
 				)
 			);

modules/ppcp-api-client/src/Entity/Item.php

@@ -114,13 +114,13 @@ public function __construct(
 		Money $unit_amount,
 		int $quantity,
 		string $description = '',
-		Money $tax = null,
+		?Money $tax = null,
 		string $sku = '',
 		string $category = 'PHYSICAL_GOODS',
 		string $url = '',
 		string $image_url = '',
 		float $tax_rate = 0,
-		string $cart_item_key = null
+		?string $cart_item_key = null
 	) {
 
 		$this->name          = $name;

modules/ppcp-api-client/src/Entity/Order.php

@@ -9,6 +9,8 @@
 
 namespace WooCommerce\PayPalCommerce\ApiClient\Entity;
 
+use DateTime;
+
 /**
  * Class Order
  */
@@ -25,7 +27,7 @@ class Order {
 	/**
 	 * The create time.
 	 *
-	 * @var \DateTime|null
+	 * @var DateTime|null
 	 */
 	private $create_time;
 
@@ -60,7 +62,7 @@ class Order {
 	/**
 	 * The update time.
 	 *
-	 * @var \DateTime|null
+	 * @var DateTime|null
 	 */
 	private $update_time;
 
@@ -86,18 +88,18 @@ class Order {
 	 * @param PaymentSource|null $payment_source The payment source.
 	 * @param Payer|null         $payer The payer.
 	 * @param string             $intent The intent.
-	 * @param \DateTime|null     $create_time The create time.
-	 * @param \DateTime|null     $update_time The update time.
+	 * @param DateTime|null      $create_time The create time.
+	 * @param DateTime|null      $update_time The update time.
 	 */
 	public function __construct(
 		string $id,
 		array $purchase_units,
 		OrderStatus $order_status,
-		PaymentSource $payment_source = null,
-		Payer $payer = null,
+		?PaymentSource $payment_source = null,
+		?Payer $payer = null,
 		string $intent = 'CAPTURE',
-		\DateTime $create_time = null,
-		\DateTime $update_time = null,
+		?DateTime $create_time = null,
+		?DateTime $update_time = null,
 		$links = null
 	) {
 
@@ -124,7 +126,7 @@ public function id(): string {
 	/**
 	 * Returns the create time.
 	 *
-	 * @return \DateTime|null
+	 * @return DateTime|null
 	 */
 	public function create_time() {
 		return $this->create_time;
@@ -133,7 +135,7 @@ public function create_time() {
 	/**
 	 * Returns the update time.
 	 *
-	 * @return \DateTime|null
+	 * @return DateTime|null
 	 */
 	public function update_time() {
 		return $this->update_time;

modules/ppcp-api-client/src/Entity/OrderStatus.php

@@ -51,8 +51,7 @@ public function __construct( string $status ) {
 		if ( ! in_array( $status, self::VALID_STATUS, true ) ) {
 			throw new RuntimeException(
 				sprintf(
-					// translators: %s is the current status.
-					__( '%s is not a valid status', 'woocommerce-paypal-payments' ),
+					'%s is not a valid status',
 					$status
 				)
 			);

modules/ppcp-api-client/src/Entity/Payer.php

@@ -9,6 +9,8 @@
 
 namespace WooCommerce\PayPalCommerce\ApiClient\Entity;
 
+use DateTime;
+
 /**
  * Class Payer
  * The customer who sends the money.
@@ -39,7 +41,7 @@ class Payer {
 	/**
 	 * The birth date.
 	 *
-	 * @var \DateTime|null
+	 * @var DateTime|null
 	 */
 	private $birthdate;
 
@@ -71,18 +73,18 @@ class Payer {
 	 * @param string             $email_address The email.
 	 * @param string             $payer_id The payer id.
 	 * @param Address|null       $address The address.
-	 * @param \DateTime|null     $birthdate The birth date.
+	 * @param DateTime|null      $birthdate The birth date.
 	 * @param PhoneWithType|null $phone The phone.
 	 * @param PayerTaxInfo|null  $tax_info The tax info.
 	 */
 	public function __construct(
 		?PayerName $name,
 		string $email_address,
 		string $payer_id,
-		Address $address = null,
-		\DateTime $birthdate = null,
-		PhoneWithType $phone = null,
-		PayerTaxInfo $tax_info = null
+		?Address $address = null,
+		?DateTime $birthdate = null,
+		?PhoneWithType $phone = null,
+		?PayerTaxInfo $tax_info = null
 	) {
 
 		$this->name          = $name;
@@ -133,7 +135,7 @@ public function payer_id(): string {
 	/**
 	 * Returns the birth date.
 	 *
-	 * @return \DateTime|null
+	 * @return DateTime|null
 	 */
 	public function birthdate() {
 		return $this->birthdate;

modules/ppcp-api-client/src/Entity/PayerTaxInfo.php

@@ -51,8 +51,7 @@ public function __construct(
 		if ( ! in_array( $type, self::VALID_TYPES, true ) ) {
 			throw new RuntimeException(
 				sprintf(
-				// translators: %s is the current type.
-					__( '%s is not a valid tax type.', 'woocommerce-paypal-payments' ),
+					'%s is not a valid tax type.',
 					$type
 				)
 			);