Merge branch 'main' into setpart_is_wrong

.all-contributorsrc

@@ -1382,6 +1382,78 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "gorbunovav",
+      "name": "Andrey Gorbunov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2665015?v=4",
+      "profile": "https://github.com/gorbunovav",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Tomasz-Silpion",
+      "name": "Tomasz Gregorczyk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5328659?v=4",
+      "profile": "https://github.com/Tomasz-Silpion",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Judx",
+      "name": "Juho Hölsä",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15036353?v=4",
+      "profile": "https://juhoholsa.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "seifer7",
+      "name": "Kane",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13601073?v=4",
+      "profile": "https://github.com/seifer7",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "leissbua",
+      "name": "Michael Leiss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68073221?v=4",
+      "profile": "https://github.com/leissbua",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "massa-man",
+      "name": "Marcos Steverlynck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26821235?v=4",
+      "profile": "https://www.riseart.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ahudock",
+      "name": "Andy Hudock",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33500977?v=4",
+      "profile": "https://github.com/ahudock",
+      "contributions": [
+        "code"
+      ]
+  },
+  {
+      "login": "ma4nn",
+      "name": "Christoph Massmann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26252058?v=4",
+      "profile": "https://www.vianetz.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

.ddev/commands/web/openmage-admin

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+## ProjectTypes: magento
+## Description: Create/Update OpenMage Administrator Account
+## Usage: openmage-admin
+## Example: ddev openmage-admin
+
+read -r -p "Choose your action for the administrator account [Create/Update]: " ACTION
+ACTION=${ACTION,,} # to lower
+
+if [[ "${ACTION}" =~ ^(update|u) || "${ACTION}" =~ ^(create|c) ]]; then
+  read -r -p "Admin User [admin]: " ADMIN_USER
+  ADMIN_USER=${ADMIN_USER:-admin}
+  read -r -p "Admin Firstname [OpenMage]: " ADMIN_FIRSTNAME
+  ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-OpenMage}
+  read -r -p "Admin Lastname [Administrator]: " ADMIN_LASTNAME
+  ADMIN_LASTNAME=${ADMIN_LASTNAME:-Administrator}
+  read -r -p "Admin Email [[email protected]]: " ADMIN_EMAIL
+  ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+  read -r -p "Admin Password [veryl0ngpassw0rd]: " ADMIN_PASSWORD
+  ADMIN_PASSWORD=${ADMIN_PASSWORD:-veryl0ngpassw0rd}
+  read -r -p "Table Prefix []: " TABLE_PREFIX
+  TABLE_PREFIX=${TABLE_PREFIX:-}
+else
+  echo "Please run again and choose an action."
+  exit 1
+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
+    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)
+    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
+    exit 1
+  fi
+fi

.ddev/commands/web/openmage-install

