Merge branch 'OpenMage:main' into cypress-test

sreichel · web-flow · commit 4b9d0fd9357c · 2025-04-19T17:35:13.000+02:00
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1661,6 +1661,34 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "stasadev",
+      "name": "Stanislav Zhuk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24270994?v=4",
+      "profile": "https://github.com/stasadev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Axepih",
+      "name": "Axepih",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95623175?v=4",
+      "profile": "https://github.com/Axepih",
+      "contributions": [
+        "review"
+      ]
+    },
+    {
+      "login": "gdemarsico",
+      "name": "Gastón De Mársico",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2066819?v=4",
+      "profile": "https://github.com/gdemarsico",
+      "contributions": [
+        "code",
+        "bug"
+      ]
     }
   ],
   "commitType": "docs"
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -31,6 +31,27 @@ Examples of unacceptable behavior by participants include:
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
+### Attribution to Others
+
+We expect all contributors to provide appropriate attribution to others in appreciation
+of work performed or ideas inspired by other members of the OpenMage community or other communities.
+
+When creating a Pull Request or otherwise representing work or ideas to the community,
+if the work includes substantial code or inspiration leading directly to the authorship
+of specific lines of code taken from reading PRs, blog posts, release notes, etc. from
+another project (in particular Maho Commerce), website or other source, a mention must
+be made in the PR description or equivalent. The definition of "substantial" shall be
+as little as one line of code - if it's worth creating a commit and pull request for,
+it will be considered substantial.
+
+For example:
+
+> Credit for prior work inspiration to {ref}
+
+Additionally, if the file that the code was copied from or heavily inspired by, in whole
+or in part, contains a copyright notice on a single line, that line must also be copied
+to the corresponding file in OpenMage, even if the filenames are slightly different.
+
 ## Our Responsibilities
 
 Project maintainers are responsible for clarifying the standards of acceptable
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,9 @@
 # ChartJs library
 /js/lib/chartjs
 
+# jQuery library
+/js/lib/jquery/jquery*
+
 # TinyMCE library
 /js/lib/tinymce
 
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -1140,6 +1140,12 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Api2/Model/Resource.php
 
+		-
+			message: '#^Call to an undefined method Varien_Data_Collection_Db\:\:addAttributeToFilter\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: app/code/core/Mage/Api2/Model/Resource.php
+
 		-
 			message: '#^Method Mage_Api2_Model_Resource\:\:_create\(\) invoked with 1 parameter, 0 required\.$#'
 			identifier: arguments.count
@@ -6117,7 +6123,7 @@ parameters:
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
-			count: 2
+			count: 3
 			path: app/code/core/Mage/Tax/Helper/Data.php
 
 		-
diff --git a/README.md b/README.md
@@ -269,6 +269,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Axepih"><img src="https://avatars.githubusercontent.com/u/95623175?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Axepih</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gdemarsico"><img src="https://avatars.githubusercontent.com/u/2066819?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Gastón De Mársico</b></sub></a></td>
     </tr>
   </tbody>
 </table>
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
@@ -1520,7 +1520,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
             // optimize if using cat index
             $filters = $this->_productLimitationFilters;
             if (isset($filters['category_id']) || isset($filters['visibility'])) {
-                $this->getSelect()->order('cat_index.position ' . $dir);
+                $this->getSelect()->order(['cat_index.position ' . $dir, 'e.entity_id ' . $dir]);
             } else {
                 $this->getSelect()->order('e.entity_id ' . $dir);
             }
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
@@ -310,6 +310,9 @@
             <js>
                 <merge_files>0</merge_files>
             </js>
+            <jquery>
+                <migrate>0</migrate>
+            </jquery>
         </dev>
         <system>
             <csrf>
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
@@ -725,6 +725,24 @@
                         </merge_css_files>
                     </fields>
                 </css>
