Merge branch 'main' into documentation

.ddev/commands/web/localdev

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+## Description: create local development directory
+## Usage: localdev
+## Example: ddev localdev <git-url>
+
+if [ ! -d ".localdev/" ]
+then
+     mkdir ".localdev/"
+     echo "Directory created."
+fi
+
+if ! grep -q "./.localdev/*" composer.json; then
+  php vendor/bin/composer config repositories.local '{"type": "path", "url": "./.localdev/*", "canonical": false}'
+  echo "Patched composer.json."
+fi
+
+cd ".localdev/" || exit
+git clone "$@"

app/code/core/Mage/Customer/controllers/AccountController.php

@@ -932,7 +932,7 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi
         }
 
         $customerToken = $customer->getRpToken();
-        if (strcmp($customerToken, $resetPasswordLinkToken) != 0 || $customer->isResetPasswordLinkTokenExpired()) {
+        if (is_null($customerToken) || strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) {
             throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));
         }
     }

composer.json

@@ -38,6 +38,7 @@
     },
     "require-dev": {
         "ext-xmlreader": "*",
+        "composer/composer": "^2.7",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "macopedia/phpstan-magento1": "^1.0.5",