Merge branch '1.9.4.x' into upload_logo

Author: fballiano

.all-contributorsrc

@@ -10,6 +10,7 @@
   "commit": true,
   "commitConvention": "none",
   "contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" loading=\"lazy\" width=\"<%= options.imageSize %>\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
+  "badgeTemplate": "<a href=\"#contributors-\"><img src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\" alt=\"All Contributors\"></a>",
   "contributors": [
     {
       "login": "sreichel",
@@ -1332,7 +1333,10 @@
       "login": "cebe",
       "name": "Carsten Brandt",
       "avatar_url": "https://avatars.githubusercontent.com/u/189796?v=4",
-      "profile": "http://cebe.cc/"
+      "profile": "http://cebe.cc/",
+      "contributions": [
+        "code"
+      ]
     },
     {
       "login": "eneiasramos",
@@ -1351,6 +1355,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rfeese",
+      "name": "Roger Feese",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7074181?v=4",
+      "profile": "https://github.com/rfeese",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AGelzer",
+      "name": "Alexander Gelzer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34437931?v=4",
+      "profile": "https://github.com/AGelzer",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

.ddev/commands/web/rector

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+## Description: run rector
+## Usage: rector
+## Example: ddev rector <path-to-files>
+
+cp -n vendor/sreichel/openmage-rector/rector.php rector.php
+php vendor/bin/rector process "$@"

.ddev/commands/web/vendor-patches

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: create Vendor Patches
+## Usage: vendor-patches
+## Example: ddev vendor-patches
+
+php vendor/bin/vendor-patches generate

.github/codeql-config.yml

@@ -0,0 +1,22 @@
+
+paths-ignore:
+  - 'js/prototype/prototype.js'
+  - 'skin/frontend/rwd/default/js/lib/selectivizr.js'
+  - 'js/mage/adminhtml/flexuploader.js'
+  - 'js/mage/adminhtml/sales/packaging.js'
+  - 'js/mage/adminhtml/uploader/instance.js'
+  - 'js/mage/adminhtml/wysiwyg/tiny_mce/setup.js'
+  - 'js/prototype/validation.js'
+  - 'js/tiny_mce/tiny_mce_dev.js'
+  - 'js/tiny_mce/tiny_mce.js'
+  - 'js/tiny_mce/tiny_mce_src.js'
+  - 'js/tiny_mce/tiny_mce_jquery.js'
+  - 'js/tiny_mce/tiny_mce_jquery_src.js'
+  - 'js/tiny_mce/tiny_mce_prototype.js'
+  - 'js/tiny_mce/tiny_mce_prototype_src.js'
+  - 'js/tiny_mce/classes/**/*.js'
+  - 'js/tiny_mce/utils/**/*.js'
+  - 'js/tiny_mce/plugins/**/*.js'
+  - 'js/lib/jquery/jquery-1.12.4.js'
+  - 'js/extjs/ext-tree.js'
+  - '**/*.test.js'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,76 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "1.9.4.x", 20.0 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "1.9.4.x", 20.0 ]
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.3']
+        php-versions: ['7.4']
     steps:
     - name: Checkout repository
       uses: actions/checkout@master
@@ -26,9 +26,24 @@ jobs:
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: ${{ runner.os }}-composer-
 
+    - name: Require legacy frontend themes on v19
+      if: startsWith(github.event.release.tag_name, 'v19')
+      run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/legacy-frontend-themes
+
+    - name: Require Mage_Backup on v19
+      if: startsWith(github.event.release.tag_name, 'v19')
+      run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/module-mage-backup
+
+    - name: Require Mage_PageCache on v19
+      if: startsWith(github.event.release.tag_name, 'v19')
+      run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/module-mage-pagecache
+
     - name: Composer install
       run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* --no-dev
 
+    - name: Optimize autoloader
+      run: composer dump-autoload --optimize
+
     - name: Create ZIP file
       run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*'
 

.github/workflows/syntax-php.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.3', '8.1', '8.2']
+        php: ['7.4', '8.1', '8.2']
 
     name: PHP Syntax ${{ matrix.php }}
 

.github/workflows/workflow.yml

@@ -73,7 +73,7 @@ jobs:
 
   phpstan:
     name: PHPStan
-    needs: [check, composer, phpcs, php-cs-fixer]
+    needs: [check, composer]
     if: |
       needs.check.outputs.php > 0 ||
       needs.check.outputs.phpstan > 0 ||

.htaccess

@@ -197,6 +197,7 @@
     ExpiresByType text/x-javascript "access plus 1 month"
     ExpiresByType application/x-shockwave-flash "access plus 1 month"
     ExpiresByType image/x-icon "access plus 1 year"
+    ExpiresByType image/svg+xml "access plus 1 year"
     ExpiresDefault "access plus 2 days"
 </IfModule>
 

.phpstorm.meta.php/magento_blocks.meta.php

@@ -22,9 +22,6 @@
             'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class,
             'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class,
             'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class,
-            'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class,
-            'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class,
-            'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class,
             'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class,
             'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class,
             'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class,

.phpstorm.meta.php/magento_blocks_methods.meta.php

@@ -22,9 +22,6 @@
             'adminhtml/api_user_edit_tabs' => \Mage_Adminhtml_Block_Api_User_Edit_Tabs::class,
             'adminhtml/api_user_grid' => \Mage_Adminhtml_Block_Api_User_Grid::class,
             'adminhtml/api_users' => \Mage_Adminhtml_Block_Api_Users::class,
-            'adminhtml/backup' => \Mage_Adminhtml_Block_Backup::class,
-            'adminhtml/backup_dialogs' => \Mage_Adminhtml_Block_Backup_Dialogs::class,
-            'adminhtml/backup_grid' => \Mage_Adminhtml_Block_Backup_Grid::class,
             'adminhtml/cache' => \Mage_Adminhtml_Block_Cache::class,
             'adminhtml/cache_additional' => \Mage_Adminhtml_Block_Cache_Additional::class,
             'adminhtml/cache_grid' => \Mage_Adminhtml_Block_Cache_Grid::class,

.phpstorm.meta.php/magento_helpers.meta.php

@@ -30,8 +30,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,

.phpstorm.meta.php/magento_helpers_methods.meta.php

@@ -30,8 +30,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -223,8 +221,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -416,8 +412,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -609,8 +603,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -802,8 +794,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -995,8 +985,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -1188,8 +1176,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -1381,8 +1367,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -1574,8 +1558,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -1767,8 +1749,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -1960,8 +1940,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -2153,8 +2131,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -2346,8 +2322,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -2539,8 +2513,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -2732,8 +2704,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,
@@ -2925,8 +2895,6 @@
             'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
             'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
             'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
-            'backup' => \Mage_Backup_Helper_Data::class,
-            'backup/data' => \Mage_Backup_Helper_Data::class,
             'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
             'bundle' => \Mage_Bundle_Helper_Data::class,
             'bundle/data' => \Mage_Bundle_Helper_Data::class,