Merge branch 'matomo-org:5.x-dev' into katana-5.x-dev

.git-blame-ignore-revs

@@ -27,3 +27,53 @@ d3de8d64f477d14bf10d5cd1d17521f0c19950ed
 aa2674a8241d5e4e55a2f7fbb74292e06eab8780
 # [PHPCS] disallow using tabs for intending
 d40e11f6decbe84834ed5f33406189055e6989b8
+# [Coding Style] Enable rule PSR12.Files.OpenTag.NotAlone (#21649)
+50d3b2a93bdb01eb1cfad5f6a91bae00cdcb30ae
+# [Coding Style] Enable rule Squiz.WhiteSpace.ScopeKeywordSpacing.Incorrect (#21656)
+1ae6df0f08783e8614c9fb14fc4bf7553537ce53
+# [Coding style] Enable rule Generic.WhiteSpace.ScopeIndent.Incorrect(Exact) (#21671)
+67c67f3149728fdad7a1ac1c9a5d95b04db0264f
+# [Coding Style] Enable rule PSR12.Classes.AnonClassDeclaration.SpaceAfterKeyword (#21680)
+5979482c4d14067952a04da279072f211f427ba2
+# [Coding Style] Enable rule PSR12.Classes.ClassInstantiation.MissingParentheses (#21681)
+e30646531986050ffdd3bfea4ac1dcfe74ee33e2
+# [Coding Style] Enable rule PSR12.Classes.OpeningBraceSpace.Found (#21688)
+1903b100fa47d4f702ce9a6eb05d4e64c0fa7daa
+# [Coding Style] Enable rules PSR12.Operators.OperatorSpacing.NoSpaceBefore and PSR12.Operators.OperatorSpacing.NoSpaceAfter (#21690)
+cc2a090a29878cac4f31b68b6917862e765c2d0d
+# [Coding Style] Enable rule PSR12.Files.ImportStatement.LeadingSlash (#21692)
+b5729c235c84ab76680ddf0736ecb543f5c283c2
+# [Coding Style] Enable rule PSR12.Functions.ReturnTypeDeclaration.SpaceBeforeColon (#21693)
+40ba1b12db9016d37942832397674d20cddf1218
+# [Coding Style] Enable rule Squiz.WhiteSpace.SuperfluousWhitespace.EndLine (#21696)
+b9c6430c0569308350c3b33231646016d19924ea
+# [Coding Style] Enable rule PSR2.Methods.FunctionCallSignature.EmptyLine (#21699)
+6fa0f5bb8bd0cb06c44db97e226612af9f844a81
+# [Coding Style] Enable rule Generic.Formatting.DisallowMultipleStatements.SameLine (#21700)
+942300387c974a8313b2bd5ecdb486957cca02c4
+# [Coding Style] Enable rule PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineCASE (#21702)
+f5719461b8342b2fcefe148c8c7174cdc72a89a7
+# [Coding Style] Enable rule Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma (#21707)
+01c30b930db2e8f96b0c146c21f895832e26fab0
+# [Coding Style] Enable rules Generic.Functions.FunctionCallArgumentSpacing.* (#21710)
+22162916d36389c7c7f3380ab3467890a0c2ef6e
+# [Coding Style] Enable rule Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace (#21716)
+4bf4190287d599d4ae6a67ba4bec1366d5cc541c
+# Enable rule Squiz.Functions.MultiLineFunctionDeclaration.SpaceBeforeBrace (#21717)
+2cb62b61716129dca0b5d9fa2f8a5b3ac1eebac4
+# [Coding Style] Enable rule PSR2.Classes.ClassDeclaration.SpaceAfterKeyword (#21720)
+d6742943fe234d9f80727ae49ffebfb1539a3e67
+# [Coding Style] Enable rules PSR2.Classes.ClassDeclaration.* (#21727)
+8bfe2c7465a25081d8e5a23fcfa9b2f888272d41
+# [Coding Style] Enable rule PSR12.Keywords.ShortFormTypeKeywords.LongFound (#21728)
+04f8ed7c3406afbb155ba3af765169e6579eb3e4
+# [Coding Style] Enable rule PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase (#21731)
+8f6e92f4b5c0e813fb09f2bae2fb91f7ade024d1
+# [Coding Style] Enable rule PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed (#21730)
+2e3c5156818f5c3b986243870d02ff99c3319f2f
+# [Coding Style] Enable rule Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose (#21742)
+16f8db6d5c6e5cf1e79344877749077ead1361bf
+# [Coding Style] Enable rule PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose (#21747)
+d209158e6ee34dc4b7c50df98c078954a750979f
+# [Coding Style] Enable rule Squiz.Functions.FunctionDeclarationArgumentSpacing.NoSpaceBeforeArg (#21754)
+7ccae042b39c80b26243f18f93b1c8042de178ca

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: Open a bug report
-title: "[Bug]: "
+title: "[Bug] "
 labels: ["Potential Bug", "To Triage"]
 body:
   - type: markdown
