Phpcs Baseline testing

.github/coding-standard-baseline/README.md

@@ -0,0 +1,30 @@
+# Magento 2 Coding Standard Action
+
+A Github Action that runs the Magento Coding Standard.
+
+## Inputs
+
+See the [action.yml](./action.yml)
+
+## Usage
+
+```yml
+name: Coding Standard
+
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
+
+jobs:
+  coding-standard:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: graycoreio/github-actions-magento2/coding-standard@main
+      with:
+        version: 25 # Optional, will use the latest if omitted.
+        path: app/code # Optional, will be used when event is not a pull request.
+```

.github/coding-standard-baseline/action.yml

@@ -0,0 +1,124 @@
+name: "M2 Coding Standard"
+author: "Mage-OS"
+description: "A Github Action that runs the Magento Coding Standard."
+
+inputs:
+  php_version:
+    type: string
+    required: true
+    default: "8.1"
+    description: "PHP version used to do the coding standard check."
+
+  composer_version:
+    type: string
+    required: true
+    default: "2"
+    description: "The version of composer to use."
+
+  path:
+    type: string
+    required: true
+    default: 'app/code'
+    description: "The directory (relative to the project root) in which the coding standard will be checked. Used when the event is not a pull request."
+
+  version:
+    type: string
+    required: false
+    default: "31"
+    description: "The version of the coding standard to use. If not provided, will use the latest version."
+
+  severity:
+    type: string
+    required: false
+    default: "8"
+    description: "The minimum severity required to display an error or warning (default: 5)"
+
+  warning_severity:
+    type: string
+    required: false
+    default: "8"
+    description: "The minimum severity required to display a warning"
+
+  error_severity:
+    type: string
+    required: false
+    default: "8"
+    description: "The minimum severity required to display an error"
+
+  baseline_version:
+    type: string
+    required: false
+    default: "1.1.2"
+    description: "version of phpcs baseline"
+
+runs:
+  using: composite
+  steps:
+    - name: Checkout Project
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Set PHP Version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.php_version }}
+        tools: composer:v${{ inputs.composer_version }}
+        coverage: none
+
+    - name: Install Coding Standard && Codesniffer baseline
+      shell: bash
+      run: |
+        git config --global advice.detachedHead false
+        composer require "magento/magento-coding-standard: ${{ github.event.inputs.version || '*' }}" -W
+        composer config --no-plugins allow-plugins.digitalrevolution/php-codesniffer-baseline true
+        composer require --dev "digitalrevolution/php-codesniffer-baseline: ${{ github.event.inputs.baseline_version || '*' }}"
+
+    - name: Register Coding Standard
+      shell: bash
+      run: vendor/bin/phpcs --config-set installed_paths ${{ github.workspace }}/vendor/magento/magento-coding-standard,${{ github.workspace }}/vendor/phpcompatibility/php-compatibility
+
+    - name: Get all changed files
+      uses: tj-actions/changed-files@v37
+      with:
+        write_output_files: true
+        output_dir: ${{ github.workspace }}
+        separator: " "
+
+    - name: Verify the contents of the modified_files.txt file
+      shell: bash
+      run: |
+        sed "s/ /\n/g" ${{ github.workspace }}/modified_files.txt > ${{ github.workspace }}/newline_file.txt
+        grep -iE "\.php|\.phtml|\.html|\.xml" ${{ github.workspace }}/newline_file.txt > ${{ github.workspace }}/phpcs_files.txt
+
+    - name: Checkout - Before Merge
+      shell: bash
+      run: |
+        if ${{ github.event_name == 'pull_request' }}; then
+          git checkout ${{ github.event.pull_request.base.ref }}
+        else
+          git checkout ${{ github.event.before }}
+        fi
+
+    - name: Filter php files and execute phpcs - Before Merge
+      shell: bash
+      run: |
+        php vendor/bin/phpcs --standard=Magento2 \
+        $([ -n "${{ inputs.severity }}" ] && echo "--severity=${{ inputs.severity }}") \
+        $([ -n "${{ inputs.warning_severity }}" ] && echo "--warning-severity=${{ inputs.warning_severity }}") \
+        $([ -n "${{ inputs.error_severity }}" ] && echo "--error-severity=${{ inputs.error_severity }}") \
+        --report=\\DR\\CodeSnifferBaseline\\Reports\\Baseline --report-file=${{ github.workspace }}/phpcs.baseline.xml --file-list=${{ github.workspace }}/phpcs_files.txt || /bin/true
+
+    - name: Checkout after Merge and execute phpcs
+      shell: bash
+      run: |
+        if ${{ github.event_name == 'pull_request' }}; then
+          git checkout ${{ github.event.pull_request.head.ref }}
+        else
+          git checkout ${{ github.event.after }}
+        fi
+        php vendor/bin/phpcs --standard=Magento2 \
+        $([ -n "${{ inputs.severity }}" ] && echo "--severity=${{ inputs.severity }}") \
+        $([ -n "${{ inputs.warning_severity }}" ] && echo "--warning-severity=${{ inputs.warning_severity }}") \
+        $([ -n "${{ inputs.error_severity }}" ] && echo "--error-severity=${{ inputs.error_severity }}") \
+        --file-list=${{ github.workspace }}/phpcs_files.txt

.github/workflows/coding-standard.yml

@@ -1,9 +1,52 @@
-name: Coding Standard
+name: M2 Coding Testing
 
 on:
+  push:
+    branches: [ 2.4-develop, develop, phpcs_baseline ]
   pull_request:
