chore(composer): upgrade symfony

- add php 8.5 support
- add symfony 8.0 support
- remove annotations support

Author: dzoudzou

.github/workflows/php.yml

@@ -17,8 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.3', '8.4' ]
-        symfony-version: [ '7.3.*' ]
+        php-version: [ '8.4', '8.5' ]
+        symfony-version: [ '7.4.*', '8.0.*' ]
         symfony-deprecations-helper: [ 'max[direct]=0' ]
 
     name: "PHP: ${{ matrix.php-version }}, Symfony: ${{ matrix.symfony-version }}, GrumPHP: ${{ matrix.grumphp-testsuite }}, Composer: ${{ matrix.composer-flag }}"

composer.json

@@ -15,34 +15,33 @@
     }
   ],
   "require": {
-    "php": ">=8.3",
+    "php": ">=8.4",
     "ackintosh/ganesha": "^4.0",
     "beberlei/assert": "^3.3",
-    "doctrine/annotations": "^2.0",
-    "symfony/cache": "^7.3",
-    "symfony/config": "^7.3",
-    "symfony/dependency-injection": "^7.3",
-    "symfony/filesystem": "^7.3",
-    "symfony/http-kernel": "^7.3",
+    "symfony/cache": "^7.4 || ^8.0",
+    "symfony/config": "^7.4 || ^8.0",
+    "symfony/dependency-injection": "^7.4 || ^8.0",
+    "symfony/filesystem": "^7.4 || ^8.0",
+    "symfony/http-kernel": "^7.4 || ^8.0",
     "symfony/proxy-manager-bridge": "^6.4"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.2",
+    "friendsofphp/php-cs-fixer": "^3.92",
     "madewithlove/license-checker": "^0.10|^1.0",
     "nikic/php-parser": "^5.6",
     "php-parallel-lint/php-parallel-lint": "^1.3",
-    "phpmd/phpmd": "^2.6",
-    "phpro/grumphp": "^2.17",
-    "phpstan/phpstan": "^2.0",
-    "phpunit/phpunit": "^12.0",
-    "pixelfederation/coding-standards": "^5.0",
-    "psalm/phar": "^6.13",
+    "phpmd/phpmd": "^2.15",
+    "phpstan/phpstan": "^2.1",
+    "phpro/grumphp-shim": "2.17.0",
+    "phpunit/phpunit": "^12.5",
+    "pixelfederation/coding-standards": "^5.5",
+    "psalm/phar": "^6.14",
     "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "^4.0",
     "symfony/flex": "^2.3",
-    "symfony/framework-bundle": "^7.3",
-    "symfony/monolog-bundle": "^3.7",
-    "symfony/phpunit-bridge": "^7.3"
+    "symfony/framework-bundle": "^7.4 || ^8.0",
+    "symfony/monolog-bundle": "^4.0",
+    "symfony/phpunit-bridge": "^7.4 || ^8.0"
   },
   "autoload": {
     "psr-4": {
@@ -58,14 +57,15 @@
   "config": {
     "sort-packages": true,
     "allow-plugins": {
-      "phpro/grumphp": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
+      "phpro/grumphp": true,
+      "phpro/grumphp-shim": true,
       "symfony/flex": true
     }
   },
   "scripts": {
-    "grumphp8.3": "grumphp run --testsuite=php8.3",
     "grumphp8.4": "grumphp run --testsuite=php8.4",
+    "grumphp8.5": "grumphp run --testsuite=php8.5",
     "lic-check": "license-checker check",
     "phpcs": "phpcs --standard=phpcs.ruleset.xml src",
     "phpcbf": "phpcbf --standard=phpcs.ruleset.xml --extensions=php --tab-width=4 -sp src tests",

config/services.php

@@ -6,8 +6,7 @@
 use Ackintosh\Ganesha\Storage\Adapter\Apcu;
 use Ackintosh\Ganesha\Storage\Adapter\ApcuStore;
 use Ackintosh\Ganesha\Strategy\Rate\Builder;
-use Doctrine\Common\Annotations\AnnotationReader;
-use PixelFederation\CircuitBreakerBundle\AnnotationMetadataReader;
+use PixelFederation\CircuitBreakerBundle\AttributeMetadataReader;
 use PixelFederation\CircuitBreakerBundle\Bridge\Ganesha\GaneshaCircuitBreaker;
 use PixelFederation\CircuitBreakerBundle\Bridge\Symfony\Command\GenerateCircuitBrokenProxiesCacheClearer;
 use PixelFederation\CircuitBreakerBundle\Bridge\Symfony\Command\GenerateCircuitBrokenProxiesCacheWarmer;
@@ -55,12 +54,9 @@
             service('pixel_federation_circuit_breaker.circuit_breaker.cache_item_pool'),
         ]);
 
-    $services->alias(MetadataReader::class, AnnotationMetadataReader::class);
+    $services->set(AttributeMetadataReader::class);
 
-    $services->set('app.doctrine_annotation_reader', AnnotationReader::class);
-
-    $services->set(AnnotationMetadataReader::class)
-        ->arg('$annotationsReader', service('app.doctrine_annotation_reader'));
+    $services->alias(MetadataReader::class, AttributeMetadataReader::class);
 
     $services->alias(MethodExtractor::class, ReflectionMethodExtractor::class);
 

docker-compose.yml

@@ -8,25 +8,25 @@ x-php-common: &php-common
     - COMPOSER_MEMORY_LIMIT=-1
 services:
 
-  circuit-breaker-bundle-php83:
+  circuit-breaker-bundle-php84:
     <<: *php-common
-    container_name: circuit-breaker-bundle-php83
+    container_name: circuit-breaker-bundle-php84
     build:
       dockerfile: ./docker/php/Dockerfile
       context: ./
       args:
-        PHP_VERSION: 8.3
+        PHP_VERSION: 8.4
 
-  circuit-breaker-bundle-php84:
+  circuit-breaker-bundle-php85:
     <<: *php-common
-    container_name: circuit-breaker-bundle-php84
+    container_name: circuit-breaker-bundle-php85
     build:
       dockerfile: ./docker/php/Dockerfile
       context: ./
       args:
-        PHP_VERSION: 8.4
+        PHP_VERSION: 8.5
 
   circuit-breaker-bundle-php-min:
     container_name: circuit-breaker-bundle-php-min
     extends:
-      service: circuit-breaker-bundle-php83
+      service: circuit-breaker-bundle-php84

grumphp.yml

@@ -4,7 +4,7 @@ grumphp:
   git_hook_variables:
     EXEC_GRUMPHP_COMMAND: './bin/grumphp_hooks/environment_spinup && docker exec -t circuit-breaker-bundle-php-min'
   testsuites:
-    php8.3:
+    php8.4:
       tasks:
         - phpcs
         - phpmd
@@ -15,7 +15,7 @@ grumphp:
         - shell
         - phpstan
         - psalm
-    php8.4:
+    php8.5:
       tasks:
         - phpcs
         - phpmd

mutagen.yml

@@ -8,8 +8,8 @@
   <!-- Show progress, show the error codes for each message (source). -->
   <arg value="ps"/>
   <description>PixelFederation rule set.</description>
-  <config name="testVersion" value="8.3"/>
-  <rule ref="vendor/pixelfederation/coding-standards/phpcs.ruleset.83.non-ddd.xml">
+  <config name="testVersion" value="8.4"/>
+  <rule ref="vendor/pixelfederation/coding-standards/phpcs.ruleset.84.non-ddd.xml">
     <exclude name="SlevomatCodingStandard.Functions.FunctionLength.FunctionLength"/>
   </rule>
 

phpcs.ruleset.xml

@@ -5,27 +5,8 @@
 namespace PixelFederation\CircuitBreakerBundle\Annotation;
 
 use Attribute;
-use Doctrine\Common\Annotations\Annotation;
-use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Throwable;
 
-/**
- * @Annotation
- * @Annotation\Target("METHOD")
- * @NamedArgumentConstructor
- * @Annotation\Attributes({
- * @Annotation\Attribute(
- *     "fallbackMethod",
- *     type="string",
- *     required=false
- *   ),
- * @Annotation\Attribute(
- *     "ignoreExceptions",
- *     type="array",
- *     required=false
- *   )
- * })
- */
 #[Attribute(Attribute::TARGET_METHOD)]
 final class CircuitBreaker
 {

src/Annotation/CircuitBreaker.php

@@ -5,32 +5,8 @@
 namespace PixelFederation\CircuitBreakerBundle\Annotation;
 
 use Attribute;
-use Doctrine\Common\Annotations\Annotation;
-use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Throwable;
 
-/**
- * @Annotation
- * @Annotation\Target("CLASS")
- * @NamedArgumentConstructor
- * @Annotation\Attributes({
- * @Annotation\Attribute(
- *     "serviceName",
- *     type="string",
- *     required=false
- *   ),
- * @Annotation\Attribute(
- *     "defaultFallback",
- *     type="string",
- *     required=false
- *   ),
- * @Annotation\Attribute(
- *     "ignoreExceptions",
- *     type="array",
- *     required=false
- *   )
- * })
- */
 #[Attribute(Attribute::TARGET_CLASS)]
 final class CircuitBreakerService
 {