[pull] develop from netz98:develop #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

pull wants to merge 346 commits into mediarox:develop from netz98:develop

.ddev/commands/web/bats-magento-core

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    #!/bin/bash
+    ## Description: Run bats tests suite for Magento/Mage-OS core commands
+    ## Usage: bats-magento-core <command> [options] [args]
+    ## Example: "bats-magento-core"
+    bats $@ tests/bats/functional_core_commands.bats

.ddev/commands/web/bats-magerun

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    #!/bin/bash
+    ## Description: Run bats tests suite for n98-magerun2
+    ## Usage: bats-magerun <command> [options] [args]
+    ## Example: "bats-magerun --filter "admin:user:list"
+    bats $@ tests/bats/functional_magerun_commands.bats

.ddev/commands/web/mr2-dev

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    #!/bin/bash
+    ## Description: Run magerun in Magento 2.4
+    ## Usage: mr2-dev <options> <arguments>
+    ## Example: "mr2-dev sys:info"
+    bin/n98-magerun2 $@

.ddev/commands/web/mr2-dev-24

This file was deleted.

.ddev/commands/web/qa

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,20 +6,25 @@ @@
     PROJECT_DIR="/var/www/html";
+    # Determine which Magento version variable is set
+    if [ -n "$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION" ]; then
+        MAGERUN_VERSION="$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION"
+    elif [ -n "$MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION" ]; then
+        MAGERUN_VERSION="$MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION"
+    else
+        echo "Please add MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION or MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION as web_environment variable in your .ddev/config.yaml."
+        echo "See: https://github.com/netz98/n98-magerun2/blob/develop/.ddev/config.yaml"
+        exit 1;
+    fi
+    MAGENTO_ROOT_DIR="/opt/magento-test-environments/magento_${MAGERUN_VERSION//[-.]/_}"
     echo "---------------------------------------------------------";
     echo "RUN php-cs-fixer"
     echo "---------------------------------------------------------";
     vendor/bin/php-cs-fixer fix --verbose --dry-run --diff;
-    if [ -z "$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION" ]; then
-    		echo "Please add MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION as web_environment variable in your .ddev/config.yaml."
-    		echo "See: https://github.com/netz98/n98-magerun2/blob/develop/.ddev/config.yaml"
-    		exit 1;
-    fi
-    MAGENTO_ROOT_DIR="/opt/magento-test-environments/magento_${MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION//[-.]/_}"
     # phpstan is temporary disabled until we find a good way to mock all the Magento dependencies
     #echo "change to dir: ${MAGENTO_ROOT_DIR}";
@@ Expand Down @@

.ddev/commands/web/unit-test

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    #!/bin/bash
+    ## Description: Run phpunit tests of n98-magerun2 against Magento/Mage-OS
+    ## Usage: unit-test <command> [options] [args]
+    ## Example: "unit-test"
+    vendor/bin/phpunit $@

.ddev/commands/web/unit-test-24

This file was deleted.

