OpenMage · hirale · Jun 11, 2025 · Jun 11, 2025 · Jun 11, 2025 · Jun 21, 2025
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -3828,258 +3828,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Payment/Model/Recurring/Profile.php
 
-		-
-			message: '#^Parameter \#2 \$value of method Mage_Core_Model_Config\:\:saveConfig\(\) expects string, int given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php
-
-		-
-			message: '#^Return type \(false\) of method Mage_Paypal_Block_Hosted_Pro_Info\:\:getCcTypeName\(\) should be compatible with return type \(string\|null\) of method Mage_Paypal_Block_Payment_Info\:\:getCcTypeName\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php
-
-		-
-			message: '#^Return type \(false\) of method Mage_Paypal_Block_Payflow_Link_Info\:\:getCcTypeName\(\) should be compatible with return type \(string\|null\) of method Mage_Paypal_Block_Payment_Info\:\:getCcTypeName\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php
-
-		-
-			message: '#^Parameter \#1 \$setToken of method Mage_Paypal_Controller_Express_Abstract\:\:_initToken\(\) expects string\|null, false given\.$#'
-			identifier: argument.type
-			count: 2
-			path: app/code/core/Mage/Paypal/Controller/Express/Abstract.php
-
-		-
-			message: '#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\:\:_export\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Api/Nvp.php
-
-		-
-			message: '#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\:\:_import\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Api/Nvp.php
-
-		-
-			message: '#^Parameter \#1 \$array \(non\-empty\-list\) of array_values is already a list, call has no effect\.$#'
-			identifier: arrayValues.list
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Api/Nvp.php
-
-		-
-			message: '#^Call to an undefined method Varien_Object\:\:isNominal\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Cart.php
-
-		-
-			message: '#^Empty array passed to foreach\.$#'
-			identifier: foreach.emptyArray
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Cart.php
-
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Cart.php
-
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Config.php
-
-		-
-			message: '#^If condition is always false\.$#'
-			identifier: if.alwaysFalse
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Express.php
-
-		-
-			message: '#^Parameter \#1 \$amount of method Mage_Paypal_Model_Express\:\:_callDoAuthorize\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express.php
-
-		-
-			message: '#^Parameter \#1 \$datetime of class DateTime constructor expects string, null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Express.php
-
-		-
-			message: '#^Cannot call method getData\(\) on array\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
-
-		-
-			message: '#^Cannot call method getExportedKeys\(\) on array\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
-
-		-
-			message: '#^Parameter \#1 \$message of static method Mage\:\:throwException\(\) expects string, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Express/Checkout.php
-
-		-
-			message: '#^Return type \(bool\) of method Mage_Paypal_Model_Hostedpro\:\:getAllowedCcTypes\(\) should be compatible with return type \(string\) of method Mage_Paypal_Model_Direct\:\:getAllowedCcTypes\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Hostedpro.php
-
-		-
-			message: '#^Return type \(bool\) of method Mage_Paypal_Model_Hostedpro\:\:validate\(\) should be compatible with return type \(\$this\(Mage_Payment_Model_Method_Cc\)\) of method Mage_Payment_Model_Method_Cc\:\:validate\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Hostedpro.php
-
-		-
-			message: '#^Binary operation "\-" between array\|string and array\|string results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Ipn.php
-
-		-
-			message: '#^Parameter \#1 \$amount of method Mage_Sales_Model_Order_Payment\:\:registerCaptureNotification\(\) expects float, array\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Ipn.php
-
-		-
-			message: '#^Parameter \#2 \$url of method Zend_Http_Client_Adapter_Interface\:\:write\(\) expects Zend_Uri_Http, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Ipn.php
-
-		-
-			message: '#^Parameter \#1 \$payment of method Mage_Paypal_Model_Method_Agreement\:\:_placeOrder\(\) expects Mage_Sales_Model_Order_Payment, Varien_Object given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Method/Agreement.php
-
-		-
-			message: '#^Parameter \#1 \$spec of method Zend_Controller_Response_Abstract\:\:getBody\(\) expects bool, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Observer.php
-
-		-
-			message: '#^Return type \(bool\) of method Mage_Paypal_Model_Payflowlink\:\:validate\(\) should be compatible with return type \(\$this\(Mage_Payment_Model_Method_Cc\)\) of method Mage_Payment_Model_Method_Cc\:\:validate\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowlink.php
-
-		-
-			message: '#^Parameter \#1 \$payment of method Mage_Paypal_Model_Payflowpro\:\:_buildBasicRequest\(\) expects Mage_Sales_Model_Order_Payment, Mage_Payment_Model_Info given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowpro.php
-
-		-
-			message: '#^Parameter \#1 \$payment of method Mage_Paypal_Model_Payflowpro\:\:void\(\) expects Mage_Sales_Model_Order_Payment, Varien_Object given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowpro.php
-
-		-
-			message: '#^Parameter \#2 \$storeId of method Mage_Payment_Model_Method_Abstract\:\:getConfigData\(\) expects int\|Mage_Core_Model_Store\|string\|null, false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowpro.php
-
-		-
-			message: '#^Parameter \#3 \$map of static method Varien_Object_Mapper\:\:accumulateByMap\(\) expects array, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowpro.php
-
-		-
-			message: '#^Property Mage_Paypal_Model_Payflowpro\:\:\$_centinelFieldMap \(string\) does not accept default value of type array\<string, string\>\.$#'
-			identifier: property.defaultValue
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowpro.php
-
-		-
-			message: '#^Method Mage_Paypal_Model_Pro\:\:capture\(\) should return false\|null but return statement is missing\.$#'
-			identifier: return.missing
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Pro.php
-
-		-
-			message: '#^Parameter \#2 \$payment of method Mage_Paypal_Model_Pro\:\:_importCaptureResultToPayment\(\) expects Mage_Sales_Model_Order_Payment, Varien_Object given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Pro.php
-
-		-
-			message: '#^Parameter \#2 \$payment of method Mage_Paypal_Model_Pro\:\:_importRefundResultToPayment\(\) expects Mage_Sales_Model_Order_Payment, Varien_Object given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Pro.php
-
-		-
-			message: '#^Parameter \#2 \$to of method Mage_Paypal_Model_Pro\:\:importPaymentInfo\(\) expects Mage_Payment_Model_Info, Varien_Object given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Pro.php
-
-		-
-			message: '#^Method Varien_Data_Collection\:\:toOptionArray\(\) invoked with 1 parameter, 0 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php
-
-		-
-			message: '#^Method Varien_Data_Collection\:\:toOptionArray\(\) invoked with 1 parameter, 0 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php
-
-		-
-			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_setExpressCheckoutResponse\.$#'
-			identifier: property.protected
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php
-
-		-
-			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_doCaptureResponse\.$#'
-			identifier: property.protected
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
-
-		-
-			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_getTransactionDetailsResponse\.$#'
-			identifier: property.protected
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
-
-		-
-			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_paymentInformationResponse\.$#'
-			identifier: property.protected
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
-
-		-
-			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_refundTransactionResponse\.$#'
-			identifier: property.protected
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
-
-		-
-			message: '#^Return type \(void\) of method Mage_PaypalUk_Model_Pro\:\:fetchTransactionInfo\(\) should be compatible with return type \(array\) of method Mage_Paypal_Model_Pro\:\:fetchTransactionInfo\(\)$#'
-			identifier: method.childReturnType
-			count: 1
-			path: app/code/core/Mage/PaypalUk/Model/Pro.php
-
 		-
 			message: '#^Method Mage_ProductAlert_Helper_Data\:\:createBlock\(\) should return Mage_ProductAlert_Block_Email_Price\|Mage_ProductAlert_Block_Email_Stock but returns Mage_Core_Block_Abstract\.$#'
 			identifier: return.type
