Merge branch 'main' into phpunit-pre-symfony

Author: sreichel

.github/SECURITY.md

@@ -16,7 +16,7 @@ We will keep the details of your security vulnerability report private and only
 
 To report a vulnerability, please *DO NOT* open a public Issue or Pull Request.
 
-Please email your security vulnerability report to security@openmage.org along with your Github user name so that once we create a security advisory you may be added to it as a collaborator for further review.
+Please email your security vulnerability report to security@openmage.org along with your GitHub username so that once we create a security advisory you may be added to it as a collaborator for further review.
 
 We will review the advisory and work with you to find a suitable solution. We will publicly disclose the vulnerability once a patch is prepared and our community and partners have an easy path forward to apply the patch promptly. We will be sure to give you credit for the vulnerability discovery unless you request otherwise.
 

.github/spellcheck-usernames.txt

@@ -0,0 +1,8 @@
+addison
+bucha
+colinmollenhour
+fballiano
+Flyingmana
+kiatng
+robertrogge
+sreichel

.github/spellcheck-wordlist.txt

@@ -0,0 +1,77 @@
+ACL
+ActionScript
+bool
+Braintree
+Browsersync
+Captcha
+CLI
+Cloudflare
+CMS
+Cron
+CVE
+CodeQL
+DevOps
+DDEV
+DNS
+DocBlock
+EAV
+Emmet
+FireGento
+FPC
+Gitpod
+HiPay
+Homebrew
+HMAC
+ImageMagick
+IntelliSense
+jQuery
+JS
+JSON
+LTS
+macOS
+Magento
+magerun
+Mailpit
+mkcert
+MkDocs
+Matomo
+MTF
+nginx
+npm
+OAuth
+OpenMage
+OpenNode
+PageSpeed
+PHPCompatibility
+PHPCS
+PHPMD
+phpMyAdmin
+PHPStan
+PhpStorm
+PHPUnit
+PLAINTEXT
+RCE
+reCaptcha
+Redis
+RPC
+RSS
+RWD
+SCSS
+SHA
+SMTP
+SSL
+TinyMCE
+toc
+URI
+Varien
+VMware
+WAMP
+WebP
+WSDL
+WSL
+XAMPP
+Xdebug
+XSS
+Zend
+ZF
+

.github/spellcheck.yml

@@ -0,0 +1,29 @@
+matrix:
+  - name: Markdown
+    expect_match: false
+    apsell:
+      mode: en
+    dictionary:
+      wordlists:
+        - .github/spellcheck-usernames.txt
+        - .github/spellcheck-wordlist.txt
+      output: wordlist.dic
+      encoding: utf-8
+    pipeline:
+      - pyspelling.filters.markdown:
+          markdown_extensions:
+            - markdown.extensions.extra:
+      - pyspelling.filters.html:
+          comments: false
+          attributes:
+            - alt
+          ignores:
+            - ':matches(code, pre)'
+            - ':matches(.magiclink)'
+            - ':matches(.events-list-table + table)'
+            - 'a'
+            - 'code'
+            - 'pre'
+            - 'blockquote'
+    sources:
+      - 'docs/**/*.md'

.github/workflows/check-files.yml

@@ -39,6 +39,9 @@ on:
       phpunit:
         description: "Count changed PHPUnit files"
         value: ${{ jobs.check.outputs.phpunit }}
+      markdown:
+        description: "Count changed markdown files"
+        value: ${{ jobs.check.outputs.markdown }}
       cypress:
         description: "Count changed Cypress files"
         value: ${{ jobs.check.outputs.cypress }}
@@ -52,6 +55,7 @@ jobs:
     outputs:
       composer: ${{ steps.changes-composer.outputs.composer }}
       js: ${{ steps.changes-js.outputs.js }}
+      markdown: ${{ steps.changes-php.outputs.markdown }}
       php: ${{ steps.changes-php.outputs.php }}
       phtml: ${{ steps.all.outputs.phtml }}
       xml: ${{ steps.changes-xml.outputs.xml }}
@@ -88,6 +92,7 @@ jobs:
           files: |
             composer.*
             *.php
+            **/*.md
             **/*.php
             **/*.phtml
             **/*.xml
@@ -199,6 +204,14 @@ jobs:
           echo "$count PHPUnit file(s) changed"
           echo "phpunit=$count" >> $GITHUB_OUTPUT
 
+      - name: Check if Markdown files changed
+        id: changes-markdown
+        if: steps.changed-files-specific.outputs.any_modified == 'true'
+        run: |
+          count="$(grep -oE "*.md" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count Markdown file(s) changed"
+          echo "markdown=$count" >> $GITHUB_OUTPUT
+
       - name: Check if Cypress files changed
         id: changes-cypress
         if: steps.changed-files-specific.outputs.any_modified == 'true'

.github/workflows/cypress.yml

@@ -14,7 +14,7 @@ jobs:
         webserver: ['apache-fpm', 'nginx-fpm']
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Setup DDEV
         uses: ddev/github-action-setup-ddev@v1
         with:

.github/workflows/spellcheck.yml

