Merge pull request #588 from mimmi20/updates

upgrade to PHP 8.3

Author: mimmi20

.codeclimate.yml

@@ -9,7 +9,7 @@ checks:
   method-complexity:
     enabled: false
   method-count:
-    enabled: true
+    enabled: false
   method-lines:
     enabled: false
   nested-control-flow:

.github/dependabot.yml

@@ -15,26 +15,6 @@ updates:
       time: "04:00"
       timezone: "Europe/Berlin"
 
-    groups:
-      security-updates:
-        applies-to: "security-updates"
-        patterns:
-          - "*"
-        exclude-patterns:
-          - "friendsofphp/php-cs-fixer"
-          - "sirbrillig/phpcs-variable-analysis"
-          - "slevomat/coding-standard"
-          - "squizlabs/php_codesniffer"
-      version-updates:
-        applies-to: "version-updates"
-        patterns:
-          - "*"
-        exclude-patterns:
-          - "friendsofphp/php-cs-fixer"
-          - "sirbrillig/phpcs-variable-analysis"
-          - "slevomat/coding-standard"
-          - "squizlabs/php_codesniffer"
-
     open-pull-requests-limit: 10
 
     reviewers:
@@ -55,30 +35,9 @@ updates:
       prefix: "composer"
 
     ignore:
-      - dependency-name: "browscap/browscap"
       - dependency-name: "elasticsearch/elasticsearch"
-      - dependency-name: "endorphin-studio/browser-detector-tests"
-      - dependency-name: "illuminate/config"
-      - dependency-name: "illuminate/container"
-      - dependency-name: "illuminate/contracts"
-      - dependency-name: "illuminate/events"
-      - dependency-name: "illuminate/filesystem"
-      - dependency-name: "illuminate/view"
-      - dependency-name: "infection/infection"
-      - dependency-name: "laminas/laminas-diactoros"
-      - dependency-name: "laminas/laminas-servicemanager"
-      - dependency-name: "nikic/php-parser"
-      - dependency-name: "phpunit/phpunit"
       - dependency-name: "predis/predis"
       - dependency-name: "psr/container"
-      - dependency-name: "psr/http-message"
-      - dependency-name: "psr/log"
-      - dependency-name: "psr/simple-cache"
-      - dependency-name: "symfony/console"
-      - dependency-name: "symfony/filesystem"
-      - dependency-name: "symfony/finder"
-      - dependency-name: "symfony/http-foundation"
-      - dependency-name: "symfony/yaml"
 
     # Disable rebasing for all pull requests
     rebase-strategy: "disabled"
@@ -93,18 +52,6 @@ updates:
       time: "04:00"
       timezone: "Europe/Berlin"
 
-    groups:
-      # Specify a name for the group, which will be used in pull request titles
-      # and branch names
-      security-updates:
-        applies-to: "security-updates"
-        patterns:
-          - "*"
-      version-updates:
-        applies-to: "version-updates"
-        patterns:
-          - "*"
-
     open-pull-requests-limit: 10
 
     reviewers:

.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: "amqp, ctype, curl, dom, iconv, intl, mbstring, openssl, simplexml, sockets, 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"
@@ -48,7 +48,7 @@ jobs:
 
     needs: "install"
 
-    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.3"
     with:
       extensions: "amqp, ctype, curl, dom, iconv, intl, mbstring, openssl, simplexml, sockets, 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"
@@ -57,7 +57,7 @@ jobs:
       skip-phpcs: false
       skip-phpstan: false
       skip-rector: false
-      skip-phpmd: false
+      skip-phpmd: true
       skip-eslint: true
       skip-stylelint: true
       skip-prettier: true

.github/workflows/install.yml

@@ -22,7 +22,7 @@ jobs:
 
     runs-on: "${{ matrix.operating-system }}"
     timeout-minutes: 10
-    continue-on-error: ${{ '8.4' == matrix.php-version }}
+    continue-on-error: ${{ '8.4' == matrix.php-version || '8.5' == matrix.php-version }}
 
     strategy:
       fail-fast: false
@@ -32,8 +32,6 @@ jobs:
           - "ubuntu-24.04"
 
         php-version:
-          - "8.1"
-          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"

.github/workflows/test.yml

@@ -86,9 +86,8 @@ jobs:
           - "ubuntu-24.04"
 
         php-version:
-          - "8.1"
-          - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
@@ -200,7 +199,7 @@ jobs:
           - "ubuntu-24.04"
 
         php-version:
-          - "8.1"
+          - "8.3"
 
         dependencies:
           - "lowest"

.php-cs-fixer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *
@@ -10,10 +11,12 @@
 
 declare(strict_types = 1);
 
-$header = <<<'EOF'
+$year = date('Y');
+
+$header = <<<EOF
     This file is part of the mimmi20/monolog-factory package.
 
-    Copyright (c) 2022-2024, Thomas Mueller <[email protected]>
+    Copyright (c) 2022-{$year}, Thomas Mueller <[email protected]>
 
     For the full copyright and license information, please view the LICENSE
     file that was distributed with this source code.

composer.json