@@ -5844,12 +5592,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/googleanalytics/ga.phtml
 
-		-
-			message: '#^Class Mage_Paypal_Block_Express_Form referenced with incorrect case\: Mage_PayPal_Block_Express_Form\.$#'
-			identifier: class.nameCase
-			count: 1
-			path: app/design/frontend/base/default/template/paypal/payment/redirect.phtml
-
 		-
 			message: '#^Cannot call method isEnabled\(\) on Mage_Core_Block_Abstract\|false\.$#'
 			identifier: method.nonObject

diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon
@@ -55,7 +55,6 @@ parameters:
         - app/code/core/Mage/Centinel/Model/Api/Client.php
 
         # Class phpseclib\Net\SSH2 not found.
-        - app/code/core/Mage/Paypal/Model/Report/Settlement.php
         - lib/Varien/Io/Sftp.php
 
         # Dataflow/Model/Convert/Iterator.php
@@ -126,12 +125,10 @@ parameters:
                 - app/design/frontend/base/default/template/customer/wishlist.phtml
                 - app/design/frontend/base/default/template/directory/currency/switch.phtml
                 - app/design/frontend/base/default/template/page/redirect.phtml
-                - app/design/frontend/base/default/template/paypal/hss/review/button.phtml
                 - app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
                 - app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
                 - app/design/frontend/rwd/default/template/customer/form/address.phtml
                 - app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
