Merge pull request #626 from ergebnis/feature/synchronize

Enhancement: Synchronize with `ergebnis/php-package-template`
ergebnis · Jul 27, 2023 · 0e88af7 · 0e88af7
2 parents 163671a + 28b4df4
commit 0e88af7
Show file tree

Hide file tree

Showing 27 changed files with 131 additions and 87 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,6 +2,7 @@ root = true
 
 [*]
 charset = utf-8
+end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = true

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -14,6 +14,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:
@@ -84,6 +86,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:
@@ -131,13 +135,15 @@ jobs:
           trust-gpg-keys: "0x033E5F8D801A2F8D"
 
       - name: "Run maglnet/composer-require-checker"
-        run: ".phive/composer-require-checker check --config-file=$(pwd)/composer-require-checker.json"
+        run: ".phive/composer-require-checker check --ansi --config-file=$(pwd)/composer-require-checker.json"
 
   refactoring:
     name: "Refactoring"
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:
@@ -198,6 +204,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:
@@ -246,6 +254,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:
@@ -297,6 +307,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:

diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -15,6 +15,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     if: >
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' &&

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,6 +13,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     steps:
       - name: "Create release"
         uses: "ergebnis/.github/actions/github/release/create@1.8.0"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -12,6 +12,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     strategy:
       matrix:
         php-version:

diff --git a/.github/workflows/triage.yaml b/.github/workflows/triage.yaml
@@ -13,6 +13,8 @@ jobs:
 
     runs-on: "ubuntu-latest"
 
+    timeout-minutes: 5
+
     steps:
       - name: "Add labels based on branch name"
         uses: "ergebnis/.github/actions/github/pull-request/add-label-based-on-branch-name@1.8.0"

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-require-checker" version="^4.6.0" installed="4.6.0" location="./.phive/composer-require-checker" copy="false"/>
+    <phar name="composer-require-checker" version="^4.6.0" installed="4.6.0" location="./.phive/composer-require-checker" copy="false"/>
 </phive>
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -35,8 +35,7 @@
         '.note/',
     ])
     ->ignoreDotFiles(false)
-    ->in(__DIR__)
-    ->name('.php-cs-fixer.php');
+    ->in(__DIR__);
 
 $config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
 

diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
     "ergebnis/composer-normalize": "^2.33.0",
     "ergebnis/license": "^2.1.0",
     "ergebnis/php-cs-fixer-config": "^5.12.0",
+    "ergebnis/phpunit-slow-test-detector": "^2.3.0",
     "phpunit/phpunit": "^10.2.6",
     "psalm/plugin-phpunit": "~0.18.4",
     "rector/rector": "~0.17.4",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
+<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
   <file src="src/Method.php">
     <UnusedClass>
       <code>Method</code>

diff --git a/rector.php b/rector.php
@@ -13,6 +13,7 @@
 
 use Rector\Config;
 use Rector\Core;
+use Rector\Php81;
 use Rector\PHPUnit;
 
 return static function (Config\RectorConfig $rectorConfig): void {
@@ -25,7 +26,11 @@
 
     $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81);
 
+    $rectorConfig->rules([
+        Php81\Rector\Property\ReadOnlyPropertyRector::class,
+    ]);
+
     $rectorConfig->sets([
-        PHPUnit\Set\PHPUnitSetList::PHPUNIT_91,
+        PHPUnit\Set\PHPUnitSetList::PHPUNIT_100,
     ]);
 };
diff --git a/test/Unit/Method/Rfc/Rfc2068Test.php b/test/Unit/Method/Rfc/Rfc2068Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc2068;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc2068
- */
+#[Framework\Attributes\CoversClass(Rfc2068::class)]
 final class Rfc2068Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc3253Test.php b/test/Unit/Method/Rfc/Rfc3253Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc3253;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc3253
- */
+#[Framework\Attributes\CoversClass(Rfc3253::class)]
 final class Rfc3253Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc3648Test.php b/test/Unit/Method/Rfc/Rfc3648Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc3648;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc3648
- */
+#[Framework\Attributes\CoversClass(Rfc3648::class)]
 final class Rfc3648Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc3744Test.php b/test/Unit/Method/Rfc/Rfc3744Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc3744;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc3744
- */
+#[Framework\Attributes\CoversClass(Rfc3744::class)]
 final class Rfc3744Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc4437Test.php b/test/Unit/Method/Rfc/Rfc4437Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc4437;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc4437
- */
+#[Framework\Attributes\CoversClass(Rfc4437::class)]
 final class Rfc4437Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc4791Test.php b/test/Unit/Method/Rfc/Rfc4791Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc4791;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc4791
- */
+#[Framework\Attributes\CoversClass(Rfc4791::class)]
 final class Rfc4791Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc4918Test.php b/test/Unit/Method/Rfc/Rfc4918Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc4918;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc4918
- */
+#[Framework\Attributes\CoversClass(Rfc4918::class)]
 final class Rfc4918Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc5323Test.php b/test/Unit/Method/Rfc/Rfc5323Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc5323;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc5323
- */
+#[Framework\Attributes\CoversClass(Rfc5323::class)]
 final class Rfc5323Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc5789Test.php b/test/Unit/Method/Rfc/Rfc5789Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc5789;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc5789
- */
+#[Framework\Attributes\CoversClass(Rfc5789::class)]
 final class Rfc5789Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc5842Test.php b/test/Unit/Method/Rfc/Rfc5842Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc5842;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc5842
- */
+#[Framework\Attributes\CoversClass(Rfc5842::class)]
 final class Rfc5842Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc7231Test.php b/test/Unit/Method/Rfc/Rfc7231Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc7231;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc7231
- */
+#[Framework\Attributes\CoversClass(Rfc7231::class)]
 final class Rfc7231Test extends Framework\TestCase
 {
     public function testConstants(): void

diff --git a/test/Unit/Method/Rfc/Rfc7540Test.php b/test/Unit/Method/Rfc/Rfc7540Test.php
@@ -16,11 +16,7 @@
 use Ergebnis\Http\Method\Rfc\Rfc7540;
 use PHPUnit\Framework;
 
-/**
- * @internal
- *
- * @covers \Ergebnis\Http\Method\Rfc\Rfc7540
- */
+#[Framework\Attributes\CoversClass(Rfc7540::class)]
 final class Rfc7540Test extends Framework\TestCase
 {
     public function testConstants(): void