Merge branch 'main' into spellcheck

Author: sreichel

.all-contributorsrc

@@ -1670,6 +1670,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Axepih",
+      "name": "Axepih",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95623175?v=4",
+      "profile": "https://github.com/Axepih",
+      "contributions": [
+        "review"
+      ]
     }
   ],
   "commitType": "docs"

.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

.gitignore

@@ -26,6 +26,9 @@
 # ChartJs library
 /js/lib/chartjs
 
+# jQuery library
+/js/lib/jquery/jquery*
+
 # TinyMCE library
 /js/lib/tinymce
 

.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
 
 		-

README.md

@@ -270,6 +270,7 @@ 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/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>
     </tr>
   </tbody>
 </table>

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>

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">

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>

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",