+                <jquery translate="label">
+                    <label>jQuery Settings</label>
+                    <sort_order>120</sort_order>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <migrate translate="label">
+                            <label>Load jQuery-migration.js</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>10</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </migrate>
+                    </fields>
+                </jquery>
             </groups>
         </dev>
         <general translate="label" module="core">
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
@@ -224,9 +224,16 @@ protected function _loadEntityAttributes($entityType, $storeId)
     {
         // preload attributes in array form to avoid instantiating
         // models for every attribute even if it is never accessed
-        $entityAttributes = $entityType->newAttributeCollection()
-            ->addStoreLabel($storeId)
-            ->getData();
+        $collection = $entityType->newAttributeCollection()
+            ->addStoreLabel($storeId);
+
+        // if collection supports per-website values, set website id
+        if ($collection instanceof Mage_Eav_Model_Resource_Attribute_Collection) {
+            $websiteId = Mage::app()->getStore($storeId)->getWebsiteId();
+            $collection->setWebsite($websiteId);
+        }
+
+        $entityAttributes = $collection->getData();
 
         $this->_entityTypeAttributes[$storeId][$entityType->getId()] = [];
         $attributeCodes = [];
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
@@ -140,7 +140,8 @@ public function newAttributeCollection($setId = null)
      */
     protected function _getAttributeCollection()
     {
-        $collection = Mage::getModel('eav/entity_attribute')->getCollection();
+        $collectionClass = $this->getEntityAttributeCollection();
+        $collection = Mage::getResourceModel($collectionClass);
         $objectsModel = $this->getAttributeModel();
         if ($objectsModel) {
             $collection->setModel($objectsModel);
diff --git a/app/design/frontend/rwd/default/layout/page.xml b/app/design/frontend/rwd/default/layout/page.xml
@@ -25,7 +25,10 @@
 
             <block type="page/html_head" name="head" as="head">
                 <action method="addJs"><script>prototype/prototype.js</script></action>
-                <action method="addJs"><script>lib/jquery/jquery-1.12.4.min.js</script></action>
+                <action method="addJs"><script>lib/jquery/jquery.min.js</script></action>
+                <action method="addJs" ifconfig="dev/jquery/migrate">
+                    <script>lib/jquery/jquery-migrate.min.js</script>
+                </action>
                 <action method="addJs"><script>lib/jquery/noconflict.js</script></action>
                 <action method="addJs"><script>lib/ccard.js</script></action>
                 <action method="addJs"><script>prototype/validation.js</script></action>
diff --git a/composer.json b/composer.json
@@ -28,6 +28,7 @@
         "composer-runtime-api": "^2",
         "colinmollenhour/cache-backend-redis": "^1.14",
         "colinmollenhour/magento-redis-session": "^3.2.0",
+        "components/jquery": "1.12.4",
         "cweagans/composer-patches": "^1.7",
         "ezyang/htmlpurifier": "^4.17",
         "flowjs/flowjs": "dev-master",
diff --git a/composer.lock b/composer.lock
diff --git a/docs/content/users/install/index.md b/docs/content/users/install/index.md
diff --git a/js/lib/jquery/jquery-1.12.4.js b/js/lib/jquery/jquery-1.12.4.js
diff --git a/js/lib/jquery/jquery-1.12.4.min.js b/js/lib/jquery/jquery-1.12.4.min.js
diff --git a/js/lib/jquery/jquery-1.12.4.min.map b/js/lib/jquery/jquery-1.12.4.min.map

Original file line number	Diff line number	Diff line change
`@@ -1140,6 +1140,12 @@ parameters:`
`1140`	`1140`	`count: 1`
`1141`	`1141`	`path: app/code/core/Mage/Api2/Model/Resource.php`
`1142`	`1142`
	`1143`	`+ -`
	`1144`	`+ message: '#^Call to an undefined method Varien_Data_Collection_Db\:\:addAttributeToFilter\(\)\.$#'`
	`1145`	`+ identifier: method.notFound`
	`1146`	`+ count: 1`
	`1147`	`+ path: app/code/core/Mage/Api2/Model/Resource.php`
	`1148`	`+`
`1143`	`1149`	`-`
`1144`	`1150`	`message: '#^Method Mage_Api2_Model_Resource\:\:_create\(\) invoked with 1 parameter, 0 required\.$#'`
`1145`	`1151`	`identifier: arguments.count`
`@@ -6117,7 +6123,7 @@ parameters:`
`6117`	`6123`	`-`
`6118`	`6124`	`message: '#^If condition is always false\.$#'`
`6119`	`6125`	`identifier: if.alwaysFalse`
`6120`		`- count: 2`
	`6126`	`+ count: 3`
`6121`	`6127`	`path: app/code/core/Mage/Tax/Helper/Data.php`
`6122`	`6128`
`6123`	`6129`	`-`
Original file line number	Diff line number	Diff line change
`@@ -1520,7 +1520,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)`
`1520`	`1520`	`// optimize if using cat index`
`1521`	`1521`	`$filters = $this->_productLimitationFilters;`
`1522`	`1522`	`if (isset($filters['category_id']) \|\| isset($filters['visibility'])) {`
`1523`		`- $this->getSelect()->order('cat_index.position ' . $dir);`
	`1523`	`+ $this->getSelect()->order(['cat_index.position ' . $dir, 'e.entity_id ' . $dir]);`
`1524`	`1524`	`} else {`
`1525`	`1525`	`$this->getSelect()->order('e.entity_id ' . $dir);`
`1526`	`1526`	`}`