@@ -16,7 +16,7 @@
     "source": "https://github.com/mimmi20/monolog-factory"
   },
   "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-mbstring": "*",
     "monolog/monolog": "^3.8.1",
     "psr/container": "^1.1.2 || ^2.0.2",
@@ -37,30 +37,29 @@
     "graylog2/gelf-php": "^2.0.1",
     "guzzlehttp/guzzle": "^7.9.2",
     "guzzlehttp/psr7": "^2.7.0",
-    "infection/infection": "^0.27.11 || ^0.28.1 || ^0.29.8",
+    "infection/infection": "^0.29.8",
     "jk/monolog-request-header-processor": "^1.0.0",
-    "laminas/laminas-config": "^3.10.1",
     "laminas/laminas-eventmanager": "^3.14.0",
     "laminas/laminas-modulemanager": "^2.17.0",
-    "laminas/laminas-servicemanager": "^3.22.1 || ^4.0.0",
+    "laminas/laminas-servicemanager": "^3.22.1",
     "mikey179/vfsstream": "^1.6.12",
-    "mimmi20/coding-standard": "^5.2.44",
+    "mimmi20/coding-standard": "^6.0.1",
     "mimmi20/monolog-callbackfilterhandler": "^3.0.7",
     "mimmi20/monolog-streamformatter": "^3.1.4",
-    "nikic/php-parser": "^4.19.1 || ^5.0.2",
+    "nikic/php-parser": "^5.3.1",
     "php-console/php-console": "^3.1.8",
     "phpstan/extension-installer": "^1.4.3",
     "phpstan/phpstan": "^1.12.8",
     "phpstan/phpstan-deprecation-rules": "^1.2.1",
     "phpstan/phpstan-phpunit": "^1.4.0",
-    "phpunit/phpunit": "^10.5.25",
+    "phpunit/phpunit": "^11.4.4",
     "predis/predis": "^1.1.10 || ^2.1.2",
     "rector/rector": "^1.2.10",
     "rector/type-perfect": "^1.0.0",
     "ruflin/elastica": "^8.1.0",
-    "symfony/mailer": "^6.4.13",
-    "symfony/mime": "^6.4.13",
-    "symfony/process": "^6.4.15",
+    "symfony/mailer": "^7.2.0",
+    "symfony/mime": "^7.2.0",
+    "symfony/process": "^7.2.0",
     "symplify/phpstan-rules": "^13.0.1",
     "tomasvotruba/cognitive-complexity": "^0.2.3",
     "tomasvotruba/type-coverage": "^1.0.0",

phpmd.ruleset.xml

@@ -1,7 +1,7 @@
 parameters:
   level: 8
 
-  phpVersion: 80100 # PHP 8.1
+  phpVersion: 80300 # PHP 8.3
 
   parallel:
     maximumNumberOfProcesses: 1
@@ -104,7 +104,7 @@ parameters:
     return_type: 99.9
     param_type: 92.3
     property_type: 100
-    constant_type: 0
+    constant_type: 100
     # also, how many files has declare strict types
     declare: 100
 

phpstan.neon

@@ -9,12 +9,14 @@
     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"
@@ -51,7 +53,7 @@
         </testsuite>
     </testsuites>
 
-    <coverage includeUncoveredFiles="true">
+    <coverage>
         <report>
             <clover outputFile=".reports/clover.xml"/>
             <html outputDirectory=".reports/report/" lowUpperBound="50" highLowerBound="80"/>

phpunit.xml

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *
@@ -28,7 +29,7 @@
 
     $rectorConfig->sets([
         SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_83,
         PHPUnitSetList::PHPUNIT_100,
     ]);
 

rector.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *

src/AddFormatterTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *

src/AddProcessorTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *
@@ -17,6 +18,7 @@
 use Elasticsearch\Common\Exceptions\AuthenticationConfigException;
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Override;
 use Psr\Container\ContainerInterface;
 
 use function array_filter;
@@ -38,6 +40,7 @@ final class ElasticsearchV7Factory implements FactoryInterface
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
+    #[Override]
     public function __invoke(ContainerInterface $container, $requestedName, array | null $options = null): V7Client
     {
         if (!is_array($options)) {

src/Client/ElasticsearchV7Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *
@@ -16,6 +17,7 @@
 use Elastic\Elasticsearch\ClientBuilder;
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Override;
 use Psr\Container\ContainerInterface;
 
 use function array_filter;
@@ -36,6 +38,7 @@ final class ElasticsearchV8Factory implements FactoryInterface
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
+    #[Override]
     public function __invoke(ContainerInterface $container, $requestedName, array | null $options = null): V8Client
     {
         if (!is_array($options)) {

src/Client/ElasticsearchV8Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *

src/ClientPluginManager.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the mimmi20/monolog-factory package.
  *
@@ -15,6 +16,7 @@
 use Laminas\ServiceManager\Config;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Override;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 
@@ -33,6 +35,7 @@ final class ClientPluginManagerFactory implements FactoryInterface
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter
      */
+    #[Override]
     public function __invoke(
         ContainerInterface $container,
         $requestedName,