-                - app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
                 - app/design/install/default/default/template/page.phtml
         -
             identifier: phpunit.coversMethod

diff --git a/.phpstorm.meta.php/magento_blocks.meta.php b/.phpstorm.meta.php/magento_blocks.meta.php
@@ -588,6 +588,7 @@
             'adminhtml/system_config_form' => \Mage_Adminhtml_Block_System_Config_Form::class,
             'adminhtml/system_config_form_field' => \Mage_Adminhtml_Block_System_Config_Form_Field::class,
             'adminhtml/system_config_form_field_array_abstract' => \Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract::class,
+            'adminhtml/system_config_form_field_csp_hosts' => \Mage_Adminhtml_Block_System_Config_Form_Field_Csp_Hosts::class,
             'adminhtml/system_config_form_field_datetime' => \Mage_Adminhtml_Block_System_Config_Form_Field_Datetime::class,
             'adminhtml/system_config_form_field_export' => \Mage_Adminhtml_Block_System_Config_Form_Field_Export::class,
             'adminhtml/system_config_form_field_file' => \Mage_Adminhtml_Block_System_Config_Form_Field_File::class,
@@ -968,6 +969,8 @@
             'core/text_tag_debug' => \Mage_Core_Block_Text_Tag_Debug::class,
             'core/text_tag_js' => \Mage_Core_Block_Text_Tag_Js::class,
             'core/text_tag_meta' => \Mage_Core_Block_Text_Tag_Meta::class,
+            'csp/adminhtml_meta' => \Mage_Csp_Block_Adminhtml_Meta::class,
+            'csp/meta' => \Mage_Csp_Block_Meta::class,
             'currencysymbol/adminhtml_system_currencysymbol' => \Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol::class,
             'customer/account' => \Mage_Customer_Block_Account::class,
             'customer/account_changeforgotten' => \Mage_Customer_Block_Account_Changeforgotten::class,
@@ -1105,53 +1108,16 @@
             'payment/info_checkmo' => \Mage_Payment_Block_Info_Checkmo::class,
             'payment/info_container' => \Mage_Payment_Block_Info_Container::class,
             'payment/info_purchaseorder' => \Mage_Payment_Block_Info_Purchaseorder::class,