.ddev/config.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,7 +8,7 @@ additional_hostnames: []
  
    additional_fqdns: []

    database:

        type: mariadb

        version: "10.3"

        version: "11.4"

    hooks:

        post-start:

            - composer: install

    @@ -17,17 +17,20 @@ webimage_extra_packages: [bats, lz4, zstd, mycli]
  
    use_dns_when_possible: true

    composer_version: 2.2.17

    web_environment:

        - MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION=2.4.7-p4

        - MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION=1.2.0

        - N98_MAGERUN2_BIN=/var/www/html/bin/n98-magerun2

    nodejs_version: "16"

        - N98_MAGERUN2_TEST_MAGENTO_ROOT=/opt/magento-test-environments/mageos_1_2_0/

    nodejs_version: "20"

    corepack_enable: false

    # Key features of DDEV's config.yaml:

    # name: <projectname> # Name of the project, automatically provides

    #   http://projectname.ddev.site and https://projectname.ddev.site

    # If the name is omitted, the project will take the name of the enclosing directory,

    # which is useful if you want to have a copy of the project side by side with this one.

    # type: <projecttype>  # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress

    # type: <projecttype>  # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, generic, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress

    # See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more

    # information on the different project types

    @@ -44,7 +47,7 @@ corepack_enable: false
  
    # database:

    #   type: <dbtype> # mysql, mariadb, postgres

    #   version: <version> # database version, like "10.11" or "8.0"

    #   MariaDB versions can be 5.5-10.8, 10.11, and 11.4.

    #   MariaDB versions can be 5.5-10.8, 10.11, 11.4, and 11.8.

    #   MySQL versions can be 5.5-8.0.

    #   PostgreSQL versions can be 9-17.

    @@ -56,12 +59,29 @@ corepack_enable: false
  
    # "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,

    # as leaving Xdebug enabled all the time is a big performance hit.

    # xhgui_https_port: 8142

    # Can be used to change the router https port for xhgui application

    # Very rarely used

    # xhgui_http_port: 8143

    # Can be used to change the router http port for xhgui application

    # Very rarely used

    # host_xhgui_port: 8142

    # Can be used to change the host binding port of the xhgui

    # application. Rarely used; only when port conflict and 

    # bind_all_ports is used (normally with router disabled)

    # xhprof_enabled: false  # Set to true to enable Xhprof and "ddev start" or "ddev restart"

    # Note that for most people the commands

    # "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,

    # as leaving Xhprof enabled all the time is a big performance hit.

    # webserver_type: nginx-fpm or apache-fpm

    # xhprof_mode: [prepend|xhgui|global]

    # Set to "xhgui" to enable XHGui features

    # "xhgui" will become default in a future major release

    # webserver_type: nginx-fpm, apache-fpm, generic

    # timezone: Europe/Berlin

    # If timezone is unset, DDEV will attempt to derive it from the host system timezone

.ddev/hook_01_setup.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ set -e @@
     CURRENT_DIR=$(dirname "$0")
     source "${CURRENT_DIR}/bash/helpers/colors.sh"
     INSTALL_MAGENTO_CE_CMD="${CURRENT_DIR}/commands/web/install-magento-ce"