@@ -0,0 +1,168 @@
+#!/bin/bash
+
+## ProjectTypes: magento
+## Description: Install OpenMage
+## Usage: openmage-install [-d|--default] [-s|--sampledata] [-k|--keep] [-q|--quiet]
+## Example: ddev openmage-install -d -s -k
+## Flags: [{"Name":"default","Shorthand":"d","Usage":"use default values"},{"Name":"sampledata","Shorthand":"s","Usage":"install sample data"},{"Name":"keep","Shorthand":"k","Usage":"keep sample data package"},{"Name":"quiet","Shorthand":"q","Usage":"silent install with sample data"}]
+
+ROOT="${PWD}"
+
+QUIET_INSTALL_FLAG=''
+SAMPLE_DATA_FLAG=''
+SAMPLE_DATA_KEEP_FLAG=''
+USE_DEFAULT_FLAG=''
+
+while :; do
+     case ${1:-} in
+         -d|--default)
+            USE_DEFAULT_FLAG='true' ;;
+         -s|--sampledata)
+            SAMPLE_DATA_FLAG='true' ;;
+         -k|--keep)
+            SAMPLE_DATA_KEEP_FLAG='true' ;;
+         -q|--quiet)
+            QUIET_INSTALL_FLAG='true'
+            USE_DEFAULT_FLAG='true'
+            SAMPLE_DATA_FLAG='true'
+            ;;
+         --)              # End of all options.
+             shift
+             break
+             ;;
+         -?*)
+             printf 'WARN: Unknown option (ignored): %s\n' "$1" >&2
+             ;;
+         *)               # Default case: No more options, so break out of the loop.
+             break
+     esac
+
+     shift
+ done
+
+echo "Enable maintenance mode..."
+touch maintenance.flag
+
+LOCALXML="${ROOT}/app/etc/local.xml"
+if [ -f "${LOCALXML}" ]; then
+  if [[ "${QUIET_INSTALL_FLAG}" ]]; then
+    DELETE='y'
+  else
+    read -r -p "OpenMage is already installed. Delete local.xml and drop the database? [y/N] " DELETE
+    DELETE=${DELETE,,} # to lower
+  fi
+
+  if [[ "${DELETE}" =~ ^(yes|y) ]]; then
+    mysql -u db -h db -e "DROP SCHEMA IF EXISTS db; CREATE SCHEMA db;";
+    rm "${LOCALXML}"
+  else
+    exit 1
+  fi
+fi
+
+# install sample data
+if [[ "${SAMPLE_DATA_FLAG}" ]]; then
+  INSTALL_SAMPLE_DATA='y'
+else
+  read -r -p "Install Sample Data? [y/N] " INSTALL_SAMPLE_DATA
+  INSTALL_SAMPLE_DATA=${INSTALL_SAMPLE_DATA,,} # to lower
+fi
+
+if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
+  SAMPLE_DATA_URL=https://github.com/Vinai/compressed-magento-sample-data/raw/master/compressed-magento-sample-data-1.9.2.4.tgz
+  SAMPLE_DATA_DIRECTORY="${ROOT}/.ddev/.sampleData"
+  SAMPLE_DATA_FILE=sample_data.tgz
+
+  if [[ ! -d "${SAMPLE_DATA_DIRECTORY}" ]]; then
+    echo "Creating Sample Data directory..."
+    mkdir -p "${SAMPLE_DATA_DIRECTORY}"
+  fi
+
+  cd "${SAMPLE_DATA_DIRECTORY}" || exit
+  if [[ ! -f "${SAMPLE_DATA_DIRECTORY}/${SAMPLE_DATA_FILE}" ]]; then
+    echo "Downloading Sample Data..."
+    wget "${SAMPLE_DATA_URL}" -O "${SAMPLE_DATA_FILE}"
+  fi
+
+  echo "Uncompressing Sample Data..."
+  tar xf "${SAMPLE_DATA_FILE}"
+
+  echo "Copying Sample Data into the OpenMage directory..."
+  cp -r magento-sample-data-1.9.2.4/media/* "${ROOT}/media/"
+  cp -r magento-sample-data-1.9.2.4/skin/* "${ROOT}/skin/"
+
+  echo "Clearing var/cache..."
+  rm -rf "${ROOT}/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"
+
+  # remove sample data
+  if [[ "${SAMPLE_DATA_KEEP_FLAG}" ]]; then
+    # shellcheck disable=SC2046
+    rm -rf magento-sample-data-1.9.2.4/
+  else
+    cd "${ROOT}" || exit
+    rm -rf "${SAMPLE_DATA_DIRECTORY}"
+  fi
+fi
+
+cd "${ROOT}" || exit
+
+if [[ "${USE_DEFAULT_FLAG}" ]]; then
+  ADMIN_USER='admin'
+  ADMIN_FIRSTNAME='OpenMage'
+  ADMIN_LASTNAME='Administrator'
+  ADMIN_EMAIL='[email protected]'
+  ADMIN_PASSWORD='veryl0ngpassw0rd'
+  if [[ "${SAMPLE_DATA_FLAG}" ]]; then
+    TABLE_PREFIX=''
+  else
+    TABLE_PREFIX='om_'
+  fi
+else
+  read -r -p "Admin User [admin]: " ADMIN_USER
+  ADMIN_USER=${ADMIN_USER:-admin}
+  read -r -p "Admin Firstname [OpenMage]: " ADMIN_FIRSTNAME
+  ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-OpenMage}
+  read -r -p "Admin Lastname [Administrator]: " ADMIN_LASTNAME
+  ADMIN_LASTNAME=${ADMIN_LASTNAME:-Administrator}
+  read -r -p "Admin Email [[email protected]]: " ADMIN_EMAIL
+  ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+  read -r -p "Admin Password [veryl0ngpassw0rd]: " ADMIN_PASSWORD
+  ADMIN_PASSWORD=${ADMIN_PASSWORD:-veryl0ngpassw0rd}
+  if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
+    TABLE_PREFIX=''
+  else
+    read -r -e -i 'om_' -p "Table Prefix [om_]: " TABLE_PREFIX
+  fi
+fi
+
+php -f install.php -- \
+  --license_agreement_accepted 'yes' \
+  --locale 'en_US' \
+  --timezone 'America/New_York' \
+  --db_host 'db' \
+  --db_name 'db' \
+  --db_user 'db' \
+  --db_pass 'db' \
+  --db_prefix "${TABLE_PREFIX}" \
+  --url "${DDEV_PRIMARY_URL}" \
+  --use_rewrites 'yes' \
+  --use_secure 'yes' \
+  --secure_base_url "${DDEV_PRIMARY_URL}" \
+  --use_secure_admin 'yes' \
+  --admin_username "${ADMIN_USER}" \
+  --admin_lastname "${ADMIN_LASTNAME}" \
+  --admin_firstname "${ADMIN_FIRSTNAME}" \
+  --admin_email "${ADMIN_EMAIL}" \
+  --admin_password "${ADMIN_PASSWORD}" \
+  --session_save 'files' \
+  --admin_frontname 'admin' \
+  --backend_frontname 'admin' \
+  --default_currency 'USD' \
+  --enable_charts 'yes' \
+  --skip_url_validation 'yes'
+
+echo "Disable maintenance mode..."
+rm maintenance.flag

.ddev/web-build/openmage.cron

@@ -0,0 +1 @@
+* * * * * /var/www/html/cron.sh

.gitattributes

@@ -0,0 +1,37 @@
+# Make packagist / composer download smaller
+/.ddev export-ignore
+/.github export-ignore
+/dev export-ignore
+/docs export-ignore
+
+/.all-contributorsrc export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.gitpod.yml export-ignore
+
+/.php-cs-fixer.dist.php export-ignore
+/.phpcs.ecg.xml.dist export-ignore
+/.phpcs.php.xml.dist export-ignore
+/.phpcs.xml.dist export-ignore
+/.phpmd.dist.xml export-ignore
+/phpstan.dist.baseline.neon export-ignore
+/phpstan.dist.issues.neon export-ignore
+/phpstan.dist.neon export-ignore
+
+/README.md export-ignore
+
+# Enforce checkout with linux lf consistent over all platforms
+*.html text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.php text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.xml text eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
+*.svg text eol=lf
+*.txt text eol=lf
+*.phtml text eol=lf

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+
+open_collective: openmage