Merge branch 'main' into spellcheck

Author: sreichel

.all-contributorsrc

@@ -1625,6 +1625,51 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "nprovoost",
+      "name": "Nicky",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25850269?v=4",
+      "profile": "http://twopointzero.eu",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "pauldpauld",
+      "name": "pauldpauld",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1549372?v=4",
+      "profile": "https://alond.com.au/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "PapaDragonov",
+      "name": "PapaDragonov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17141028?v=4",
+      "profile": "https://github.com/PapaDragonov",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "magentox",
+      "name": "magentox",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44047835?v=4",
+      "profile": "https://github.com/magentox",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "stasadev",
+      "name": "Stanislav Zhuk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24270994?v=4",
+      "profile": "https://github.com/stasadev",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

.ddev/commands/web/openmage-admin

@@ -29,14 +29,14 @@ fi
 RANDOM_STRING=$({ tr -dc A-Za-z0-9 </dev/urandom | head -c 32 ; })
 
 if [[ "${ACTION}" =~ ^(update|u) ]]; then
-  if mysql -u db -h db db -e "UPDATE "${TABLE_PREFIX}"admin_user SET password=CONCAT(MD5('"${RANDOM_STRING}""${ADMIN_PASSWORD}"'),':"${RANDOM_STRING}"') WHERE username='"${ADMIN_USER}"'"; then
+  if mysql -u db -pdb -h db db -e "UPDATE "${TABLE_PREFIX}"admin_user SET password=CONCAT(MD5('"${RANDOM_STRING}""${ADMIN_PASSWORD}"'),':"${RANDOM_STRING}"') WHERE username='"${ADMIN_USER}"'"; then
     echo "If the account "${ADMIN_USER}" exists it has been updated."
   else
     exit 1
   fi
 elif [[ "${ACTION}" =~ ^(create|c) ]]; then
-  if mysql -u db -h db db -e "INSERT INTO "${TABLE_PREFIX}"admin_user (firstname, lastname, email, username, password) VALUES ('"${ADMIN_FIRSTNAME}"', '"${ADMIN_LASTNAME}"', '"${ADMIN_EMAIL}"', '"${ADMIN_USER}"', CONCAT(MD5('"${RANDOM_STRING}""${ADMIN_PASSWORD}"'), ':"${RANDOM_STRING}"'))"; then
-    mysql -u db -h db db -e "INSERT INTO "${TABLE_PREFIX}"admin_role(parent_id, tree_level, sort_order, role_type, user_id, role_name)
+  if mysql -u db -pdb -h db db -e "INSERT INTO "${TABLE_PREFIX}"admin_user (firstname, lastname, email, username, password) VALUES ('"${ADMIN_FIRSTNAME}"', '"${ADMIN_LASTNAME}"', '"${ADMIN_EMAIL}"', '"${ADMIN_USER}"', CONCAT(MD5('"${RANDOM_STRING}""${ADMIN_PASSWORD}"'), ':"${RANDOM_STRING}"'))"; then
+    mysql -u db -pdb -h db db -e "INSERT INTO "${TABLE_PREFIX}"admin_role(parent_id, tree_level, sort_order, role_type, user_id, role_name)
     VALUES (1, 2, 0, 'U',(SELECT user_id FROM "${TABLE_PREFIX}"admin_user WHERE username = '"${ADMIN_USER}"'),'"${ADMIN_FIRSTNAME}"')"
     echo "The account "$ADMIN_USER" has been created."
   else

.ddev/commands/web/openmage-install

@@ -53,7 +53,7 @@ if [ -f "${LOCALXML}" ]; then
   fi
 
   if [[ "${DELETE}" =~ ^(yes|y) ]]; then
-    mysql -u db -h db -e "DROP SCHEMA IF EXISTS db; CREATE SCHEMA db;";
+    mysql -u db -pdb -h db -e "DROP SCHEMA IF EXISTS db; CREATE SCHEMA db;";
     rm "${LOCALXML}"
   else
     exit 1
@@ -96,7 +96,7 @@ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
   rm -rf "${ROOT}"/"${DDEV_DOCROOT}/var/cache/"*
 
   echo "Importing Sample Data into the database..."
-  mysql -u db -h db db < "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql
+  mysql -u db -pdb -h db db < "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql
 
   # remove sample data
   if [[ "${SAMPLE_DATA_KEEP_FLAG}" ]]; then

.gitattributes

@@ -1,5 +1,4 @@
 # Make packagist / composer download smaller
-/.ddev export-ignore
 /.github export-ignore
 /dev export-ignore
 /docs export-ignore

.github/release-drafter.yml

@@ -25,8 +25,8 @@ categories:
       - 'dependencies'
 change-template: '- $TITLE ([#$NUMBER](https://github.com/OpenMage/magento-lts/pull/$NUMBER))'
 change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
-exclude-contributors:
-  - 'allcontributors'
+exclude-labels:
+  - 'allcontributors-bot'
 version-resolver:
   major:
     labels:

.rector.php

@@ -7,17 +7,20 @@
 use Rector\DeadCode\Rector as DeadCode;
 use Rector\Exception\Configuration\InvalidConfigurationException;
 use Rector\Php53\Rector as Php53;
-use Rector\Php70\Rector as Php70;
 use Rector\Php71\Rector as Php71;
 use Rector\Php73\Rector as Php73;
 use Rector\Php74\Rector as Php74;
 use Rector\Php80\Rector as Php80;
