Merge pull request #258 from mimmi20/updates

mimmi20 · web-flow · commit fb3df02c083f · 2024-12-03T16:48:37.000+01:00
upgrade to PHP 8.3
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,7 @@ jobs:
   validate:
     name: "Validate Project"
 
-    uses: "mimmi20/ci/.github/workflows/validate.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/validate.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -37,7 +37,7 @@ jobs:
 
     needs: "validate"
 
-    uses: "mimmi20/ci/.github/workflows/install.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/install.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -50,7 +50,7 @@ jobs:
 
     needs: "install"
 
-    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -70,7 +70,7 @@ jobs:
 
     needs: "analytics"
 
-    uses: "mimmi20/ci/.github/workflows/test.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/test.yml@8.3"
     with:
       extensions: "ctype, dom, fileinfo, intl, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -12,10 +12,12 @@
 
 declare(strict_types = 1);
 
-$header = <<<'EOF'
+$year = date('Y');
+
+$header = <<<EOF
     This file is part of the mimmi20/monolog-callbackfilterhandler package.
 
-    Copyright (c) 2022-2024, Thomas Mueller <mimmi20@live.de>
+    Copyright (c) 2022-{$year}, Thomas Mueller <mimmi20@live.de>
     Copyright (c) 2015-2021, Laurent Laville <pear@laurent-laville.org>
 
     For the full copyright and license information, please view the LICENSE
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "source": "https://github.com/mimmi20/monolog-callbackfilterhandler"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+    "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
     "ext-json": "*",
     "monolog/monolog": "^3.8.0"
   },
@@ -33,17 +33,17 @@
     "ext-xml": "*",
     "ext-xmlwriter": "*",
     "infection/infection": "^0.29.8",
-    "mimmi20/coding-standard": "^5.2.45",
+    "mimmi20/coding-standard": "^6.0.0",
     "nikic/php-parser": "^5.3.1",
     "phpstan/extension-installer": "^1.4.3",
     "phpstan/phpstan": "^1.12.9",
     "phpstan/phpstan-deprecation-rules": "^1.2.1",
     "phpstan/phpstan-phpunit": "^1.4.0",
-    "phpunit/phpunit": "^10.5.25",
+    "phpunit/phpunit": "^11.4.4",
     "psr/log": "^3.0.2",
     "rector/rector": "^1.2.10",
     "rector/type-perfect": "^1.0.0",
-    "symfony/process": "^6.4.15",
+    "symfony/process": "^7.2.0",
     "symplify/phpstan-rules": "^13.0.1",
     "tomasvotruba/cognitive-complexity": "^0.2.3",
     "tomasvotruba/type-coverage": "^1.0.0",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,7 +1,7 @@
 parameters:
   level: max
 
-  phpVersion: 80100 # PHP 8.1
+  phpVersion: 80300 # PHP 8.3
 
   parallel:
     maximumNumberOfProcesses: 1
@@ -104,7 +104,7 @@ parameters:
     return_type: 100
     param_type: 100
     property_type: 100
-    constant_type: 0
+    constant_type: 100
     # also, how many files has declare strict types
     declare: 100
 
diff --git a/phpunit.xml b/phpunit.xml
@@ -9,16 +9,18 @@
     beStrictAboutCoverageMetadata="false"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
+    displayDetailsOnPhpunitDeprecations="true"
     displayDetailsOnTestsThatTriggerWarnings="true"
     displayDetailsOnTestsThatTriggerNotices="true"
     displayDetailsOnTestsThatTriggerErrors="true"
     displayDetailsOnTestsThatTriggerDeprecations="true"
     displayDetailsOnSkippedTests="true"
     displayDetailsOnIncompleteTests="true"
+    failOnPhpunitDeprecation="true"
     failOnEmptyTestSuite="true"
     failOnIncomplete="true"
     failOnRisky="true"
-    failOnSkipped="false"
+    failOnSkipped="true"
     failOnDeprecation="true"
     failOnNotice="true"
     failOnWarning="true"
@@ -51,7 +53,7 @@
         </testsuite>
     </testsuites>
 
-    <coverage includeUncoveredFiles="true">
+    <coverage>
         <report>
             <clover outputFile=".reports/clover.xml"/>
             <html outputDirectory=".reports/report/" lowUpperBound="50" highLowerBound="80"/>
diff --git a/rector.php b/rector.php
@@ -30,7 +30,7 @@
 
     $rectorConfig->sets([
         SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_83,
         PHPUnitSetList::PHPUNIT_100,
     ]);
 
diff --git a/src/CallbackFilterHandler.php b/src/CallbackFilterHandler.php
@@ -27,6 +27,7 @@
 use Monolog\Level;
 use Monolog\LogRecord;
 use Monolog\ResettableInterface;
