Merge pull request #51 from PrestaShop/dev

Release 2.1.3
PrestaShop · Apr 13, 2022 · e02b6b2 · e02b6b2
2 parents 68221f7 + 7b1603c
commit e02b6b2
Show file tree

Hide file tree

Showing 10 changed files with 158 additions and 131 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -2,24 +2,6 @@ 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: ../
+  build-and-release-draft:
+    name: Build & Release draft
+    uses: PrestaShop/.github/.github/workflows/build-release.yml@master
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -1,76 +1,89 @@
 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: Run PHP-CS-Fixer
-              uses: prestashopcorp/github-action-php-cs-fixer@master
-
-    # Run PHPStan against the module and a PrestaShop release
-    phpstan:
-        name: PHPStan
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                presta-versions: ['1.7.1.0', 'latest']
-        steps:
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: '7.4'
-
-            - 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: Pull PrestaShop files (Tag ${{ matrix.presta-versions }})
-              run: docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:${{ matrix.presta-versions }}
-
-            # Run a container for PHPStan, having access to the module content and PrestaShop sources.
-            # This tool is outside the composer.json because of the compatibility with PHP 5.6
-            - name : Run PHPStan
-              run: docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html --workdir=/web/module phpstan/phpstan:0.12 analyse --configuration=/web/module/tests/phpstan/phpstan.neon
+  # Check there is no syntax errors in the project
+  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.8', 'latest']
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+
+      - 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/phpstan.sh ${{ matrix.presta-versions }}
diff --git a/composer.lock b/composer.lock
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>ps_searchbar</name>
 	<displayName><![CDATA[Search bar]]></displayName>
-	<version><![CDATA[2.1.2]]></version>
+	<version><![CDATA[2.1.3]]></version>
 	<description><![CDATA[Adds a quick search bar to your website.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<is_configurable>0</is_configurable>

diff --git a/ps_searchbar.css b/ps_searchbar.css
@@ -19,7 +19,7 @@
 }
 #search_widget form input {
   width: 100%;
-  padding: 10px 40px;
+  padding: 10px 20px 10px 40px;
   outline: none;
   background-color: #f1f1f1;
   border: none;
@@ -68,6 +68,6 @@
 
 @media only screen and (min-width: 992px) {
   #search_widget {
-    min-width: 15.63rem;
+    min-width: 16.5rem;
   }
 }