@@ -21,50 +21,38 @@ body:
     attributes:
       label: What should happen?
       description: Please tell us what should happen. How has this issue affected you? What are you trying to accomplish?
-      placeholder: Tell us what you expected to see, e.g. "I should see Visits Over Time and Visits Overview"
+      placeholder: Tell us what you expect to see, e.g. "I should see Visits Over Time and Visits Overview"
     validations:
       required: true
   - type: textarea
     id: steps-to-reproduce
     attributes:
       label: How can this be reproduced?
       description: For UI bugs, please try to reproduce that on our Demo (https://demo.matomo.cloud). If possible, please include the URLs and steps how to reproduce it there. For other bugs or UI bugs that can't be reproduced on Demo, please include any relevant URLs or commands you are using that may help us to reproduce the bug.
-      placeholder: Steps to Reproduce, e.g. "Go to [Matomo-URL] > Click on Visitors > Click Overview"
+      placeholder: Steps to reproduce, e.g. "Go to [Matomo-URL] > Click on Visitors > Click Overview"
     validations:
       required: true
-  - type: dropdown
+  - type: input
     id: version
     attributes:
-      label: Matomo Version
+      label: Matomo version
       description: What version of Matomo are you running?
-      options:
-        - Matomo 3
-        - Matomo 4
-        - Matomo 5
-      default: 0
-    validations:
-      required: true
-  - type: input
-    id: matomo-minor-patch
-    attributes:
-      label: Matomo Patch or Minor Version
-      description: What patch or minor version of Matomo's release above are you running?
     validations:
       required: true
   - type: input
     id: php-version
     attributes:
-      label: PHP Version
+      label: PHP version
       description: What version of PHP are you running?
     validations:
-      required: true
+      required: false
   - type: input
     id: server-os
     attributes:
-      label: Server Operating System
-      description: What Server Operating System are you using?
+      label: Server operating system
+      description: What server operating system are you using?
     validations:
-      required: true
+      required: false
   - type: dropdown
     id: browsers
     attributes:
@@ -80,10 +68,10 @@ body:
   - type: input
     id: machine-os
     attributes:
-      label: Computer Operating System
-      description: What Operating System are you using on your computer?
+      label: Computer operating system
+      description: What operating system are you using on your computer?
     validations:
-      required: true
+      required: false
   - type: textarea
     id: logs
     attributes:
@@ -94,7 +82,7 @@ body:
     id: code
     attributes:
       label: Validations
-      description: Before submitting the issue, please make sure you do the following
+      description: "Before submitting the issue, please make sure you do the following:"
       options:
         - label: Read our [Contributing Guidelines](https://github.com/matomo-org/matomo/blob/5.x-dev/CONTRIBUTING.md).
           required: true
@@ -103,4 +91,4 @@ body:
         - label: Check that there isn't already an issue that reports the same bug to avoid creating duplicates.
           required: true
         - label: The provided steps to reproduce is a [minimal reproducible](https://stackoverflow.com/help/minimal-reproducible-example) of the Bug.
-          required: true
+          required: true

.github/workflows/buildtrackerjs.yml

@@ -92,7 +92,7 @@ jobs:
           then
             cd $GITHUB_WORKSPACE
             git add piwik.js matomo.js js/piwik.min.js
-            git commit -m "rebuilt piwik.js"
+            git commit -m "Build tracker JS files"
             git push
           fi
       if: steps.vars.outputs.branch != ''

.github/workflows/buildvue.yml

@@ -140,7 +140,7 @@ jobs:
             else
               cd $GITHUB_WORKSPACE
               git add plugins/*/vue/dist/*.js plugins/*/vue/dist/*.json
-              git commit -m "built vue files"
+              git commit -m "Build vue files"
               git push
             fi
           fi

.github/workflows/buildwoff2.yml

@@ -107,7 +107,7 @@ jobs:
             else
               cd $GITHUB_WORKSPACE
               git add plugins/Morpheus/fonts/matomo.woff2
-              git commit -m "built woff2 file"
+              git commit -m "Build woff2 file"
               git push
             fi
           fi

.github/workflows/composer-update.yml

@@ -75,7 +75,7 @@ jobs:
       shell: bash
     - name: Push changes
       run: |
-          git commit -m "updates composer dependencies"
+          git commit -m "Update composer dependencies"
           git push --set-upstream origin composer-update
       shell: bash
       if: steps.update.outputs.message

.github/workflows/matomo-tests.yml

@@ -37,13 +37,15 @@ jobs:
       fail-fast: false
       matrix:
         type: [ 'UnitTests', 'SystemTestsPlugins', 'SystemTestsCore', 'IntegrationTestsCore', 'IntegrationTestsPlugins' ]
-        php: [ '7.2', '8.2' ]
+        php: [ '7.2', '8.2', '8.3' ]
         adapter: [ 'PDO_MYSQL', 'MYSQLI' ]
         exclude:
           - php: '7.2'
             adapter: 'MYSQLI'
           - php: '8.2'
             adapter: 'PDO_MYSQL'
+          - php: '8.3'
+            adapter: 'PDO_MYSQL'
     steps:
       - uses: actions/checkout@v3
         with:
@@ -108,6 +110,7 @@ jobs:
       - name: running tests
         uses: matomo-org/github-action-tests@main
         with:
+          testomatio: ${{ secrets.TESTOMATIO }}
           ui-test-options: '--num-test-groups=4 --test-group=${{ matrix.parts }}'
           test-type: 'UI'
           php-version: '7.2'

.github/workflows/phpcs.yml

@@ -30,5 +30,9 @@ jobs:
         with:
           php-version: '7.2'
           tools: cs2pr
-      - name: Run phpcs
-        run: ./vendor/bin/phpcs -q --report=checkstyle | cs2pr
+      - name: Check PHP code styles
+        id: phpcs
+        run: ./vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml
+      - name: Show PHPCS results in PR
+        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
+        run: cs2pr ./phpcs-report.xml

.github/workflows/release.yml

@@ -122,20 +122,20 @@ jobs:
             echo "prerelease=true" >> $GITHUB_OUTPUT
             body="## Matomo ${version} (Pre-release)
 
-            We recommend to read [this FAQ](http://matomo.org/faq/how-to-update/faq_159/) before using a pre-release in a production environment.
+            We recommend to read [this FAQ](https://matomo.org/faq/how-to-update/faq_159/) before using a pre-release in a production environment.
 
             Please use the attached archives for installing or updating Matomo.
             The source code download is only meant for developers and will require extra work to install it.
              - Latest stable production release can be found at https://matomo.org/download/ ([learn more](https://matomo.org/docs/installation/)) (recommended)
-             - Beta and Release Candidates releases can be found at https://builds.matomo.org/ ([learn more](http://matomo.org/faq/how-to-update/faq_159/))"
+             - Beta and Release Candidate releases can be found at https://builds.matomo.org/ ([learn more](https://matomo.org/faq/how-to-update/faq_159/))"
           else
             echo "prerelease=false" >> $GITHUB_OUTPUT
             body="## [Matomo ${version} Changelog](https://matomo.org/changelog/matomo-${version//./-}/)
 
             Please use the attached archives for installing or updating Matomo.
             The source code download is only meant for developers and will require extra work to install it.
              - Latest stable production release can be found at https://matomo.org/download/ ([learn more](https://matomo.org/docs/installation/)) (recommended)
-             - Beta and Release Candidates releases can be found at https://builds.matomo.org/ ([learn more](http://matomo.org/faq/how-to-update/faq_159/))"
+             - Beta and Release Candidate releases can be found at https://builds.matomo.org/ ([learn more](https://matomo.org/faq/how-to-update/faq_159/))"
           fi
           
           echo "version=$version" >> $GITHUB_OUTPUT

.github/workflows/submodules.yml

@@ -83,7 +83,7 @@ jobs:
       shell: bash
     - name: Push changes
       run: |
-          git commit -m "updates all submodules"
+          git commit -m "Update all submodules"
           git push --set-upstream origin submodules
       shell: bash
       if: steps.changes.outputs.message

.github/workflows/update-intl.yml

@@ -103,7 +103,7 @@ jobs:
           then
             cd $GITHUB_WORKSPACE
             git add plugins/Intl/lang/*.json
-            git commit -m "Updates Intl data from CLDR ${{ steps.cldr.outputs.cldr-version }}"
+            git commit -m "Update Intl data from CLDR ${{ steps.cldr.outputs.cldr-version }}"
             git push --set-upstream origin update-intl
             echo "updated=1" >> $GITHUB_OUTPUT
           fi
@@ -121,4 +121,4 @@ jobs:
               }' \
              --url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
         shell: bash
-        if: steps.push.outputs.updated
+        if: steps.push.outputs.updated

LEGALNOTICE

@@ -298,6 +298,10 @@ THIRD-PARTY CONTENT
     Link: https://pictogrammers.com/
     License: Apache License Version 2.0
 
+    Name: Feather icons ("icon-marketplace") in plugins/Morpheus/fonts
+    Link: https://feathericons.com/
+    License: MIT (Expat)
+
 Notes:
 - the "New BSD" license refers to either the "Modified BSD" and "Simplified BSD"
   licenses (2- or 3-clause), which are GPL compatible.

composer.json

@@ -67,9 +67,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~8.5",
-        "slevomat/coding-standard": "~7.2.0",
+        "slevomat/coding-standard": "~8.14.0",
         "squizlabs/php_codesniffer": "~3.6",
-        "phpstan/phpdoc-parser": "~1.5.0",
+        "phpstan/phpdoc-parser": "~1.24.0",
         "symfony/var-dumper": "~5.4.0",
         "symfony/yaml": "~5.4.0"
     },