+use Override;
 use Psr\Log\LogLevel;
 use RuntimeException;
 
@@ -91,6 +92,7 @@ public function __construct(
     }
 
     /** @throws void */
+    #[Override]
     public function isHandling(LogRecord $record): bool
     {
         if (!parent::isHandling($record)) {
@@ -110,6 +112,7 @@ public function isHandling(LogRecord $record): bool
     }
 
     /** @throws RuntimeException */
+    #[Override]
     public function handle(LogRecord $record): bool
     {
         // The same logic as in FilterHandler
@@ -130,6 +133,7 @@ public function handle(LogRecord $record): bool
      *
      * @throws RuntimeException
      */
+    #[Override]
     public function handleBatch(array $records): void
     {
         // The same logic as in FilterHandler
@@ -175,6 +179,7 @@ public function getHandler(LogRecord | null $record = null): HandlerInterface
     }
 
     /** @throws RuntimeException */
+    #[Override]
     public function reset(): void
     {
         $this->resetProcessors();
diff --git a/tests/AbstractTestHandler.php b/tests/AbstractTestHandler.php
@@ -16,6 +16,7 @@
 
 use Monolog\Handler\Handler;
 use Monolog\LogRecord;
+use Override;
 
 /**
  * Features included in dev-master branch but not yet released as a stable version
@@ -33,6 +34,7 @@ abstract class AbstractTestHandler extends Handler
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      */
+    #[Override]
     public function isHandling(LogRecord $record): bool
     {
         return false;
@@ -43,6 +45,7 @@ public function isHandling(LogRecord $record): bool
      *
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      */
+    #[Override]
     public function handle(LogRecord $record): bool
     {
         return false;
diff --git a/tests/CallbackFilterHandlerTest.php b/tests/CallbackFilterHandlerTest.php
@@ -22,6 +22,7 @@
 use Monolog\LogRecord;
 use Monolog\Processor\ProcessorInterface;
 use Monolog\Processor\UidProcessor;
+use Override;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Exception;
 use Psr\Log\InvalidArgumentException;
@@ -452,6 +453,7 @@ public function testHandleWithBadFilterThrowsException(): void
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function isHandling(LogRecord $record): bool
             {
                 throw new \Exception();
@@ -462,6 +464,7 @@ public function isHandling(LogRecord $record): bool
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function handle(LogRecord $record): bool
             {
                 throw new \Exception();
@@ -474,12 +477,14 @@ public function handle(LogRecord $record): bool
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function handleBatch(array $records): void
             {
                 throw new \Exception();
             }
 
             /** @throws \Exception */
+            #[Override]
             public function close(): void
             {
                 throw new \Exception();
@@ -508,6 +513,7 @@ public function testGetHandler(): void
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function isHandling(LogRecord $record): bool
             {
                 throw new \Exception();
@@ -518,6 +524,7 @@ public function isHandling(LogRecord $record): bool
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function handle(LogRecord $record): bool
             {
                 throw new \Exception();
@@ -530,12 +537,14 @@ public function handle(LogRecord $record): bool
              *
              * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
              */
+            #[Override]
             public function handleBatch(array $records): void
             {
                 throw new \Exception();
             }
 
             /** @throws \Exception */
+            #[Override]
             public function close(): void
             {
                 throw new \Exception();
diff --git a/tests/TestHandler.php b/tests/TestHandler.php
@@ -16,6 +16,7 @@
 
 use Monolog\Handler\TestHandler as BaseTestHandler;
 use Monolog\Level;
+use Override;
 
 use function array_keys;
 use function count;
@@ -82,6 +83,7 @@ public function hasDebugThatContains(string $message): bool
     }
 
     /** @throws void */
+    #[Override]
     public function hasRecordThatContains(string $message, Level $level): bool
     {
         if (!isset($this->recordsByLevel[$level->value])) {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`use Monolog\Level;`
`28`	`28`	`use Monolog\LogRecord;`
`29`	`29`	`use Monolog\ResettableInterface;`
	`30`	`+use Override;`
`30`	`31`	`use Psr\Log\LogLevel;`
`31`	`32`	`use RuntimeException;`
`32`	`33`
`@@ -91,6 +92,7 @@ public function __construct(`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`/** @throws void */`
	`95`	`+ #[Override]`
`94`	`96`	`public function isHandling(LogRecord $record): bool`
`95`	`97`	`{`
`96`	`98`	`if (!parent::isHandling($record)) {`
`@@ -110,6 +112,7 @@ public function isHandling(LogRecord $record): bool`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`/** @throws RuntimeException */`
	`115`	`+ #[Override]`
`113`	`116`	`public function handle(LogRecord $record): bool`
`114`	`117`	`{`
`115`	`118`	`// The same logic as in FilterHandler`
`@@ -130,6 +133,7 @@ public function handle(LogRecord $record): bool`
`130`	`133`	`*`
`131`	`134`	`* @throws RuntimeException`
`132`	`135`	`*/`
	`136`	`+ #[Override]`
`133`	`137`	`public function handleBatch(array $records): void`
`134`	`138`	`{`
`135`	`139`	`// The same logic as in FilterHandler`
`@@ -175,6 +179,7 @@ public function getHandler(LogRecord \| null $record = null): HandlerInterface`
`175`	`179`	`}`
`176`	`180`
`177`	`181`	`/** @throws RuntimeException */`
	`182`	`+ #[Override]`
`178`	`183`	`public function reset(): void`
`179`	`184`	`{`
`180`	`185`	`$this->resetProcessors();`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`use Monolog\Handler\Handler;`
`18`	`18`	`use Monolog\LogRecord;`
	`19`	`+use Override;`
`19`	`20`
`20`	`21`	`/**`
`21`	`22`	`* Features included in dev-master branch but not yet released as a stable version`
`@@ -33,6 +34,7 @@ abstract class AbstractTestHandler extends Handler`
`33`	`34`	`*`
`34`	`35`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`35`	`36`	`*/`
	`37`	`+ #[Override]`
`36`	`38`	`public function isHandling(LogRecord $record): bool`
`37`	`39`	`{`
`38`	`40`	`return false;`
`@@ -43,6 +45,7 @@ public function isHandling(LogRecord $record): bool`
`43`	`45`	`*`
`44`	`46`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`45`	`47`	`*/`
	`48`	`+ #[Override]`
`46`	`49`	`public function handle(LogRecord $record): bool`
`47`	`50`	`{`
`48`	`51`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`use Monolog\LogRecord;`
`23`	`23`	`use Monolog\Processor\ProcessorInterface;`
`24`	`24`	`use Monolog\Processor\UidProcessor;`
	`25`	`+use Override;`
`25`	`26`	`use PHPUnit\Framework\Attributes\DataProvider;`
`26`	`27`	`use PHPUnit\Framework\Exception;`
`27`	`28`	`use Psr\Log\InvalidArgumentException;`
`@@ -452,6 +453,7 @@ public function testHandleWithBadFilterThrowsException(): void`
`452`	`453`	`*`
`453`	`454`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`454`	`455`	`*/`
	`456`	`+ #[Override]`
`455`	`457`	`public function isHandling(LogRecord $record): bool`
`456`	`458`	`{`
`457`	`459`	`throw new \Exception();`
`@@ -462,6 +464,7 @@ public function isHandling(LogRecord $record): bool`
`462`	`464`	`*`
`463`	`465`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`464`	`466`	`*/`
	`467`	`+ #[Override]`
`465`	`468`	`public function handle(LogRecord $record): bool`
`466`	`469`	`{`
`467`	`470`	`throw new \Exception();`
`@@ -474,12 +477,14 @@ public function handle(LogRecord $record): bool`
`474`	`477`	`*`
`475`	`478`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`476`	`479`	`*/`
	`480`	`+ #[Override]`
`477`	`481`	`public function handleBatch(array $records): void`
`478`	`482`	`{`
`479`	`483`	`throw new \Exception();`
`480`	`484`	`}`
`481`	`485`
`482`	`486`	`/** @throws \Exception */`
	`487`	`+ #[Override]`
`483`	`488`	`public function close(): void`
`484`	`489`	`{`
`485`	`490`	`throw new \Exception();`
`@@ -508,6 +513,7 @@ public function testGetHandler(): void`
`508`	`513`	`*`
`509`	`514`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`510`	`515`	`*/`
	`516`	`+ #[Override]`
`511`	`517`	`public function isHandling(LogRecord $record): bool`
`512`	`518`	`{`
`513`	`519`	`throw new \Exception();`
`@@ -518,6 +524,7 @@ public function isHandling(LogRecord $record): bool`
`518`	`524`	`*`
`519`	`525`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`520`	`526`	`*/`
	`527`	`+ #[Override]`
`521`	`528`	`public function handle(LogRecord $record): bool`
`522`	`529`	`{`
`523`	`530`	`throw new \Exception();`
`@@ -530,12 +537,14 @@ public function handle(LogRecord $record): bool`
`530`	`537`	`*`
`531`	`538`	`* @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter`
`532`	`539`	`*/`
	`540`	`+ #[Override]`
`533`	`541`	`public function handleBatch(array $records): void`
`534`	`542`	`{`
`535`	`543`	`throw new \Exception();`
`536`	`544`	`}`
`537`	`545`
`538`	`546`	`/** @throws \Exception */`
	`547`	`+ #[Override]`
`539`	`548`	`public function close(): void`
`540`	`549`	`{`
`541`	`550`	`throw new \Exception();`