Iterative updates to reduce the number of baseline issues

Author: dmvrtx

.github/workflows/php-lint-test.yml

@@ -30,7 +30,7 @@ jobs:
       - name: "Set up PHP"
         uses: ./.github/actions/setup-php
       # install dependencies and run linter
-      - run: composer self-update && composer install --no-progress && ./vendor/bin/phpcs --standard=phpcs.xml.dist $(git ls-files | grep .php$) && ./vendor/bin/psalm
+      - run: composer self-update && composer install --no-progress && ./vendor/bin/phpcs --standard=phpcs.xml.dist $(git ls-files | grep .php$) && composer run phpstan
 
   generate-test-matrix:
     name: "Generate the matrix for php tests dynamically"

dev/phpstan-wcpay-constants.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * Custom WordPress constants stub file for PHPStan
+ * This file provides definitions for common WordPress constants that are missing from the official stubs
+ */
+
+define( 'WCPAY_VERSION_NUMBER', '10.2.0' );
+define( 'WC_ADMIN_VERSION_NUMBER', '' );

phpstan-wordpress-constants.php dev/phpstan-wordpress-constants.phpphpstan-wordpress-constants.php renamed to dev/phpstan-wordpress-constants.php

@@ -165,9 +165,9 @@ public function __construct(
 		$this->payment_method           = $payment_method;
 		$this->order                    = $order;
 		$this->token                    = $token;
-		$this->payment_initiated_by     = $payment_initiated_by ?? Payment_Initiated_By::CUSTOMER();
-		$this->manual_capture           = $manual_capture ?? Payment_Capture_Type::AUTOMATIC();
-		$this->payment_type             = $payment_type ?? Payment_Type::SINGLE();
+		$this->payment_initiated_by     = $payment_initiated_by ?? Payment_Initiated_By::CUSTOMER;
+		$this->manual_capture           = $manual_capture ?? Payment_Capture_Type::AUTOMATIC;
+		$this->payment_type             = $payment_type ?? Payment_Type::SINGLE;
 		$this->cvc_confirmation         = $cvc_confirmation;
 		$this->fingerprint              = $fingerprint;
 		$this->payment_method_stripe_id = $payment_method_stripe_id;
@@ -180,7 +180,7 @@ public function __construct(
 	 * @return bool True if payment was initiated by the merchant, false otherwise.
 	 */
 	public function is_merchant_initiated(): bool {
-		return $this->payment_initiated_by->equals( Payment_Initiated_By::MERCHANT() );
+		return $this->payment_initiated_by->equals( Payment_Initiated_By::MERCHANT );
 	}
 
 	/**

includes/class-payment-information.php

@@ -6,6 +6,10 @@ includes:
 
 parameters:
     level: 5
+    phpVersion: 70400 # PHP 7.4
+    dynamicConstantNames:
+        - 'WCPAY_VERSION_NUMBER'
+        - 'WC_ADMIN_VERSION_NUMBER'
 
     # Files and directories to analyze
     paths:
@@ -18,32 +22,27 @@ parameters:
         - includes/in-person-payments/templates
         - includes/subscriptions
         - includes/compat/subscriptions
-        - vendor
-        - client
-        - docker
-        - release
-        - tests
-        - bin
-        - assets
-        - languages
-        - i18n
 
     # Bootstrap files
     bootstrapFiles:
         - psalm-loader.php
 
     scanFiles:
-        - phpstan-wordpress-constants.php
+        - dev/phpstan-wordpress-constants.php
+        - dev/phpstan-wcpay-constants.php
+
+    scanDirectories:
+        - docker/wordpress/wp-content/plugins/woocommerce/
 
     # Handle undefined constants gracefully
     reportUnmatchedIgnoredErrors: false
-
-    # Allow dynamic properties for WordPress classes
-    dynamicConstantNames:
-        - 'true'
+    # While PHP 7.3 is the lowest supported version we need to not rely on the argument types
+    treatPhpDocTypesAsCertain: false
 
     # Ignore common WordPress patterns that cause false positives
     ignoreErrors:
         - '#Call to function (is_admin|is_user_logged_in|current_user_can|__|_e|esc_attr|esc_html|wp_kses|get_option|update_option|do_action|apply_filters|add_action|add_filter|wp_enqueue_script|wp_enqueue_style|wp_localize_script|wp_redirect|wp_safe_redirect|wp_die|wp_mail|get_transient|set_transient|plugin_dir_path|plugin_dir_url|get_plugin_data)#'
         -
              identifier: missingType.iterableValue
+        -
+             identifier: missingType.voidReturn