[TASK] simplify Dockerfile

[jirafeau.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c6905e87fa11fbfab64a3400978a255acd2edc1..cddf9409209f5ad1b3ba9bbdffc83a94a97ccc65 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 # Select docker image from https://hub.docker.com/_/php/
 # Select docker image from https://hub.docker.com/_/php/

-image: php:7.1
+image: php:7.3

 
 # Select what we should cache
 cache:
 
 # Select what we should cache
 cache:


@@ -17,6 +17,7 @@ before_script:
   - curl -sS https://getcomposer.org/installer | php
   # Create composer.json file manually, since this is a project without any non-dev dependencies yet
   - php composer.phar require --dev php-parallel-lint/php-parallel-lint
   - curl -sS https://getcomposer.org/installer | php
   # Create composer.json file manually, since this is a project without any non-dev dependencies yet
   - php composer.phar require --dev php-parallel-lint/php-parallel-lint

+  - php composer.phar require --dev friendsofphp/php-cs-fixer

   # Install all project dependencies
   - php composer.phar install
 
   # Install all project dependencies
   - php composer.phar install
 


@@ -24,14 +25,36 @@ before_script:
 test_app_phpdefaultversion:
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .
 test_app_phpdefaultversion:
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .

+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+
+job_lint_app_phpnextversion:
+  image: php:7.4
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+  allow_failure: true

 
 # Run same tests with older supported versions
 
 # Run same tests with older supported versions

+test_app_php72:
+  image: php:7.2
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+
+test_app_php71:
+  image: php:7.1
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+

 test_app_php70:
   image: php:7.0
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .
 test_app_php70:
   image: php:7.0
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .

+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2

 
 test_app_php56:
   image: php:5.6
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .
 
 test_app_php56:
   image: php:5.6
   script:
     - ./vendor/bin/parallel-lint --exclude vendor .

+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2