-            'paypaluk/bml_form' => \Mage_PaypalUk_Block_Bml_Form::class,
-            'paypaluk/express_form' => \Mage_PaypalUk_Block_Express_Form::class,
-            'paypaluk/express_shortcut' => \Mage_PaypalUk_Block_Express_Shortcut::class,
-            'paypal/adminhtml_settlement_details' => \Mage_Paypal_Block_Adminhtml_Settlement_Details::class,
-            'paypal/adminhtml_settlement_details_form' => \Mage_Paypal_Block_Adminhtml_Settlement_Details_Form::class,
-            'paypal/adminhtml_settlement_report' => \Mage_Paypal_Block_Adminhtml_Settlement_Report::class,
-            'paypal/adminhtml_settlement_report_grid' => \Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid::class,
-            'paypal/adminhtml_system_config_apiWizard' => \Mage_Paypal_Block_Adminhtml_System_Config_ApiWizard::class,
-            'paypal/adminhtml_system_config_bmlApiWizard' => \Mage_Paypal_Block_Adminhtml_System_Config_BmlApiWizard::class,
-            'paypal/adminhtml_system_config_field_country' => \Mage_Paypal_Block_Adminhtml_System_Config_Field_Country::class,
-            'paypal/adminhtml_system_config_field_hidden' => \Mage_Paypal_Block_Adminhtml_System_Config_Field_Hidden::class,
-            'paypal/adminhtml_system_config_field_solutionType' => \Mage_Paypal_Block_Adminhtml_System_Config_Field_SolutionType::class,
-            'paypal/adminhtml_system_config_fieldset_deprecated' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated::class,
-            'paypal/adminhtml_system_config_fieldset_expanded' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded::class,
-            'paypal/adminhtml_system_config_fieldset_global' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Global::class,
-            'paypal/adminhtml_system_config_fieldset_group' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Group::class,
-            'paypal/adminhtml_system_config_fieldset_hint' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Hint::class,
-            'paypal/adminhtml_system_config_fieldset_location' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Location::class,
-            'paypal/adminhtml_system_config_fieldset_pathDependent' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_PathDependent::class,
-            'paypal/adminhtml_system_config_fieldset_payment' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment::class,
-            'paypal/adminhtml_system_config_fieldset_store' => \Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Store::class,
-            'paypal/adminhtml_system_config_payflowlink_advanced' => \Mage_Paypal_Block_Adminhtml_System_Config_Payflowlink_Advanced::class,
-            'paypal/adminhtml_system_config_payflowlink_info' => \Mage_Paypal_Block_Adminhtml_System_Config_Payflowlink_Info::class,
-            'paypal/bml_banners' => \Mage_Paypal_Block_Bml_Banners::class,
-            'paypal/bml_form' => \Mage_Paypal_Block_Bml_Form::class,
-            'paypal/express_form' => \Mage_Paypal_Block_Express_Form::class,
-            'paypal/express_review' => \Mage_Paypal_Block_Express_Review::class,
-            'paypal/express_review_billing' => \Mage_Paypal_Block_Express_Review_Billing::class,
-            'paypal/express_review_details' => \Mage_Paypal_Block_Express_Review_Details::class,
-            'paypal/express_review_shipping' => \Mage_Paypal_Block_Express_Review_Shipping::class,
-            'paypal/express_shortcut' => \Mage_Paypal_Block_Express_Shortcut::class,
-            'paypal/hosted_pro_form' => \Mage_Paypal_Block_Hosted_Pro_Form::class,
-            'paypal/hosted_pro_iframe' => \Mage_Paypal_Block_Hosted_Pro_Iframe::class,
-            'paypal/hosted_pro_info' => \Mage_Paypal_Block_Hosted_Pro_Info::class,
-            'paypal/iframe' => \Mage_Paypal_Block_Iframe::class,
-            'paypal/logo' => \Mage_Paypal_Block_Logo::class,
-            'paypal/payflow_advanced_form' => \Mage_Paypal_Block_Payflow_Advanced_Form::class,
-            'paypal/payflow_advanced_iframe' => \Mage_Paypal_Block_Payflow_Advanced_Iframe::class,
-            'paypal/payflow_advanced_info' => \Mage_Paypal_Block_Payflow_Advanced_Info::class,
-            'paypal/payflow_advanced_review' => \Mage_Paypal_Block_Payflow_Advanced_Review::class,
-            'paypal/payflow_link_form' => \Mage_Paypal_Block_Payflow_Link_Form::class,
-            'paypal/payflow_link_iframe' => \Mage_Paypal_Block_Payflow_Link_Iframe::class,
-            'paypal/payflow_link_info' => \Mage_Paypal_Block_Payflow_Link_Info::class,
-            'paypal/payflow_link_review' => \Mage_Paypal_Block_Payflow_Link_Review::class,
-            'paypal/payment_info' => \Mage_Paypal_Block_Payment_Info::class,
-            'paypal/standard_form' => \Mage_Paypal_Block_Standard_Form::class,
-            'paypal/standard_redirect' => \Mage_Paypal_Block_Standard_Redirect::class,
+            'paypal/adminhtml_debug' => \Mage_Paypal_Block_Adminhtml_Debug::class,
+            'paypal/adminhtml_debug_grid' => \Mage_Paypal_Block_Adminhtml_Debug_Grid::class,
+            'paypal/adminhtml_debug_grid_renderer_message' => \Mage_Paypal_Block_Adminhtml_Debug_Grid_Renderer_Message::class,
+            'paypal/adminhtml_debug_grid_renderer_request' => \Mage_Paypal_Block_Adminhtml_Debug_Grid_Renderer_Request::class,
+            'paypal/adminhtml_debug_grid_renderer_response' => \Mage_Paypal_Block_Adminhtml_Debug_Grid_Renderer_Response::class,
+            'paypal/adminhtml_grid_renderer_json' => \Mage_Paypal_Block_Adminhtml_Grid_Renderer_Json::class,
+            'paypal/adminhtml_grid_renderer_order' => \Mage_Paypal_Block_Adminhtml_Grid_Renderer_Order::class,
+            'paypal/adminhtml_info' => \Mage_Paypal_Block_Adminhtml_Info::class,
+            'paypal/form' => \Mage_Paypal_Block_Form::class,
+            'paypal/info' => \Mage_Paypal_Block_Info::class,
             'persistent/form_remember' => \Mage_Persistent_Block_Form_Remember::class,
             'persistent/header_additional' => \Mage_Persistent_Block_Header_Additional::class,
             'productalert/email_abstract' => \Mage_ProductAlert_Block_Email_Abstract::class,