+use Rector\Php81\Rector as Php81;
+use Rector\Php82\Rector as Php82;
+use Rector\Php83\Rector as Php83;
+use Rector\Php84\Rector as Php84;
 use Rector\TypeDeclaration\Rector as TypeDeclaration;
 
 try {
     return RectorConfig::configure()
         ->withPhpSets(
-            php56: true,
+            php74: true,
         )
         ->withPaths([
             __DIR__,
@@ -26,15 +29,18 @@
         ->withSkip([
             CodeQuality\BooleanNot\SimplifyDeMorganBinaryRector::class,
             CodeQuality\If_\SimplifyIfReturnBoolRector::class,
-            # may conflict with phpstan strict rules
+            # skip: may conflict with phpstan strict rules
             Php53\Ternary\TernaryToElvisRector::class,
-            Php70\FuncCall\RandomFunctionRector::class,
-            Php71\FuncCall\RemoveExtraParametersRector::class,
+            Php71\FuncCall\RemoveExtraParametersRector::class, # todo: check later
+            # skip: causes syntax error in Varien_Db_Adapter_Pdo_Mysql
             Php73\FuncCall\RegexDashEscapeRector::class,
-            Php80\Class_\AnnotationToAttributeRector::class,
-            Php80\Class_\ClassPropertyAssignToConstructorPromotionRector::class,
-            Php80\Class_\StringableForToStringRector::class,
-            Php80\FunctionLike\MixedTypeRector::class,
+            # skip: causes issues with some tests
+            Php74\Closure\ClosureToArrowFunctionRector::class,
+            # skip: causes issues
+            Php74\Assign\NullCoalescingOperatorRector::class,
+            Php80\Class_\AnnotationToAttributeRector::class, # todo: wait for php80
+            Php80\Class_\ClassPropertyAssignToConstructorPromotionRector::class, # todo: wait for php80
+            Php80\Class_\StringableForToStringRector::class, # todo: wait for php80
             TypeDeclaration\ClassMethod\ReturnNeverTypeRector::class,
             __DIR__ . '/shell/translations.php',
             __DIR__ . '/shell/update-copyright.php',
@@ -52,7 +58,7 @@
             CodeQuality\NotEqual\CommonNotEqualRector::class,
             CodeQuality\LogicalAnd\LogicalToBooleanRector::class,
             CodeQuality\Ternary\SimplifyTautologyTernaryRector::class,
-            #CodingStyle\FuncCall\ConsistentImplodeRector::class,
+            CodingStyle\FuncCall\ConsistentImplodeRector::class,
             DeadCode\ClassMethod\RemoveUselessParamTagRector::class,
             DeadCode\ClassMethod\RemoveUselessReturnTagRector::class,
             DeadCode\Property\RemoveUselessVarTagRector::class,

README.md

@@ -264,6 +264,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dford-avb"><img src="https://avatars.githubusercontent.com/u/52465239?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>David Ford</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.jandolejs.cz"><img src="https://avatars.githubusercontent.com/u/16374521?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Jan Dolejš</b></sub></a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://twopointzero.eu"><img src="https://avatars.githubusercontent.com/u/25850269?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Nicky</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://alond.com.au/"><img src="https://avatars.githubusercontent.com/u/1549372?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>pauldpauld</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PapaDragonov"><img src="https://avatars.githubusercontent.com/u/17141028?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>PapaDragonov</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/magentox"><img src="https://avatars.githubusercontent.com/u/44047835?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>magentox</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/stasadev"><img src="https://avatars.githubusercontent.com/u/24270994?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Stanislav Zhuk</b></sub></a></td>
+    </tr>
   </tbody>
 </table>
 

app/code/core/Mage/Admin/Model/Resource/User.php

@@ -237,10 +237,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user)
                 $this->saveReloadAclFlag($user, 1);
             }
             $adapter->commit();
-        } catch (Mage_Core_Exception $e) {
-            $adapter->rollBack();
-            throw $e;
-        } catch (Exception $e) {
+        } catch (Mage_Core_Exception|Exception $e) {
             $adapter->rollBack();
             throw $e;
         }

app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php

@@ -65,7 +65,7 @@ public function getResTreeJson()
 
     protected function _sortTree($a, $b)
     {
-        return $a['sort_order'] < $b['sort_order'] ? -1 : ($a['sort_order'] > $b['sort_order'] ? 1 : 0);
+        return $a['sort_order'] <=> $b['sort_order'];
     }
 
     protected function _getNodeJson($node, $level = 0)

app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php

@@ -169,7 +169,7 @@ public function generateChart(): array
             $this->setAxisLabels($axis, $this->getRowsData($attr, true));
         }
 
-        list($datas, $dates) = $this->getChartDatasAndDates();
+        [$datas, $dates] = $this->getChartDatasAndDates();
         $this->_axisLabels['x'] = $dates;
         $this->_allSeries = $datas;
 
@@ -234,7 +234,7 @@ private function getChartDatasAndDates(): array
     {
         $timezoneLocal = Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE);
 
-        list($dateStart, $dateEnd) = Mage::getResourceModel('reports/order_collection')
+        [$dateStart, $dateEnd] = Mage::getResourceModel('reports/order_collection')
             ->getDateRange($this->getDataHelper()->getParam('period'), '', '', true);
 
         $dateStart->setTimezone($timezoneLocal);