Merge pull request #646 from PrestaShop/dev

Release 3.8.0
PrestaShop · Apr 14, 2022 · db0fccc · db0fccc
2 parents a767762 + e5e09af
commit db0fccc
Show file tree

Hide file tree

Showing 51 changed files with 17,483 additions and 5,246 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
     mocha: true,
   },
   parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
   },
   plugins: [
     'import',
@@ -24,6 +24,7 @@ module.exports = {
   },
   rules: {
     'no-new': 0,
+    'keyword-spacing': 0,
     'class-methods-use-this': 0,
   },
 };
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -2,24 +2,61 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-    deploy:
-        name: build dependencies & create artifact
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            # Install PHP dependencies (Production ONLY)
-            - name: Install composer dependencies
-              run: composer install --no-dev -o
-
-            # Remove development files
-            - name: Clean-up project
-              uses: PrestaShopCorp/[email protected]
-
-            # Zip files and upload to artifacts list
-            - name: Create & upload artifact
-              uses: actions/upload-artifact@v1
-              with:
-                  name: ${{ github.event.repository.name }}
-                  path: ../
+  deploy:
+    name: build dependencies & create artifact
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Install composer dependencies
+        run: composer install --no-dev -o
+      - name: Clean-up project
+        uses: PrestaShopCorp/[email protected]
+      - name: Prepare auto-index tool
+        run: |
+          composer global require prestashop/autoindex
+      - name: Generate index.php
+        run: |
+          ~/.composer/vendor/bin/autoindex
+      - name: Create & upload artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ github.event.repository.name }}
+          path: ../
+  update_release_draft:
+    runs-on: ubuntu-latest
+    needs: [deploy]
+    if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: ${{ github.event.repository.name }}
+      - id: release_info
+        uses: toolmantim/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prepare for Release
+        run: |
+          cd ${{ github.event.repository.name }}
+          zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
+      - name: Clean existing assets
+        shell: bash
+        run: |
+          curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
+          assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
+          for asset in $assets
+          do
+              bin/hub api -X DELETE $asset
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish to GitHub Release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release_info.outputs.upload_url }}
+          asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
+          asset_name: ${{ github.event.repository.name }}.zip
+          asset_content_type: application/zip
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -6,7 +6,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node-versions: [ '10', '11', '12', '13' ]
+                node-versions: [ '12', '13', '14' ]
         steps:
             - name: Checkout
               uses: actions/[email protected]

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -1,99 +1,121 @@
 name: PHP tests
 on: [push, pull_request]
 jobs:
