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

Fix/pre commit

Author: webaaz

Taskfile.php.yml

@@ -2,7 +2,7 @@ version: 3
 
 vars:
   # Required variables
-  PHP_VERSION: '{{ .PHP_VERSION }}'
+  PHP_VERSION: '{{ .PHP_VERSION}}'
   PHPUNIT_VERSION: '{{ .PHPUNIT_VERSION  }}'
   # Defaulted variable
   COMPOSER_VERSION: '{{ .COMPOSER_VERSION | default "2" }}'

Taskfile.yml

@@ -87,31 +87,43 @@ tasks:
     cmds:
       - pre-commit install --hook-type pre-commit --hook-type commit-msg
 
+  lint:build:
+    desc: Build lint container (php-cs-fixer)
+    cmds:
+        - docker build -t lint:ps -f lint.Dockerfile .
+
   lint:
     desc: Lint the php code
     deps:
-      - 8.3:docker:build
+      - lint:build
     cmds:
       - docker compose run --rm -T php composer exec phpcs -- src/
 
   lint:fix:
     desc: Lint fix the php code
     deps:
-      - 8.3:docker:build
+      - lint:build
     cmds:
       - docker compose run --rm -T php composer exec phpcbf -- src/ tests/
 
+  php-compatibility:build:
+      desc: Build php-compatibility container (phpcs)
+      cmds:
+          - docker build -t php-compatibility:ps -f php-compatibility.Dockerfile .
+
   dist:
     desc: Build zip dist package using Docker
     deps:
-      - 8.3:docker:build
+      - php-compatibility:build
     cmds:
       - docker compose run --rm php ./scripts/build.sh
 
   php-compatibility:
     desc: Check compatibility code
+    deps:
+        - php-compatibility:build
     cmds:
-      - docker compose run --rm -T php composer exec phpcs -- -p src --standard=PHPCompatibility -s --runtime-set testVersion 5.6-8.1 --ignore=\*/vendor/\*
+      - docker compose run --rm -T php composer exec phpcs -- -p src --standard=PHPCompatibility -s --runtime-set testVersion 5.6-8.3 --ignore=\*/vendor/\*
 
   gh-cli:
     internal: true

lint.Dockerfile

@@ -0,0 +1,17 @@
+ARG PHP_IMG_TAG=5.6-alpine
+FROM php:${PHP_IMG_TAG} AS production
+
+WORKDIR /composer
+
+RUN apk add --no-cache php-tokenizer
+RUN apk add --no-cache composer
+RUN composer self-update
+RUN composer init -n --name="alma/php-cs" --description="php-cs" --type="library"
+
+# PHP CS Fixer
+RUN composer require friendsofphp/php-cs-fixer --no-interaction
+
+WORKDIR /app
+
+ENTRYPOINT ["/composer/vendor/bin/php-cs-fixer"]
+CMD ["--version"]

php-compatibility.Dockerfile

@@ -0,0 +1,20 @@
+ARG PHP_IMG_TAG=5.6-alpine
+FROM php:${PHP_IMG_TAG} AS production
+
+WORKDIR /composer
+
+RUN apk add --no-cache composer
+RUN composer self-update
+RUN composer init -n --name="alma/php-cs" --description="php-cs" --type="library"
+
+RUN composer config --no-interaction --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+RUN composer require squizlabs/php_codesniffer --no-interaction
+RUN composer require phpcompatibility/php-compatibility --no-interaction
+RUN composer require phpcompatibility/phpcompatibility-paragonie:"*" --no-interaction
+
+RUN /composer/vendor/bin/phpcs --config-set installed_paths /composer/vendor/escapestudios/symfony2-coding-standard,/composer/vendor/squizlabs/php_codesniffer,/composer/vendor/phpcompatibility/php-compatibility,/composer/vendor/phpcompatibility/phpcompatibility-paragonie
+
+WORKDIR /app
+
+ENTRYPOINT ["/composer/vendor/bin/phpcs"]
+CMD ["--version"]