Merge pull request #325 from alma/fix/pre-commit

Fix/pre commit

Author: webaaz

.editorconfig

@@ -776,7 +776,7 @@ ij_json_wrap_long_lines = false
 
 [{*.htm,*.html,*.sht,*.shtm,*.shtml}]
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
+ij_html_align_attributes = false
 ij_html_align_text = false
 ij_html_attribute_wrap = normal
 ij_html_block_comment_add_space = false

.pre-commit-config.yaml

@@ -23,13 +23,22 @@ repos:
       - id: coding-standard-fixer
         name: PHP and WordPress coding standards Fixer test
         language: system
-        entry: ./bin/coding-standard-fixer.sh
+        pass_filenames: false
+        entry: task lint:fix
         stages: [ pre-commit ]
 
       - id: coding-standard
         name: Check the PHP and WordPress coding standards
         language: system
-        entry: ./bin/coding-standard.sh
+        pass_filenames: false
+        entry: task lint
+        stages: [ pre-commit ]
+
+      - id: php-compatibility
+        name: Check the PHP compatibility
+        language: system
+        pass_filenames: false
+        entry: task php-compatibility
         stages: [ pre-commit ]
 
   # - repo: https://github.com/returntocorp/semgrep

Taskfile.yml

@@ -18,40 +18,50 @@ tasks:
     cmds:
       - docker compose build --build-arg UID="$(id -u)" php5-6
 
-  test:
-    desc: Run tests
-    deps:
-      - build:test
-    cmds:
-      - docker compose run --rm test
-      - docker compose down --remove-orphans
-
-  pre-commit:install:
-    desc: Install pre-commit hooks
+  lint:build:
+    desc: Build lint container (php-cs-fixer)
     cmds:
-      - pre-commit install --hook-type commit-msg
-      - pre-commit install
+      - docker build -t lint:wc -f lint.Dockerfile .
 
   lint:
-    desc: Run linter
+    desc: Run lint container
     deps:
-      - build:php5-6
+      - lint:build
     cmds:
-      - docker compose run --rm php5-6 php ./vendor/bin/phpcs --standard=phpcs.xml ./
+      - ./bin/lint.sh
 
   lint:fix:
-    desc: Run linter with autofix
+    desc: Run lint container
     deps:
-      - build:php5-6
+      - lint:build
+    cmds:
+      - ./bin/lint-fix.sh
+
+  php-compatibility:build:
+    desc: Build php-compatibility container (phpcs)
     cmds:
-      - docker compose run --rm php5-6 php ./vendor/bin/phpcbf --standard=phpcs.xml ./
+      - docker build -t php-compatibility:wc -f lint.Dockerfile .
 
   php-compatibility:
-    desc: Check compatibility code
+    desc: Check compatibility code in PHP-CS container
     deps:
-      - build:php5-6
+      - php-compatibility:build
+    cmds:
+      - ./bin/php-compatibility.sh
+
+  test:
+    desc: Run tests
+    deps:
+      - build:test
     cmds:
-      - docker compose run --rm php5-6 php ./vendor/bin/phpcs -d memory_limit=512M -p ./ --standard=PHPCompatibility -s --runtime-set testVersion 5.6-8.1 --ignore='*/vendor/*,build/*'
+      - docker compose run --rm test
+      - docker compose down --remove-orphans
+
+  pre-commit:install:
+    desc: Install pre-commit hooks
+    cmds:
+      - pre-commit install --hook-type commit-msg
+      - pre-commit install
 
   dist:
     desc: Build zip file

alma-gateway-for-woocommerce.php

@@ -67,6 +67,8 @@
  * @return  Alma\Woocommerce\AlmaPlugin
  * @noinspection PhpIncludeInspection
  */
+
+
 function alma_plugin() {
 	static $plugin;
 

bin/coding-standard-fixer.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+docker run --rm -v "$(pwd):/app" -w /app lint:wc -v --standard=phpcs.xml ./
+EXIT_CODE=$?
+
+if [[ $EXIT_CODE -ne 0 ]]; then
+    echo "Fix the errors with PHPcbf automatic fixer before commit!"
+    exit 1
+fi

bin/coding-standard.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+docker run --rm -v "$(pwd):/app" -w /app lint:wc -v --standard=phpcs.xml ./
+EXIT_CODE=$?
+
+if [[ $EXIT_CODE -ne 0 ]]; then
+    echo "Fix the errors before commit!"
+    exit 1
+fi

bin/lint-fix.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+docker run --rm -v "$(pwd):/app" -v "$(pwd)/.php_cs.cache:/app/.php_cs.cache" --entrypoint /composer/vendor/bin/phpcs \
+  php-compatibility:wc -p . --standard=PHPCompatibility -s --runtime-set testVersion 5.6-8.4 --ignore=\*/vendor/\*,build/*,node_modules/*,coverage/*
+EXIT_CODE=$?
+
+if [[ $EXIT_CODE -ne 0 ]]; then
+    echo "Check PHP code compatibility before commit!"
+    exit 1
+fi

bin/lint.sh

@@ -40,7 +40,7 @@ services:
   php5-6:
     build:
       context: ./
-      dockerfile: Dockerfile.legacy
+      dockerfile: legacy.Dockerfile
     volumes:
       - ./:/home/phpuser
       - /home/phpuser/src/vendor # do not mount vendor inside container