-    # Check there is no syntax errors in the project
-    php-linter:
-        name: PHP Syntax check 5.6|7.2|7.3
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            - name: PHP syntax checker 5.6
-              uses: prestashop/github-action-php-lint/5.6@master
-
-            - name: PHP syntax checker 7.2
-              uses: prestashop/github-action-php-lint/7.2@master
-
-            - name: PHP syntax checker 7.3
-              uses: prestashop/github-action-php-lint/7.3@master
-
-    # Check the PHP code follow the coding standards
-    php-cs-fixer:
-        name: PHP-CS-Fixer
-        runs-on: ubuntu-latest
-        steps:
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                    php-version: '7.4'
-
-            - name: Checkout
-              uses: actions/[email protected]
-
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                path: vendor
-                key: php-${{ hashFiles('composer.lock') }}
-
-            - name: Install dependencies
-              run: composer install
-
-            - name: Run PHP-CS-Fixer
-              run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no --diff-format udiff
-
-    # Run PHPStan against the module and a PrestaShop release
-    phpstan:
-        name: PHPStan
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                presta-versions: ['1.7.1.2', '1.7.2.5', '1.7.3.4', '1.7.4.4', '1.7.5.1', '1.7.6.9', 'latest']
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            # Add vendor folder in cache to make next builds faster
-            - name: Cache vendor folder
-              uses: actions/cache@v1
-              with:
-                path: vendor
-                key: php-${{ hashFiles('composer.lock') }}
-
-            # Add composer local folder in cache to make next builds faster
-            - name: Cache composer folder
-              uses: actions/cache@v1
-              with:
-                path: ~/.composer/cache
-                key: php-composer-cache
-
-            - run: composer install
-
-            # Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
-            - name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
-              run: ./tests/php/phpstan.sh ${{ matrix.presta-versions }}
-
-    phpunit:
-        name: PHPUnit
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/[email protected]
-
-            # Add vendor folder in cache to make next builds faster
-            - name: Cache vendor folder
-              uses: actions/cache@v1
-              with:
-                  path: vendor
-                  key: php-${{ hashFiles('composer.lock') }}
-
-            # Add composer local folder in cache to make next builds faster
-            - name: Cache composer folder
-              uses: actions/cache@v1
-              with:
-                  path: ~/.composer/cache
-                  key: php-composer-cache
-
-            - run: composer install
-            - run: composer run test
+  php-linter:
+    name: PHP Syntax check 5.6 => 8.1
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: PHP syntax checker 5.6
+        uses: prestashop/github-action-php-lint/5.6@master
+
+      - name: PHP syntax checker 7.2
+        uses: prestashop/github-action-php-lint/7.2@master
+
+      - name: PHP syntax checker 7.3
+        uses: prestashop/github-action-php-lint/7.3@master
+
+      - name: PHP syntax checker 7.4
+        uses: prestashop/github-action-php-lint/7.4@master
+
+      - name: PHP syntax checker 8.0
+        uses: prestashop/github-action-php-lint/8.0@master
+
+      - name: PHP syntax checker 8.1
+        uses: prestashop/github-action-php-lint/8.1@master
+
+  # Check the PHP code follow the coding standards
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+              php-version: '7.4'
+
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: php-${{ hashFiles('composer.lock') }}
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run PHP-CS-Fixer
+        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no --diff-format udiff
+
+  # Run PHPStan against the module and a PrestaShop release
+  phpstan:
+      name: PHPStan
+      runs-on: ubuntu-latest
+      strategy:
+          matrix:
+              presta-versions: ['1.7.6', '1.7.7', '1.7.8', 'latest']
+      steps:
+          - name: Checkout
+            uses: actions/[email protected]
+
+          # Add vendor folder in cache to make next builds faster
+          - name: Cache vendor folder
+            uses: actions/cache@v1
+            with:
+              path: vendor
+              key: php-${{ hashFiles('composer.lock') }}
+
+          # Add composer local folder in cache to make next builds faster
+          - name: Cache composer folder
+            uses: actions/cache@v1
+            with:
+              path: ~/.composer/cache
+              key: php-composer-cache
+
+          - run: composer install
+
+          # Docker images prestashop/prestashop may be used, even if the shop remains uninstalled
+          - name: Execute PHPStan on PrestaShop (Tag ${{ matrix.presta-versions }})
+            run: ./tests/php/phpstan.sh ${{ matrix.presta-versions }}
+
+  phpunit:
+    name: PHPUnit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: xdebug
+
+      - name: Checkout
+        uses: actions/[email protected]
+
+      # Add vendor folder in cache to make next builds faster
+      - name: Cache vendor folder
+        uses: actions/cache@v1
+        with:
+            path: vendor
+            key: php-${{ hashFiles('composer.lock') }}
+
+      # Add composer local folder in cache to make next builds faster
+      - name: Cache composer folder
+        uses: actions/cache@v1
+        with:
+            path: ~/.composer/cache
+            key: php-composer-cache
+
+      - run: composer install
+      - run: composer run test
+
+      - name: Upload coverage results to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.3/php-coveralls.phar
+          chmod +x php-coveralls.phar
+          php php-coveralls.phar --coverage_clover=build/clover.xml --json_path=build/coveralls-upload.json -vvv
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/build/clover.xml
 /vendor
 /node_modules
 tests/php/coverage

diff --git a/_dev/back/blocklayered.scss b/_dev/back/blocklayered.scss
@@ -47,4 +47,10 @@
 	    margin-bottom: 7px;
     }
   }
+
+  .prestashop-switch {
+    span {
+      display: none;
+    }
+  }
 }