+    INSTALL_MAGE_OS_CMD="${CURRENT_DIR}/commands/web/install-mage-os"
     function configure_composer_help() {
         echo -e "${txtred}=========================="
@@ Expand Down Expand Up / @@ -44,7 +45,13 @@ function setup_test_magento_environments() { @@
         #$INSTALL_MAGENTO_CE_CMD "2.3.7-p3" no
         # Change version in .ddev/config.yaml
-        $INSTALL_MAGENTO_CE_CMD "$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION" yes
+        if [ -n "$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION" ]; then
+          $INSTALL_MAGENTO_CE_CMD "$MAGERUN_SETUP_TEST_DEFAULT_MAGENTO_VERSION" yes
+        fi
+        if [ -n "$MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION" ]; then
+          $INSTALL_MAGE_OS_CMD "$MAGERUN_SETUP_TEST_DEFAULT_MAGEOS_VERSION" yes
+        fi
     }
     function setup_bats() {
@@ Expand Down @@

.github/copilot-instructions.md

-Original file line number
+Diff line change
@@ Expand Up @@
 . **Running PHPUnit Tests**:
        ```bash
-       vendor/bin/phpunit
+       ddev unit-test
+       ddev unit-test <filename>
        ```
 . **Running Functional Tests with BATS**:
+        Start the magerun test suite and filter by command name:
        ```bash
-       export N98_MAGERUN2_BIN=/path/to/n98-magerun2.phar
-       bats tests/bats/functional_magerun_commands.bats
-       bats tests/bats/functional_core_commands.bats
+       ddev bats-magerun --filter "<regex>"
+       # Example
+       ddev bats-magerun --filter "admin:user:list"
        ```
     ### Adding New Tests
@@ Expand Down Expand Up / @@ -105,6 +109,23 @@ class YourCommandTest extends TestCase @@
     ## Additional Development Information
+    ### File Header
+    All PHP files should start with a file header that includes the copyright and license information. The header should look like this:
+    ```php
+    <?php
+    /**
+     * This file is part of the n98-magerun2 project.
+     *
+     * For the full copyright and license information, please view the MIT-LICENSE.txt
+     * file that was distributed with this source code.
+     */
+     namespace N98\Magento\Command\YourNamespace;
+    ```
     ### Code Style
     The project uses PHP-CS-Fixer for code style. The configuration is in `.php-cs-fixer.php`.
@@ Expand Down @@

.github/git-commit-instructions.md

-Original file line number
+Diff line change
@@ -0,0 +1,48 @@
+    # Git Commit Message Instructions
+    ## Conventional Commit Format
+    This project recommends using the [Conventional Commit](https://www.conventionalcommits.org/) format for all commit messages. This helps keep the commit history readable and enables automated tools for changelogs and releases.
+    ### Commit Message Structure
+    ```
+    <type>[optional scope]: <description>
+    [optional body]
+    [optional footer(s)]
+    ```
+    - **type**: The kind of change (e.g., `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`)
+    - **optional scope**: A section of the codebase affected (e.g., `cache`, `command`, `docs`)
+    - **description**: Short summary of the change (imperative, lower case, no period)
+    ### Examples
+    - `feat: add user login functionality`
+    - `fix(cache): correct total price calculation`
+    - `docs: update README with installation steps`
+    ### Optional Body
+    Use the body to provide additional context about the change.
+    ### Optional Footer
+    Use the footer to reference issues or describe breaking changes.
+    ```
+    BREAKING CHANGE: changes the API of the cache command
+    Closes #123
+    ```
+    ### Benefits
+    - Clear, consistent commit history
+    - Easier automation for changelogs and releases
+    - Communicates intent of changes to collaborators
+    For more details, see [conventionalcommits.org](https://www.conventionalcommits.org/).

.github/patches/mage-os-admin-analytics-nullable-type.patch

-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    --- a/vendor/mage-os/module-admin-analytics/Model/Condition/CanViewNotification.php
+    +++ b/vendor/mage-os/module-admin-analytics/Model/Condition/CanViewNotification.php
+    @@ -53,7 +53,7 @@
+         public function __construct(
+             Logger $viewerLogger,
+             CacheInterface $cacheStorage,
+    -        ScopeConfigInterface $scopeConfig = null
+    +        ?ScopeConfigInterface $scopeConfig = null
+         ) {
+             $this->viewerLogger = $viewerLogger;
+             $this->cacheStorage = $cacheStorage;

.github/scraper/.gitignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		.env
		config.json

.github/scraper/magerun_docs_config.template.json

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    {
+      "meilisearch_url": "${MEILISEARCH_URL}",
+      "meilisearch_api_key": "${MEILISEARCH_INDEX_API_KEY}",
+      "meilisearch_index_uid": "${MEILISEARCH_INDEX_UID}",
+      "start_urls": ["https://netz98.github.io/n98-magerun2/"],
+      "strategy": "docssearch",
+      "headless": true
+    }

0 .github/workflows/linux-setup.sh → .github/scripts/linux-setup.sh

File renamed without changes.

0 .github/workflows/update-dist-repo.sh → .github/scripts/update-dist-repo.sh

File renamed without changes.

.github/workflows/contributors.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ jobs: @@
               REPOSITORY: "netz98/n98-magerun2"
           - name: Create issue
-            uses: peter-evans/create-issue-from-file@v5
+            uses: peter-evans/create-issue-from-file@v6
             with:
               title: Monthly contributor report
               token: ${{ secrets.GITHUB_TOKEN }}
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[pull] develop from netz98:develop #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

[pull] develop from netz98:develop #1

Are you sure you want to change the base?

Uh oh!

[pull] develop from netz98:develop #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!