Merge branch 'main' into phpstan-v2

Author: sreichel

.phpstan.dist.baseline.neon

@@ -4104,12 +4104,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Directory/Model/Observer.php
 
-		-
-			message: '#^Parameter \#2 \$countryId of method Mage_Directory_Model_Resource_Region\:\:_loadByCountry\(\) expects int, string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: app/code/core/Mage/Directory/Model/Resource/Region.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue

app/code/core/Mage/Checkout/controllers/CartController.php

@@ -533,6 +533,14 @@ public function estimatePostAction()
         $regionId   = (string) $this->getRequest()->getParam('region_id');
         $region     = (string) $this->getRequest()->getParam('region');
 
+        try {
+            Mage::getModel('directory/country')->loadByCode($country);
+        } catch (Mage_Core_Exception $e) {
+            $this->_getSession()->addError($e->getMessage());
+            $this->_goBack();
+            return;
+        }
+
         $this->_getQuote()->getShippingAddress()
             ->setCountryId($country)
             ->setCity($city)

app/code/core/Mage/Directory/Model/Resource/Region.php

@@ -84,7 +84,7 @@ protected function _getLoadSelect($field, $value, $object)
      * Load object by country id and code or default name
      *
      * @param Mage_Core_Model_Abstract $object
-     * @param int $countryId
+     * @param string $countryId
      * @param string $value
      * @param string $field
      *