merge

Author: fballiano

.all-contributorsrc

@@ -1327,7 +1327,22 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "cebe",
+      "name": "Carsten Brandt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/189796?v=4",
+      "profile": "http://cebe.cc/"
+    },
+    {
+      "login": "eneiasramos",
+      "name": "Enéias Ramos de Melo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2862728?v=4",
+      "profile": "https://github.com/eneiasramos",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7
-}
+}

.github/phpstan-baseline.neon

@@ -98,6 +98,12 @@ parameters:
         # Dataflow/Model/Convert/Iterator.php
         - */Dataflow/Model/Convert/Iterator.php
 
-    level: 0
+        # Too much noise from "Variable $this might not be defined"
+        - */app/code/core/*/*/data/*
+        - */app/code/core/*/*/sql/*
+    level: 2
+    checkFunctionNameCase: true
+    checkInternalClassCaseSensitivity: true
+
 #    universalObjectCratesClasses:
 #        - Varien_Object

.github/phpstan.neon

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     - name: php version
       run: php --version

.github/workflows/php.yml

@@ -17,7 +17,7 @@ jobs:
         operating-system: [ubuntu-latest]
         php-versions: ['7.4', '8.1']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

.github/workflows/sonar.yml

@@ -14,7 +14,7 @@ jobs:
         operating-system: [ubuntu-latest]
         php-versions: ['7.0', '7.4']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@master
         with:
@@ -44,7 +44,7 @@ jobs:
             '.github/phpstan.neon',
         ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
       - name: ensure existance of ./app/code/local
@@ -63,7 +63,7 @@ jobs:
         operating-system: [ubuntu-latest]
         php-versions: ['8.0','8.1']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@master
         with:
@@ -100,7 +100,7 @@ jobs:
           - directories: 'lib/'
             config_files: '.github/phpstan.neon'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
       - name: ensure existance of ./app/code/local

.github/workflows/static-code-analyses.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: OpenMage/Testfield
           path: ./
@@ -22,7 +22,7 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-reqs
 
       - name: Checkout OpenMage repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: openmage
 

.github/workflows/unit-tests.yml

@@ -2,9 +2,13 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 <a href="#contributors-"><img src="https://img.shields.io/badge/all_contributors-146-orange.svg?style=flat-square" alt="All Contributors"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
-<a href="https://travis-ci.org/openmage/magento-lts"><img src="https://travis-ci.org/openmage/magento-lts.svg" alt="Build Status"></a>
 <a href="https://packagist.org/packages/openmage/magento-lts"><img src="https://poser.pugx.org/openmage/magento-lts/d/total.svg" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/openmage/magento-lts"><img src="https://poser.pugx.org/openmage/magento-lts/license.svg" alt="License"></a>
+<br />
+<img src="https://github.com/openmage/magento-lts/actions/workflows/php.yml/badge.svg" alt="PHP workflow Badge" />
+<img src="https://github.com/openmage/magento-lts/actions/workflows/sonar.yml/badge.svg" alt="Sonar workflow badge" />
+<img src="https://github.com/openmage/magento-lts/actions/workflows/static-code-analyses.yml/badge.svg" alt="Static Code Analyses workflow badge" />
+<img src="https://github.com/openmage/magento-lts/actions/workflows/unit-tests.yml/badge.svg" alt="Unit Tests workflow badge" />
 </p>
 
 # Magento - Long Term Support
@@ -75,7 +79,8 @@ Most important changes will be listed here, all other changes since `19.4.0` can
 
 ### Between Magento 1.9.4.5 and OpenMage 19.x
 
-Bug fixes and PHP 7.x and 8.0 compatibility.
+- bug fixes and PHP 7.x and 8.0 compatibility
+- added config cache for system.xml #1916
 
 ### Between OpenMage 19.x and 20.x
 
@@ -99,7 +104,11 @@ For full list of changes, you can [compare tags](https://github.com/OpenMage/mag
 - `admin/emails/admin_notification_email_template`
 - `catalog/product_image/progressive_threshold`
 - `catalog/search/search_separator`
+- `dev/log/max_level`
 - `newsletter/security/enable_form_key`
+- `sitemap/category/lastmod`
+- `sitemap/page/lastmod`
+- `sitemap/product/lastmod`
 
 ### New Events
 
@@ -112,14 +121,6 @@ For full list of changes, you can [compare tags](https://github.com/OpenMage/mag
 
 [Full list of events](EVENTS.md)
 
-### New Translations
-
-There are some new or changed translations, if you want add them to your locale pack please check:
-
-- `app/locale/en_US/Adminhtml_LTS.csv`
-- `app/locale/en_US/Core_LTS.csv`
-- `app/locale/en_US/Sales_LTS.csv`
-
 ### Removed Modules
 
 - `Mage_Compiler`
@@ -363,6 +364,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/mdlonline"><img src="https://avatars.githubusercontent.com/u/5389528?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>mdlonline</b></sub></a></td>
     <td align="center"><a href="https://www.developpeur-web-tlse.fr/"><img src="https://avatars.githubusercontent.com/u/5030086?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Benjamin MARROT</b></sub></a></td>
     <td align="center"><a href="https://github.com/tmewes"><img src="https://avatars.githubusercontent.com/u/12640514?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Tino Mewes</b></sub></a></td>
+    <td align="center"><a href="http://cebe.cc/"><img src="https://avatars.githubusercontent.com/u/189796?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Carsten Brandt</b></sub></a><br /><a href="https://github.com/OpenMage/magento-lts/commits?author=cebe" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/eneiasramos"><img src="https://avatars.githubusercontent.com/u/2862728?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Enéias Ramos de Melo</b></sub></a></td>
   </tr>
 </table>
 

README.md

@@ -25,7 +25,7 @@
  */
 
 if (version_compare(phpversion(), '7.0.0', '<')===true) {
-    echo 'It looks like you have an invalid PHP version. Magento supports PHP 7.0.0 or newer';
+    echo 'It looks like you have an invalid PHP version. OpenMage supports PHP 7.0.0 or newer';
     exit;
 }
 

api.php

@@ -147,7 +147,6 @@ final class Mage
 
     /**
      * Gets the current Magento version string
-     * @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
      *
      * @return string
      */
@@ -160,7 +159,6 @@ public static function getVersion()
 
     /**
      * Gets the detailed Magento version information
-     * @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
      *
      * @return array
      */
@@ -404,7 +402,7 @@ public static function getModuleDir($type, $moduleName)
      * Retrieve config value for store by path
      *
      * @param string $path
-     * @param mixed $store
+     * @param null|string|bool|int|Mage_Core_Model_Store $store
      * @return mixed
      */
     public static function getStoreConfig($path, $store = null)
@@ -865,7 +863,18 @@ public static function log($message, $level = null, $file = '', $forceLog = fals
 
         static $loggers = array();
 
+        try {
+            $maxLogLevel = (int) self::getStoreConfig('dev/log/max_level');
+        } catch (Throwable $e) {
+            $maxLogLevel = Zend_Log::DEBUG;
+        }
+
         $level  = is_null($level) ? Zend_Log::DEBUG : $level;
+
+        if (!self::$_isDeveloperMode && $level > $maxLogLevel) {
+            return;
+        }
+
         $file = empty($file) ?
             (string) self::getConfig()->getNode('dev/log/file', Mage_Core_Model_Store::DEFAULT_CODE) : basename($file);