diff --git a/composer.json b/composer.json
index eee3a803..3ce57fa8 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.9.0",
-    "ergebnis/php-cs-fixer-config": "^2.3.0",
+    "ergebnis/php-cs-fixer-config": "^2.4.0",
     "ergebnis/phpstan-rules": "~0.15.2",
     "ergebnis/test-util": "^1.3.0",
     "infection/infection": "~0.15.3",
diff --git a/composer.lock b/composer.lock
index 09541b27..a0588cfc 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": "be0d9d7999f2a481cac1abd76418140b",
+    "content-hash": "cbb4ddaefa4b8c5e9dbf83e1bb2089b2",
     "packages": [],
     "packages-dev": [
         {
@@ -889,16 +889,16 @@
         },
         {
             "name": "ergebnis/php-cs-fixer-config",
-            "version": "2.3.0",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ergebnis/php-cs-fixer-config.git",
-                "reference": "0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879"
+                "reference": "309a510f93528844a9b231d442c1fd4acc87173d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ergebnis/php-cs-fixer-config/zipball/0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879",
-                "reference": "0bcde3f7cd0c4f01f6135f80ddd9cadcbf341879",
+                "url": "https://api.github.com/repos/ergebnis/php-cs-fixer-config/zipball/309a510f93528844a9b231d442c1fd4acc87173d",
+                "reference": "309a510f93528844a9b231d442c1fd4acc87173d",
                 "shasum": ""
             },
             "require": {
@@ -914,14 +914,14 @@
                 "infection/infection": "~0.15.3",
                 "jangregor/phpstan-prophecy": "~0.8.0",
                 "phpstan/extension-installer": "^1.0.5",
-                "phpstan/phpstan": "~0.12.48",
+                "phpstan/phpstan": "~0.12.50",
                 "phpstan/phpstan-deprecation-rules": "~0.12.5",
                 "phpstan/phpstan-phpunit": "~0.12.16",
                 "phpstan/phpstan-strict-rules": "~0.12.5",
                 "phpunit/phpunit": "^8.5.8",
                 "psalm/plugin-phpunit": "~0.12.2",
                 "symfony/filesystem": "^4.4.0",
-                "vimeo/psalm": "^3.16"
+                "vimeo/psalm": "^3.18"
             },
             "type": "library",
             "autoload": {
@@ -947,7 +947,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-08T18:03:06+00:00"
+            "time": "2020-10-21T11:06:57+00:00"
         },
         {
             "name": "ergebnis/phpstan-rules",
@@ -1816,20 +1816,20 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v9.99.99",
+            "version": "v9.99.100",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7"
+                "php": ">= 7"
             },
             "require-dev": {
                 "phpunit/phpunit": "4.*|5.*",
@@ -1857,7 +1857,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-07-02T15:55:56+00:00"
+            "time": "2020-10-15T08:29:30+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1963,23 +1963,23 @@
         },
         {
             "name": "php-cs-fixer/diff",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
                 "symfony/process": "^3.3"
             },
             "type": "library",
@@ -1993,14 +1993,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
                 {
                     "name": "SpacePossum"
                 }
@@ -2010,7 +2010,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2018-02-15T16:58:55+00:00"
+            "time": "2020-10-14T08:39:05+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
diff --git a/src/File.php b/src/File.php
index 33a9c059..f5a720b9 100644
--- a/src/File.php
+++ b/src/File.php
@@ -32,14 +32,7 @@ private function __construct(string $name, Template $template, Period $period, H
     }
 
     /**
-     * @param string   $name
-     * @param Template $template
-     * @param Period   $period
-     * @param Holder   $holder
-     *
      * @throws Exception\InvalidFile
-     *
-     * @return self
      */
     public static function create(string $name, Template $template, Period $period, Holder $holder): self
     {
diff --git a/src/Holder.php b/src/Holder.php
index b709f6a9..f5ac6fcf 100644
--- a/src/Holder.php
+++ b/src/Holder.php
@@ -25,11 +25,7 @@ private function __construct(string $value)
     }
 
     /**
-     * @param string $value
-     *
      * @throws Exception\InvalidHolder
-     *
-     * @return self
      */
     public static function fromString(string $value): self
     {
diff --git a/src/Range.php b/src/Range.php
index dbfd56a1..95a70815 100644
--- a/src/Range.php
+++ b/src/Range.php
@@ -23,12 +23,7 @@ private function __construct(string $value)
     }
 
     /**
-     * @param Year $start
-     * @param Year $end
-     *
      * @throws Exception\InvalidRange
-     *
-     * @return Period
      */
     public static function including(Year $start, Year $end): Period
     {
@@ -51,12 +46,7 @@ public static function including(Year $start, Year $end): Period
     }
 
     /**
-     * @param Year          $start
-     * @param \DateTimeZone $timeZone
-     *
      * @throws Exception\InvalidRange
-     *
-     * @return Period
      */
     public static function since(Year $start, \DateTimeZone $timeZone): Period
     {
diff --git a/src/Template.php b/src/Template.php
index 66cec597..5af0240d 100644
--- a/src/Template.php
+++ b/src/Template.php
@@ -28,11 +28,7 @@ public static function fromString(string $value): self
     }
 
     /**
-     * @param string $name
-     *
      * @throws Exception\InvalidFile
-     *
-     * @return self
      */
     public static function fromFile(string $name): self
     {
@@ -65,8 +61,6 @@ public static function fromFile(string $name): self
      * @param array<string, string> $replacements
      *
      * @throws Exception\InvalidReplacements
-     *
-     * @return string
      */
     public function toString(array $replacements): string
     {
diff --git a/src/Url.php b/src/Url.php
index 30321b62..7595bcda 100644
--- a/src/Url.php
+++ b/src/Url.php
@@ -23,11 +23,7 @@ private function __construct(string $value)
     }
 
     /**
-     * @param string $value
-     *
      * @throws Exception\InvalidUrl
-     *
-     * @return self
      */
     public static function fromString(string $value): self
     {
diff --git a/src/Year.php b/src/Year.php
index d03e3e75..221b2b08 100644
--- a/src/Year.php
+++ b/src/Year.php
@@ -23,11 +23,7 @@ private function __construct(string $value)
     }
 
     /**
-     * @param string $value
-     *
      * @throws Exception\InvalidYear
-     *
-     * @return self
      */
     public static function fromString(string $value): self
     {
diff --git a/test/Unit/FileTest.php b/test/Unit/FileTest.php
index 81b6a5cd..f3bcc03e 100644
--- a/test/Unit/FileTest.php
+++ b/test/Unit/FileTest.php
@@ -54,8 +54,6 @@ protected function tearDown(): void
 
     /**
      * @dataProvider \Ergebnis\License\Test\Util\DataProvider\Text::blankOrEmptyString()
-     *
-     * @param string $name
      */
     public function testCreateRejectsBlankOrEmptyName(string $name): void
     {
diff --git a/test/Unit/HolderTest.php b/test/Unit/HolderTest.php
index 8bf4ceed..b4800995 100644
--- a/test/Unit/HolderTest.php
+++ b/test/Unit/HolderTest.php
@@ -31,8 +31,6 @@ final class HolderTest extends Framework\TestCase
 
     /**
      * @dataProvider \Ergebnis\License\Test\Util\DataProvider\Text::blankOrEmptyString()
-     *
-     * @param string $value
      */
     public function testFromStringRejectsBlankOrEmptyValue(string $value): void
     {
@@ -43,8 +41,6 @@ public function testFromStringRejectsBlankOrEmptyValue(string $value): void
 
     /**
      * @dataProvider provideMultilineValue
-     *
-     * @param string $value
      */
     public function testFromStringRejectsMultilineValue(string $value): void
     {
@@ -85,8 +81,6 @@ public function provideMultilineValue(): \Generator
 
     /**
      * @dataProvider provideValidValue
-     *
-     * @param string $value
      */
     public function testFromStringReturnsHolder(string $value): void
     {
@@ -106,8 +100,6 @@ public function provideValidValue(): \Generator
 
     /**
      * @dataProvider provideUntrimmedValue
-     *
-     * @param string $value
      */
     public function testFromStringReturnsHolderWithTrimmedValue(string $value): void
     {
diff --git a/test/Unit/RangeTest.php b/test/Unit/RangeTest.php
index e8968158..f718ae78 100644
--- a/test/Unit/RangeTest.php
+++ b/test/Unit/RangeTest.php
@@ -78,8 +78,6 @@ public function testIncludingReturnsRangeWhenStartYearIsLessThanEndYear(): void
 
     /**
      * @dataProvider provideTimeZone
-     *
-     * @param \DateTimeZone $timeZone
      */
     public function testSinceRejectsStartYearWhenStartYearIsGreaterThanCurrentYear(\DateTimeZone $timeZone): void
     {
@@ -100,8 +98,6 @@ public function testSinceRejectsStartYearWhenStartYearIsGreaterThanCurrentYear(\
 
     /**
      * @dataProvider provideTimeZone
-     *
-     * @param \DateTimeZone $timeZone
      */
     public function testSinceReturnsYearWhenStartYearEqualsCurrentYear(\DateTimeZone $timeZone): void
     {
@@ -123,8 +119,6 @@ public function testSinceReturnsYearWhenStartYearEqualsCurrentYear(\DateTimeZone
 
     /**
      * @dataProvider provideTimeZone
-     *
-     * @param \DateTimeZone $timeZone
      */
     public function testSinceReturnsRangeWhenStartYearIsLessThanCurrentYear(\DateTimeZone $timeZone): void
     {
diff --git a/test/Unit/TemplateTest.php b/test/Unit/TemplateTest.php
index fdfd01d8..80ad9f92 100644
--- a/test/Unit/TemplateTest.php
+++ b/test/Unit/TemplateTest.php
@@ -65,8 +65,6 @@ public function testFromStringReturnsTemplate(): void
 
     /**
      * @dataProvider \Ergebnis\License\Test\Util\DataProvider\Text::blankOrEmptyString()
-     *
-     * @param string $name
      */
     public function testFromFileRejectsBlankOrEmptyFileName(string $name): void
     {
@@ -115,8 +113,6 @@ public function testFromFileReturnsTemplate(): void
 
     /**
      * @dataProvider provideReplacementsWithInvalidKeys
-     *
-     * @param array $replacements
      */
     public function testToStringRejectsReplacementsWithInvalidKeys(array $replacements): void
     {
@@ -147,8 +143,6 @@ public function provideReplacementsWithInvalidKeys(): \Generator
 
     /**
      * @dataProvider provideReplacementsWithInvalidValues
-     *
-     * @param array $replacements
      */
     public function testToStringRejectsReplacementsWithInvalidValues(array $replacements): void
     {
diff --git a/test/Unit/UrlTest.php b/test/Unit/UrlTest.php
index 8e16ecbb..5d2018ef 100644
--- a/test/Unit/UrlTest.php
+++ b/test/Unit/UrlTest.php
@@ -31,8 +31,6 @@ final class UrlTest extends Framework\TestCase
 
     /**
      * @dataProvider provideInvalidValue
-     *
-     * @param string $value
      */
     public function testFromStringRejectsInvalidValue(string $value): void
     {
@@ -58,8 +56,6 @@ public function provideInvalidValue(): \Generator
 
     /**
      * @dataProvider provideValidValue
-     *
-     * @param string $value
      */
     public function testFromStringReturnsUrl(string $value): void
     {
@@ -79,8 +75,6 @@ public function provideValidValue(): \Generator
 
     /**
      * @dataProvider provideUntrimmedValue
-     *
-     * @param string $value
      */
     public function testFromStringReturnsUrlWithTrimmedValue(string $value): void
     {
diff --git a/test/Unit/YearTest.php b/test/Unit/YearTest.php
index 074b1621..ab305a98 100644
--- a/test/Unit/YearTest.php
+++ b/test/Unit/YearTest.php
@@ -31,8 +31,6 @@ final class YearTest extends Framework\TestCase
 
     /**
      * @dataProvider provideInvalidValue
-     *
-     * @param string $value
      */
     public function testFromStringRejectsInvalidValue(string $value): void
     {
@@ -66,8 +64,6 @@ public function provideInvalidValue(): \Generator
 
     /**
      * @dataProvider provideValidValue
-     *
-     * @param string $value
      */
     public function testFromStringReturnsYear(string $value): void
     {