-    branches:
-      - 2.4-develop
+    branches: [ 2.4-develop, develop, phpcs_baseline ]
+  workflow_call:
+    inputs:
+      php_version:
+        type: string
+        required: true
+        default: "8.1"
+        description: "PHP version used to do the coding standard check."
+
+      composer_version:
+        type: string
+        required: true
+        default: "2"
+        description: "The version of composer to use."
+
+      path:
+        type: string
+        required: true
+        default: 'app/code'
+        description: "The directory (relative to the project root) in which the coding standard will be checked. Used when the event is not a pull request."
+
+      version:
+        type: string
+        required: false
+        description: "The version of the coding standard to use. If not provided, will use the latest version."
+
+      severity:
+        type: string
+        required: false
+        default: "8"
+        description: "The minimum severity required to display an error or warning (default: 5)"
+
+      warning_severity:
+        type: string
+        required: false
+        default: "8"
+        description: "The minimum severity required to display a warning"
+
+      error_severity:
+        type: string
+        required: false
+        default: "8"
+        description: "The minimum severity required to display an error"
 
 permissions:
   contents: read
@@ -12,5 +55,13 @@ jobs:
   coding-standard:
     runs-on: ubuntu-latest
     steps:
-      - name: Run Coding Standard
-        uses: mage-os/github-actions/coding-standard@main
+      - uses: actions/checkout@v1
+      - uses: mage-os/github-actions/coding-standard-baseline@main
+        with:
+          php_version: "8.1" # Optional, will be used for Php version
+          composer_version: "2"
+          version: "31" # Optional, will use the latest if omitted.
+          severity: "8" # Optional, will use phpcs default of 5 if not specified.
+          warning_severity: "4" # Optional, will use warning severity value if not specified.
+          error_severity: "7" # Optional, will use error severity value if not specified.
+          baseline_version: "1.1.2" # Optional, will use for php codesniffer baseline version

app/code/Magento/Backup/etc/config.xml

@@ -10,6 +10,7 @@
         <system>
             <backup>
                 <functionality_enabled>0</functionality_enabled>
+                <test>
             </backup>
         </system>
     </default>

app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml

@@ -9,6 +9,7 @@
     <body>
         <referenceBlock name="adminhtml.system.backup.container">
             <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
+
                 <arguments>
                     <argument name="id" xsi:type="string">backupsGrid</argument>
                     <argument name="dataSource" xsi:type="object" shared="false">Magento\Backup\Model\Fs\Collection</argument>

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

@@ -60,6 +60,8 @@ public function __construct(
      */
     public function execute()
     {
+        echo "1"
+        echo "2";
         if ($this->getRequest()->getPostValue()) {
             /** @var \Magento\CatalogRule\Api\CatalogRuleRepositoryInterface $ruleRepository */
             $ruleRepository = $this->_objectManager->get(

app/code/Magento/Checkout/view/frontend/web/template/authentication.html

@@ -5,6 +5,9 @@
  */
 -->
 <div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()">
+    <?php
+    eee
+    ?>
     <button
         type="button"
         class="action action-auth-toggle"

app/code/Magento/Customer/Model/App/FrontController/DeleteCookieWhenCustomerNotExistPlugin.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\App\FrontController;
+
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Customer\Model\Session;
+
+/**
+ * Plugin for delete the cookie when the customer is not exist.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class DeleteCookieWhenCustomerNotExistPlugin
+{
+    /**
+     * @var ResponseHttp
+     */
+    private $responseHttp;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * Constructor
+     *
+     * @param ResponseHttp $responseHttp
+     * @param Session $session
+     */
+    public function __construct(
+        ResponseHttp $responseHttp,
+        Session $session
+    ) {
+        $this->responseHttp = $responseHttp;
+        $this->session = $session;
+    }
+
+    /**
+     * Delete the cookie when the customer is not exist before dispatch the front controller.
+     *
+     * @return void
+     */
+    public function beforeDispatch(): void
+    {
+        if (!$this->session->getCustomerId()) {
+            $this->responseHttp->sendVary();
+        }
+    }
+}

app/code/Magento/Customer/Test/Unit/Model/App/FrontController/DeleteCookieWhenCustomerNotExistPluginTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model\App\FrontController;
+
+use Magento\Customer\Model\App\FrontController\DeleteCookieWhenCustomerNotExistPlugin;
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Customer\Model\Session;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests \Magento\Customer\Model\App\FrontController\DeleteCookieWhenCustomerNotExistPluginTest.
+ */
+class DeleteCookieWhenCustomerNotExistPluginTest extends TestCase
+{
+    /**
+     * @var DeleteCookieWhenCustomerNotExistPlugin
+     */
+    protected DeleteCookieWhenCustomerNotExistPlugin $plugin;
+
+    /**
+     * @var ResponseHttp|MockObject
+     */
+    protected ResponseHttp|MockObject $responseHttpMock;
+
+    /**
+     * @var Session|MockObject
+     */
+    protected MockObject|Session $customerSessionMock;
+
+    /**
+     * Set up
+     */
+    protected function setUp(): void
+    {
+        $this->customerSessionMock = $this->createMock(Session::class);
+        $this->responseHttpMock = $this->createMock(ResponseHttp::class);
+        $this->plugin = new DeleteCookieWhenCustomerNotExistPlugin(
+            $this->responseHttpMock,
+            $this->customerSessionMock
+        );
+    }
+
+    public function testBeforeDispatch()
+    {
+        $this->customerSessionMock->expects($this->once())
+            ->method('getCustomerId')
+            ->willReturn(0);
+        $this->plugin->beforeDispatch();
+    }
+}