Lastest cafe changes 5.0.24.p

eventespresso · Aug 22, 2024 · baa30b7 · baa30b7
1 parent 87a62b1
commit baa30b7
Show file tree

Hide file tree

Showing 71 changed files with 1,631 additions and 1,009 deletions.
diff --git a/.VERSION b/.VERSION
@@ -0,0 +1 @@
+5.0.24.009
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,15 +6,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Releases
 
+### [5.0.24]
+
+#### Added
+ - [New Reg List Table Event Filter (#1451)](https://github.com/eventespresso/cafe/pull/1451)
+ - NEW
+
+#### Fixed
+ - [Fix PPC Meta Data Array Error (#1454)](https://github.com/eventespresso/cafe/pull/1454)
+ - [Fix Event List Shortcode Show Expired Parameter (#1470)](https://github.com/eventespresso/cafe/pull/1470)
+ - [Force Payment Method Registration When Generating Messages (#1464)](https://github.com/eventespresso/cafe/pull/1464)
+ - [Ensure editor-buttons Script is Enqueued (#1472)](https://github.com/eventespresso/cafe/pull/1472)
+ - [PPC. Fix PM thinking it disconnected (#1479)](https://github.com/eventespresso/cafe/pull/1479)
+ - FIX
+
+#### Changed
+ - [Build machine 5.0.23.p changes (#1461)](https://github.com/eventespresso/cafe/pull/1461)
+ - [Add GraphQL interface manager (#1463)](https://github.com/eventespresso/cafe/pull/1463)
+ - MOD
+
+#### Deprecated
+ - DEP
+
+#### Removed
+ - RMV
+
+#### Security
+ - [Add current_user_can() Check When Updating Timezone (#1475)](https://github.com/eventespresso/cafe/pull/1475)
+ - SEC
+
+
+
 ### [5.0.23]
 
+
 #### Fixed
  - [Type Cast Return Value for EE_Admin_Config::useAdvancedEditor() (#1458)](https://github.com/eventespresso/cafe/pull/1458)
 
 #### Changed
  - [BuildMachine 5.0.22 changes (#1450)](https://github.com/eventespresso/cafe/pull/1450)
 
 
+
+
+
+
 ### [5.0.22]
 
 #### Added

diff --git a/PaymentMethods/PayPalCommerce/PayPalCheckout/EEG_PayPalCheckout.gateway.php b/PaymentMethods/PayPalCommerce/PayPalCheckout/EEG_PayPalCheckout.gateway.php
@@ -53,8 +53,6 @@ class EEG_PayPalCheckout extends EE_Onsite_Gateway
      * @param EE_Payment|null $payment
      * @param array|null      $billing_info
      * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
      */
     public function do_direct_payment($payment, $billing_info = null)
     {
@@ -185,63 +183,6 @@ public static function updatePaymentStatus(
     }
 
 
-    /**
-     * Get PayPal order if already created for this transaction and saved.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param int               $TXN_ID
-     * @return array
-     */
-    public static function getPpOrder(EE_Payment_Method $paypal_pm, int $TXN_ID): array
-    {
-        try {
-            $pp_orders = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PAYPAL_ORDERS) ?? [];
-            return $pp_orders[ $TXN_ID ] ?? [];
-        } catch (Exception $exception) {
-            return [];
-        }
-    }
-
-
-    /**
-     * Update PayPal order for this transaction.
-     *
-     * @param                   $order
-     * @param EE_Payment_Method $paypal_pm
-     * @param int               $TXN_ID
-     * @return bool
-     */
-    public static function updatePpOrder($order, EE_Payment_Method $paypal_pm, int $TXN_ID): bool
-    {
-        try {
-            $pp_orders = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PAYPAL_ORDERS) ?? [];
-            $pp_orders[ $TXN_ID ] = $order;
-            return PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_PAYPAL_ORDERS, $pp_orders);
-        } catch (Exception $exception) {
-            return false;
-        }
-    }
-
-
-    /**
-     * Delete PP Order associated with the provided transaction.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param int               $TXN_ID
-     * @return bool
-     */
-    public static function deletePpOrder(EE_Payment_Method $paypal_pm, int $TXN_ID): bool
-    {
-        try {
-            $pp_orders = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PAYPAL_ORDERS) ?? [];
-            unset($pp_orders[ $TXN_ID ]);
-            return PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_PAYPAL_ORDERS, $pp_orders);
-        } catch (Exception $exception) {
-            return false;
-        }
-    }
-
-
     /**
      * Save some transaction details, like billing information.
      *

diff --git a/PaymentMethods/PayPalCommerce/PayPalCheckout/EE_PMT_PayPalCheckout.pm.php b/PaymentMethods/PayPalCommerce/PayPalCheckout/EE_PMT_PayPalCheckout.pm.php
@@ -39,9 +39,7 @@ public function __construct($pm_instance = null)
         // Display a refund message at transactions actions area.
         add_action(
             'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
-            [__CLASS__, 'refundNotice'],
-            10,
-            1
+            [__CLASS__, 'refundNotice']
         );
 
         parent::__construct($pm_instance);

diff --git a/PaymentMethods/PayPalCommerce/PayPalCommerce.php b/PaymentMethods/PayPalCommerce/PayPalCommerce.php
@@ -2,7 +2,6 @@
 
 namespace EventEspresso\PaymentMethods;
 
-use EE_Config;
 use EE_Dependency_Map;
 use EE_Error;
 use EEH_Autoloader;
@@ -39,8 +38,7 @@ public function initialize()
         // Register payment method through a legacy manager.
         add_filter(
             'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
-            [__CLASS__, 'injectPaymentMethod'],
-            10
+            [__CLASS__, 'injectPaymentMethod']
         );
         // Load modules.
         /** @var LegacyModulesManager $legacy_modules_manager */
@@ -50,9 +48,9 @@ public function initialize()
 
         // Setup auto loaders.
         EEH_Autoloader::instance()->register_autoloader([
-            'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH . 'forms' . DS . 'SettingsForm.php',
-            'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH . 'forms' . DS . 'OnboardingForm.php',
-            'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH . 'forms' . DS . 'BillingForm.php',
+            'SettingsForm'   => EEP_PAYPAL_COMMERCE_PATH . 'forms/SettingsForm.php',
+            'OnboardingForm' => EEP_PAYPAL_COMMERCE_PATH . 'forms/OnboardingForm.php',
+            'BillingForm'    => EEP_PAYPAL_COMMERCE_PATH . 'forms/BillingForm.php',
         ]);
     }
 

diff --git a/PaymentMethods/PayPalCommerce/api/FirstPartyPayPalApi.php b/PaymentMethods/PayPalCommerce/api/FirstPartyPayPalApi.php
@@ -82,15 +82,13 @@ private function getRequestParameters(array $body_parameters, string $method, ar
             'redirection' => 5,
             'blocking'    => true,
         ];
-        $default_headers = [
+        // add default values to incoming headers.
+        $request_parameters['headers'] = $headers + [
             'User-Agent'                    => sanitize_text_field($_SERVER['HTTP_USER_AGENT']),
             'PayPal-Partner-Attribution-Id' => $this->bn_code,
             'Content-Type'                  => 'application/json',
-            'Authorization'                 => 'Basic ' . base64_encode(
-                $this->client_id . ':' . $this->client_secret
-            ),
+            'Authorization'                 => 'Basic ' . base64_encode("$this->client_id:$this->client_secret"),
         ];
-        $request_parameters['headers'] = array_merge($default_headers, $headers);
         // Add body if this is a POST request.
         if ($body_parameters && ($method === 'POST' || $method === 'PUT')) {
             $request_parameters['body'] = json_encode($body_parameters);

diff --git a/PaymentMethods/PayPalCommerce/api/OneTimeString.php b/PaymentMethods/PayPalCommerce/api/OneTimeString.php
@@ -14,10 +14,7 @@
  */
 class OneTimeString
 {
-    /**
-     * @var string
-     */
-    private $value;
+    private string $value;
 
 
     /**

diff --git a/PaymentMethods/PayPalCommerce/api/PayPalApi.php b/PaymentMethods/PayPalCommerce/api/PayPalApi.php
@@ -36,13 +36,14 @@ abstract class PayPalApi
     /**
      * @param bool $sandbox_mode
      */
-    public function __construct(bool $sandbox_mode = true) {
+    public function __construct(bool $sandbox_mode = true)
+    {
         $this->sandbox_mode = $sandbox_mode;
         // Is this a sandbox request.
         $this->api_endpoint = $this->sandbox_mode
             ? 'https://api-m.sandbox.paypal.com/v2/'
             : 'https://api-m.paypal.com/v2/';
-        $this->inspector     = new ResponseInspector();
+        $this->inspector    = new ResponseInspector();
     }
 
 

diff --git a/PaymentMethods/PayPalCommerce/api/ResponseInspector.php b/PaymentMethods/PayPalCommerce/api/ResponseInspector.php
@@ -18,14 +18,14 @@ class ResponseInspector
      *
      * @var bool
      */
-    protected $valid = true;
+    protected bool $valid = true;
 
     /**
      * An encountered error.
      *
      * @var array
      */
-    protected $error = [];
+    protected array $error = [];
 
 
     /**
@@ -51,13 +51,14 @@ public function isValid(): bool
 
 
     /**
-     * Set/save the error.
+     * Set/save the error and mark the response as invalid
      *
      * @param array $error
      */
     private function setError(array $error)
     {
         $this->error = $error;
+        $this->setInValid();
     }
 
 
@@ -99,7 +100,6 @@ public function validateResponse($response): bool
                     ),
                 ]
             );
-            $this->setInValid();
             return false;
         }
         // Do we have a response body ?
@@ -110,7 +110,6 @@ public function validateResponse($response): bool
                     'message' => esc_html__('No response body provided.', 'event_espresso'),
                 ]
             );
-            $this->setInValid();
             return false;
         }
         return true;
@@ -132,7 +131,6 @@ public function validateParameters($response): bool
                     'event_espresso'
                 ),
             ]);
-            $this->setInValid();
             return false;
         }
         // Check the data for errors.
@@ -145,7 +143,6 @@ public function validateParameters($response): bool
                     'message' => $error_message,
                 ]
             );
-            $this->setInValid();
             return false;
         }
         return true;

diff --git a/PaymentMethods/PayPalCommerce/api/ThirdPartyPayPalApi.php b/PaymentMethods/PayPalCommerce/api/ThirdPartyPayPalApi.php
@@ -54,7 +54,7 @@ public function __construct(
         string $bn_code,
         string $partner_client_id = '',
         string $payer_id = '',
-        bool   $sandbox_mode = true
+        bool $sandbox_mode = true
     ) {
         parent::__construct($sandbox_mode);
         $this->access_token      = $access_token;
@@ -90,9 +90,7 @@ public function sendRequest(array $body_parameters, string $endpoint, string $me
      */
     private function getRequestParameters(array $body_parameters, string $method, array $headers): array
     {
-        $request_parameters = [
-            'method' => $method,
-        ];
+        $request_parameters = ['method' => $method];
         $default_headers    = [
             'User-Agent'                    => sanitize_text_field($_SERVER['HTTP_USER_AGENT']),
             'PayPal-Partner-Attribution-Id' => $this->bnCode(),
@@ -101,17 +99,20 @@ private function getRequestParameters(array $body_parameters, string $method, ar
         ];
         // If we have merchant credentials then we are onboard and can do requests on behalf of the seller.
         if ($this->partner_client_id && $this->payer_id) {
-            $assertion1 = [
-                'alg' => 'none',
-            ];
-            $assertion2 = [
-                'iss'      => $this->partner_client_id,
-                'payer_id' => $this->payer_id,
-            ];
-            $default_headers['PayPal-Auth-Assertion'] = base64_encode(json_encode($assertion1, JSON_HEX_APOS)) . '.' .
-                                                        base64_encode(json_encode($assertion2, JSON_HEX_APOS)) . '.';
+            $assertion1 = base64_encode(json_encode(['alg' => 'none'], JSON_HEX_APOS));
+            $assertion2 = base64_encode(
+                json_encode(
+                    [
+                        'iss'      => $this->partner_client_id,
+                        'payer_id' => $this->payer_id,
+                    ],
+                    JSON_HEX_APOS
+                )
+            );
+            // now concatenate the two assertions and add to the headers.
+            $default_headers['PayPal-Auth-Assertion'] = "$assertion1.$assertion2.";
         }
-        $request_parameters['headers'] = array_merge($default_headers, $headers);
+        $request_parameters['headers'] = $headers + $default_headers;
         // Add body if this is a POST request.
         if ($body_parameters && ($method === 'POST' || $method === 'PUT')) {
             $request_parameters['body'] = json_encode($body_parameters);

diff --git a/PaymentMethods/PayPalCommerce/api/clients/ClientToken.php b/PaymentMethods/PayPalCommerce/api/clients/ClientToken.php
@@ -24,10 +24,8 @@ class ClientToken extends ClientsApi
      * @param PayPalApi $api
      * @param bool      $sandbox_mode
      */
-    public function __construct(
-        PayPalApi $api,
-        bool $sandbox_mode
-    ) {
+    public function __construct(PayPalApi $api, bool $sandbox_mode)
+    {
         parent::__construct($api, $sandbox_mode);
         $this->request_url = $this->request_url . "/generate-token";
     }
@@ -70,7 +68,7 @@ public function validateResponse(array $response): array
         return [
             'valid'        => true,
             'client_token' => $response[ Domain::API_KEY_CLIENT_TOKEN ],
-            'expires_in'   => $response[ Domain::API_KEY_EXPIRES_IN ]
+            'expires_in'   => $response[ Domain::API_KEY_EXPIRES_IN ],
         ];
     }
 }
diff --git a/PaymentMethods/PayPalCommerce/api/clients/ClientsApi.php b/PaymentMethods/PayPalCommerce/api/clients/ClientsApi.php
@@ -16,15 +16,9 @@
  */
 abstract class ClientsApi
 {
-    /**
-     * @var PayPalApi
-     */
-    protected $api;
+    protected PayPalApi $api;
 
-    /**
-     * @var string
-     */
-    protected $request_url;
+    protected string $request_url;
 
 
     /**

diff --git a/PaymentMethods/PayPalCommerce/api/orders/CaptureOrder.php b/PaymentMethods/PayPalCommerce/api/orders/CaptureOrder.php
@@ -56,6 +56,8 @@ public function __construct(PayPalApi $api, EE_Transaction $transaction, string
      * Capture payment for PayPal Order.
      *
      * @return array
+     * @throws EE_Error
+     * @throws ReflectionException
      */
     public function capture(): array
     {