@@ -0,0 +1,19 @@
+name: Markdown
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  spellcheck:
+    name: Markdown
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Check Spelling
+        uses: rojopolis/spellcheck-github-actions@0.47.0
+        with:
+          config_path: .github/spellcheck.yml
+          task_name: Markdown

.github/workflows/workflow.yml

@@ -9,6 +9,7 @@ on:
       - '**.php'
       - '**.phtml'
       - '**.js'
+      - '**.md'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
       - '.phpcs.dist.xml'
@@ -25,6 +26,7 @@ on:
       - '**.php'
       - '**.phtml'
       - '**.js'
+      - '**.md'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
       - '.phpcs.dist.xml'
@@ -128,7 +130,7 @@ jobs:
     uses: ./.github/workflows/rector.yml
 
   unit_tests:
-    name: PHPUnit Tests
+    name: PHPUnit
     needs: [check, php-cs-fixer]
     if: |
       needs.check.outputs.php > 0 ||
@@ -137,6 +139,14 @@ jobs:
       needs.check.outputs.workflow > 0
     uses: ./.github/workflows/phpunit.yml
 
+  spellcheck:
+    name: Spellcheck
+    needs: [check]
+    if: |
+      needs.check.outputs.markdown > 0 ||
+      needs.check.outputs.workflow > 0
+    uses: ./.github/workflows/spellcheck.yml
+
   cypress:
     name: Cypress E2E Tests
     needs: [check, php-cs-fixer]

app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php

@@ -201,6 +201,8 @@ public function generateChart(): array
                             break;
                         case Mage_Reports_Helper_Data::PERIOD_7_DAYS:
                         case Mage_Reports_Helper_Data::PERIOD_1_MONTH:
+                        case Mage_Reports_Helper_Data::PERIOD_3_MONTHS:
+                        case Mage_Reports_Helper_Data::PERIOD_6_MONTHS:
                             $this->_axisLabels[$idx][$_index] = $this->formatDate(
                                 new Zend_Date($_label, 'yyyy-MM-dd'),
                             );
@@ -243,9 +245,10 @@ private function getChartDatasAndDates(): array
         $date  = '';
         $dates = [];
         $datas = [];
+        $period = $this->getDataHelper()->getParam('period');
 
         while ($dateStart->compare($dateEnd) < 0) {
-            switch ($this->getDataHelper()->getParam('period')) {
+            switch ($period) {
                 case Mage_Reports_Helper_Data::PERIOD_24_HOURS:
                     $date = $dateStart->toString('yyyy-MM-dd HH:00');
                     $dateStart->addHour(1);
@@ -255,22 +258,52 @@ private function getChartDatasAndDates(): array
                     $date = $dateStart->toString('yyyy-MM-dd');
                     $dateStart->addDay(1);
                     break;
+                case Mage_Reports_Helper_Data::PERIOD_3_MONTHS:
+                case Mage_Reports_Helper_Data::PERIOD_6_MONTHS:
+                    $date = $dateStart->toString('yyyy-MM-dd');
+                    $dateStart->addWeek(1);
+                    break;
                 case Mage_Reports_Helper_Data::PERIOD_1_YEAR:
                 case Mage_Reports_Helper_Data::PERIOD_2_YEARS:
                     $date = $dateStart->toString('yyyy-MM');
                     $dateStart->addMonth(1);
                     break;
             }
+            if (in_array($period, [
+                Mage_Reports_Helper_Data::PERIOD_3_MONTHS,
+                Mage_Reports_Helper_Data::PERIOD_6_MONTHS,
+            ])) {
+                $axisTimestamps = [];
+                foreach ($this->_axisLabels['x'] as $axisDate) {
+                    $axisTimestamps[] = (new Zend_Date($axisDate, 'yyyy-MM-dd'))->getTimestamp();
+                }
+            }
             foreach (array_keys($this->getAllSeries()) as $index) {
-                if (in_array($date, $this->_axisLabels['x'])) {
-                    $datas[$index][] = (float) array_shift($this->_allSeries[$index]);
+                if (isset($axisTimestamps)) {
+                    $dateObj = new Zend_Date($date, 'yyyy-MM-dd');
+                    $weekStartTs = $dateObj->getTimestamp();
+                    $weekEndTs = $dateObj->addWeek(1)->getTimestamp();
+
+                    $found = false;
+                    foreach ($axisTimestamps as $axisTs) {
+                        if ($axisTs >= $weekStartTs && $axisTs < $weekEndTs) {
+                            $datas[$index][] = (float) array_shift($this->_allSeries[$index]);
+                            $found = true;
+                            break;
+                        }
+                    }
+
+                    if (!$found) {
+                        $datas[$index][] = 0;
+                    }
                 } else {
-                    $datas[$index][] = 0;
+                    $datas[$index][] = in_array($date, $this->_axisLabels['x'])
+                        ? (float) array_shift($this->_allSeries[$index])
+                        : 0;
                 }
             }
             $dates[] = $date;
         }
-
         return [$datas, $dates];
     }
 

app/code/core/Mage/Adminhtml/Block/Widget/Container.php

@@ -10,7 +10,7 @@
  * @category   Mage
  * @package    Mage_Adminhtml
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2019-2024 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright  Copyright (c) 2019-2025 The OpenMage Contributors (https://www.openmage.org)
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */