diff --git a/.travis.yml b/.travis.yml
index 1f556b8..f3817dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,15 +6,12 @@ git:
   depth: 5
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
   - nightly
 
 env:
   matrix:
-    -
     - dependencies=lowest
     - dependencies=highest
 
diff --git a/composer.json b/composer.json
index 953ed30..f83b2a7 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "config": {
         "platform": {
-            "php": "5.6"
+            "php": "7.2"
         }
     },
     "support": {
@@ -25,10 +25,10 @@
         }
     },
     "require": {
-        "php": ">=5.6",
-        "phpro/grumphp": "0.14.*"
+        "php": ">=7.2",
+        "phpro/grumphp": "0.16.*"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "2.* | 3.*"
+        "squizlabs/php_codesniffer": ">=3.5.0 <4.0.0"
     }
 }
diff --git a/grumphp.yml b/grumphp.yml
index 668cca2..07da0f5 100644
--- a/grumphp.yml
+++ b/grumphp.yml
@@ -14,15 +14,13 @@ parameters:
                 - "exit;"
             triggered_by: [php]
         git_commit_message:
-            matchers:
-                - /(\[(!!!|WIP)]|)(\[(BUGFIX|FEATURE|TASK|CLEANUP|SECURITY)]|Merge branch '.+' into) .+/
-            case_insensitive: false
-            multiline: true
-            additional_modifiers: ''
+            max_subject_width: 120
+            max_body_width: 120
+            enforce_capitalized_subject: false
         jsonlint:
             detect_key_conflicts: true
         phpcs:
-            standard: "PSR2"
+            standard: "PSR12"
             warning_severity: 900000
             tab_width: 4
         yamllint: ~
diff --git a/src/BomFixerTask.php b/src/BomFixerTask.php
index 902dad4..6afc455 100644
--- a/src/BomFixerTask.php
+++ b/src/BomFixerTask.php
@@ -1,35 +1,23 @@
 <?php
+
 namespace PLUS\GrumPHPBomTask;
 
 use GrumPHP\Runner\TaskResult;
+use GrumPHP\Runner\TaskResultInterface;
 use GrumPHP\Task\AbstractExternalTask;
 use GrumPHP\Task\Context\ContextInterface;
 use GrumPHP\Task\Context\GitPreCommitContext;
 use GrumPHP\Task\Context\RunContext;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- * Class BomFixerTask
- *
- * @author Matthias Vogel <matthias.vogel@pluswerk.ag>
- * @package PLUS\GrumphpBomTask
- */
 class BomFixerTask extends AbstractExternalTask
 {
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return 'plus_bom_fixer';
     }
 
-    /**
-     * @return \Symfony\Component\OptionsResolver\OptionsResolver
-     * @throws \Symfony\Component\OptionsResolver\Exception\AccessException
-     * @throws \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
-     */
-    public function getConfigurableOptions()
+    public function getConfigurableOptions(): OptionsResolver
     {
         $resolver = new OptionsResolver();
         $resolver->setDefaults(
@@ -43,29 +31,12 @@ public function getConfigurableOptions()
         return $resolver;
     }
 
-    /**
-     * @param ContextInterface $context
-     *
-     * @return bool
-     */
-    public function canRunInContext(ContextInterface $context)
+    public function canRunInContext(ContextInterface $context): bool
     {
         return ($context instanceof GitPreCommitContext || $context instanceof RunContext);
     }
 
-    /**
-     * @param ContextInterface $context
-     *
-     * @return \GrumPHP\Runner\TaskResult
-     * @throws \GrumPHP\Exception\RuntimeException
-     * @throws \Symfony\Component\OptionsResolver\Exception\AccessException
-     * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
-     * @throws \Symfony\Component\OptionsResolver\Exception\MissingOptionsException
-     * @throws \Symfony\Component\OptionsResolver\Exception\NoSuchOptionException
-     * @throws \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
-     * @throws \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
-     */
-    public function run(ContextInterface $context)
+    public function run(ContextInterface $context): TaskResultInterface
     {
         $config = $this->getConfiguration();
         $files = $context->getFiles()->extensions($config['triggered_by']);
@@ -75,10 +46,12 @@ public function run(ContextInterface $context)
 
         if (is_file('./vendor/bin/fixbom')) {
             $fixCommand = './vendor/bin/fixbom';
-        } else if (is_file('./bin/fixbom')) {
-            $fixCommand = './bin/fixbom';
         } else {
-            $fixCommand = 'fixbom';
+            if (is_file('./bin/fixbom')) {
+                $fixCommand = './bin/fixbom';
+            } else {
+                $fixCommand = 'fixbom';
+            }
         }
         $shouldGetFixedLog = [];
         /** @var \Symfony\Component\Finder\SplFileInfo $file */
@@ -102,14 +75,7 @@ public function run(ContextInterface $context)
         return TaskResult::createPassed($this, $context);
     }
 
-
-    /**
-     * @param string $filename
-     * @param string $search
-     *
-     * @return bool
-     */
-    protected function fileInfoSearch($filename, $search)
+    protected function fileInfoSearch(string $filename, string $search): bool
     {
         $output = [];
         exec('file ' . '"' . $filename . '"', $output, $returnVar);
@@ -119,12 +85,7 @@ protected function fileInfoSearch($filename, $search)
         return false;
     }
 
-    /**
-     * @param string $filename
-     *
-     * @return bool
-     */
-    public function isFileWithBOM($filename)
+    public function isFileWithBOM(string $filename): bool
     {
         return $this->fileInfoSearch($filename, 'BOM');
     }
diff --git a/src/ExtensionLoader.php b/src/ExtensionLoader.php
index fec600c..4862d0b 100644
--- a/src/ExtensionLoader.php
+++ b/src/ExtensionLoader.php
@@ -1,28 +1,13 @@
 <?php
+
 namespace PLUS\GrumPHPBomTask;
 
 use GrumPHP\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * Class ExtensionLoader
- *
- * @author Matthias Vogel <matthias.vogel@pluswerk.ag>
- * @package PLUS\GrumphpBomTask
- */
 class ExtensionLoader implements ExtensionInterface
 {
-    /**
-     * @param ContainerBuilder $container
-     *
-     * @return \Symfony\Component\DependencyInjection\Definition
-     * @throws \Exception
-     * @throws \Symfony\Component\DependencyInjection\Exception\BadMethodCallException
-     * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
-     * @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
-     * @throws \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
-     */
     public function load(ContainerBuilder $container)
     {
         return $container->register('task.plus_bom_fixer', BomFixerTask::class)