Merge branch 'main' into issue4501_api2_exception_noise

Author: sreichel

.all-contributorsrc

@@ -1526,6 +1526,178 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "justlife4x4",
+      "name": "justlife4x4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59994040?v=4",
+      "profile": "https://github.com/justlife4x4",
+      "contributions": [
+        "security"
+      ]
+    },
+    {
+      "login": "fabianaromagnoli",
+      "name": "Fabiana Romagnoli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23638004?v=4",
+      "profile": "https://github.com/fabianaromagnoli",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "aamant",
+      "name": "Arnaud Amant",
+      "avatar_url": "https://avatars.githubusercontent.com/u/393311?v=4",
+      "profile": "http://arnaudamant.fr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "matteotestoni",
+      "name": "matteotestoni",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34275189?v=4",
+      "profile": "https://github.com/matteotestoni",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "mmenozzi",
+      "name": "Manuele Menozzi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1199914?v=4",
+      "profile": "https://www.webgriffe.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "darinda",
+      "name": "Rene Hrdina",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8490373?v=4",
+      "profile": "https://github.com/darinda",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Hanmac",
+      "name": "Hans Mackowiak",
+      "avatar_url": "https://avatars.githubusercontent.com/u/225553?v=4",
+      "profile": "https://github.com/Hanmac",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "tim-breitenstein-it",
+      "name": "Tim Steinbrecher",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65597245?v=4",
+      "profile": "https://github.com/tim-breitenstein-it",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tomekjordan",
+      "name": "Tomek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8250276?v=4",
+      "profile": "https://github.com/tomekjordan",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "dford-avb",
+      "name": "David Ford",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52465239?v=4",
+      "profile": "https://github.com/dford-avb",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "jandolejs",
+      "name": "Jan Dolejš",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16374521?v=4",
+      "profile": "https://www.jandolejs.cz",
+      "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"
+      ]
+    },
+    {
+      "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"
+      ]
+    },
+    {
+      "login": "denisahac",
+      "name": "Den Isahac",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6700576?v=4",
+      "profile": "http://www.denisahac.xyz",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "commitType": "docs"

.cypress.config.js

@@ -1,8 +1,8 @@
 module.exports = {
-  e2e: {
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
-    baseUrl: 'https://magento-lts.ddev.site'
-  },
+    e2e: {
+        setupNodeEvents(on, config) {
+            // implement node event listeners here
+        },
+        baseUrl: 'https://magento-lts.ddev.site',
+    }
 };

.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
@@ -24,6 +23,8 @@
 
 /README.md export-ignore
 
+/Makefile export-ignore
+
 # Enforce checkout with linux lf consistent over all platforms
 *.html text eol=lf
 *.css text eol=lf

.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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,57 @@
+name: 🐛 Bug report
+description: File a bug/issue
+title: "[BUG] <title>"
+labels: ["bug", "review needed"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        1. With this config...
+        1. Run '...'
+        1. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OpenMage**: 20.12.2
+          - **php**: 7.4
+      value: |
+        - OpenMage:
+        - php:
+      render: markdown
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+        
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false