diff --git a/.github/workflows/php.yml b/.github/workflows/build.yml
similarity index 63%
rename from .github/workflows/php.yml
rename to .github/workflows/build.yml
index ebb41ae..5e11e9a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/build.yml
@@ -11,12 +11,18 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        php-version:
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+
     steps:
-    - uses: actions/checkout@v2
+    - name: "Checkout"
+      uses: "actions/checkout@v2"
 
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-      
     - name: Cache Composer packages
       id: composer-cache
       uses: actions/cache@v2
@@ -30,8 +36,5 @@ jobs:
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: composer install --prefer-dist --no-progress --no-suggest
 
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
-
-    # - name: Run test suite
-    #   run: composer run-script test
+    - name: "Phing - app check"
+      run: "vendor/bin/phing"
diff --git a/build.xml b/build.xml
index 7d47832..0c67061 100644
--- a/build.xml
+++ b/build.xml
@@ -4,9 +4,7 @@
 	<!-- ============================================ -->
 	<!-- Target: check                                -->
 	<!-- ============================================ -->
-	<target name="check">
-		<exec command="php vendor/bin/phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 src" passthru="true" checkreturn="true"/>
-		<phingcall target="phpstan"/>
+	<target name="check" depends="lint, phpcs, phpstan, tests">
 		<exec command="vendor/bin/phpunit tests" checkreturn="true" passthru="true"/>
 	</target>
 	<!-- ============================================ -->
@@ -21,4 +19,22 @@
 	<target name="phpstan">
 		<exec command="php -d memory_limit=8G vendor/bin/phpstan analyse src/ -c phpstan.neon --no-progress" passthru="true" checkreturn="true" level="error"/>
 	</target>
+	<!-- ============================================ -->
+	<!-- Target: lint                                 -->
+	<!-- ============================================ -->
+	<target name="lint">
+		<exec command="vendor/bin/parallel-lint src  --exclude vendor" passthru="true" checkreturn="true" level="error"/>
+	</target>
+	<!-- ============================================ -->
+	<!-- Target: phpcs                                -->
+	<!-- ============================================ -->
+	<target name="phpcs">
+		<exec command="php vendor/bin/phpcs --standard=ruleset.xml --extensions=php --encoding=utf-8 src" passthru="true" checkreturn="true"/>
+	</target>
+	<!-- ============================================ -->
+	<!-- Target: tests                                -->
+	<!-- ============================================ -->
+	<target name="tests">
+		<exec command="vendor/bin/phpunit tests" passthru="true" checkreturn="true" level="error"/>
+	</target>
 </project>
diff --git a/composer.json b/composer.json
index 2cd3b20..5ae069d 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
 		"fzaninotto/faker": "^1.7",
 		"phpstan/phpstan": "^0.12.3",
 		"mockery/mockery": "^1.3",
-		"sllh/composer-versions-check": "^2.0"
+		"sllh/composer-versions-check": "^2.0",
+		"php-parallel-lint/php-parallel-lint": "^1.2"
 	},
 	"autoload": {
 		"psr-4": {
diff --git a/composer.lock b/composer.lock
index 363f06f..4e91014 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "30aeb0e9b4c62f7c0cb2ae7455a34d64",
+    "content-hash": "cf46e601dea5414ced8ffdf82eb0a0d0",
     "packages": [
         {
             "name": "consistence/consistence",
@@ -624,6 +624,59 @@
             ],
             "time": "2020-02-03T18:50:54+00:00"
         },
+        {
+            "name": "php-parallel-lint/php-parallel-lint",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
+                "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/474f18bc6cc6aca61ca40bfab55139de614e51ca",
+                "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.4.0"
+            },
+            "replace": {
+                "grogy/php-parallel-lint": "*",
+                "jakub-onderka/php-parallel-lint": "*"
+            },
+            "require-dev": {
+                "nette/tester": "^1.3 || ^2.0",
+                "php-parallel-lint/php-console-highlighter": "~0.3",
+                "squizlabs/php_codesniffer": "~3.0"
+            },
+            "suggest": {
+                "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "ahoj@jakubonderka.cz"
+                }
+            ],
+            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
+            "time": "2020-04-04T12:18:32+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.1.0",