bump: Symfony 7, Infra (#180)

sigwinhq · Jan 26, 2024 · c85fee3 · c85fee3
1 parent 2065fe0
commit c85fee3
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 70 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ jobs:
             PHP_VERSION: ${{ matrix.php }}
         strategy:
             matrix:
-                php: [ "8.1", "8.2" ]
+                php: [ "8.2", "8.3" ]
                 dependencies: [ lowest, highest ]
         steps:
             -
@@ -29,7 +29,7 @@ jobs:
             PHP_VERSION: ${{ matrix.php }}
         strategy:
             matrix:
-                php: [ "8.1", "8.2" ]
+                php: [ "8.2", "8.3" ]
                 dependencies: [ lowest, highest ]
         steps:
             -

diff --git a/composer.json b/composer.json
@@ -10,10 +10,10 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-json": "*",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/serializer": "^5.4 || ^6.0"
+        "symfony/options-resolver": "^6.4 || ^7.0",
+        "symfony/serializer": "^6.4 || ^7.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.12",
@@ -23,13 +23,13 @@
         "openspout/openspout": "^4.0",
         "phpoffice/phpspreadsheet": "^1.29",
         "phpunit/phpunit": "^9.6",
-        "sigwin/infra": "~1.6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0"
+        "sigwin/infra": "~1.9.0",
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0"
     },
     "replace": {
         "sigwin/xezilaires-core": "self.version",

diff --git a/src/Bridge/PhpSpreadsheet/Spreadsheet.php b/src/Bridge/PhpSpreadsheet/Spreadsheet.php
@@ -125,10 +125,7 @@ private function getActiveWorksheet(): Worksheet
         }
     }
 
-    /**
-     * @return null|float|int|string
-     */
-    private function fetchCell(string $columnName, int $rowIndex)
+    private function fetchCell(string $columnName, int $rowIndex): null|float|int|string
     {
         $worksheet = $this->getActiveWorksheet();
 

diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json
@@ -10,16 +10,16 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "phpoffice/phpspreadsheet": "^1.29",
         "sigwin/xezilaires": "^0.6"
     },
     "require-dev": {
         "doctrine/annotations": "^1.11",
         "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0"
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.0"
     },
     "conflict": {
         "nikic/php-parser": "< 4.14"

diff --git a/src/Bridge/Spout/Spreadsheet.php b/src/Bridge/Spout/Spreadsheet.php
@@ -151,7 +151,7 @@ private function getReader(): ReaderInterface
             try {
                 $this->reader = new Reader();
                 $this->reader->open($path);
-            } catch (UnsupportedTypeException|IOException $exception) {
+            } catch (IOException|UnsupportedTypeException $exception) {
                 throw SpreadsheetException::invalidSpreadsheet($exception);
             }
         }

diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json
@@ -10,17 +10,17 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "openspout/openspout": "^4.0",
         "sigwin/xezilaires": "^0.6"
     },
     "require-dev": {
         "doctrine/annotations": "^1.11",
         "nyholm/nsa": "^1.1",
         "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0"
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.0"
     },
     "conflict": {
         "nikic/php-parser": "< 4.14"

diff --git a/src/Bridge/Symfony/Command/SerializeCommand.php b/src/Bridge/Symfony/Command/SerializeCommand.php
@@ -13,6 +13,7 @@
 
 namespace Xezilaires\Bridge\Symfony\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -23,19 +24,19 @@
 use Xezilaires\Metadata\Annotation\AnnotationDriver;
 use Xezilaires\Serializer;
 
+#[AsCommand(
+    name: 'xezilaires:serialize',
+    description: 'Serialize Excel files into JSON, XML, CSV',
+)]
 final class SerializeCommand extends Command
 {
-    protected static $defaultName = 'xezilaires:serialize';
-
     private IteratorFactory $iteratorFactory;
 
     private Serializer $serializer;
 
     public function __construct(IteratorFactory $iteratorFactory, Serializer $serializer)
     {
-        parent::__construct('xezilaires:serialize');
-
-        $this->setDescription('Serialize Excel files into JSON, XML, CSV');
+        parent::__construct();
 
         $this->iteratorFactory = $iteratorFactory;
         $this->serializer = $serializer;

diff --git a/src/Bridge/Symfony/Command/ValidateCommand.php b/src/Bridge/Symfony/Command/ValidateCommand.php
@@ -13,6 +13,7 @@
 
 namespace Xezilaires\Bridge\Symfony\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -24,19 +25,19 @@
 use Xezilaires\Metadata\Annotation\AnnotationDriver;
 use Xezilaires\Validator;
 
+#[AsCommand(
+    name: 'xezilaires:validate',
+    description: 'Validate the input file',
+)]
 final class ValidateCommand extends Command
 {
-    protected static $defaultName = 'xezilaires:validate';
-
     private IteratorFactory $iteratorFactory;
 
     private Validator $validator;
 
     public function __construct(IteratorFactory $iteratorFactory, Validator $validator)
     {
-        parent::__construct('xezilaires:validate');
-
-        $this->setDescription('Validate the input file');
+        parent::__construct();
 
         $this->iteratorFactory = $iteratorFactory;
         $this->validator = $validator;

diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json
@@ -10,21 +10,21 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "sigwin/xezilaires": "^0.6",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0"
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "nyholm/symfony-bundle-test": "dev-master",
         "phpunit/phpunit": "^9.6",
         "sigwin/xezilaires-phpspreadsheet": "^0.6",
         "sigwin/xezilaires-spout": "^0.6",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0"
+        "symfony/phpunit-bridge": "^6.4 || ^7.0"
     },
     "conflict": {
         "nikic/php-parser": "< 4.14"

diff --git a/src/Xezilaires/Annotation/ArrayReference.php b/src/Xezilaires/Annotation/ArrayReference.php
@@ -15,7 +15,6 @@
 
 /**
  * @Annotation
- *
  * @Target({"PROPERTY"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)]

diff --git a/src/Xezilaires/Annotation/ColumnReference.php b/src/Xezilaires/Annotation/ColumnReference.php
@@ -15,9 +15,7 @@
 
 /**
  * @Annotation
- *
  * @Target({"ANNOTATION", "PROPERTY"})
- *
  * @NamedArgumentConstructor
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)]

diff --git a/src/Xezilaires/Annotation/HeaderReference.php b/src/Xezilaires/Annotation/HeaderReference.php
@@ -15,9 +15,7 @@
 
 /**
  * @Annotation
- *
  * @Target({"ANNOTATION", "PROPERTY"})
- *
  * @NamedArgumentConstructor
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)]

diff --git a/src/Xezilaires/Annotation/Options.php b/src/Xezilaires/Annotation/Options.php
@@ -15,9 +15,7 @@
 
 /**
  * @Annotation
- *
  * @Target({"CLASS"})
- *
  * @NamedArgumentConstructor
  */
 #[\Attribute(\Attribute::TARGET_CLASS)]

diff --git a/src/Xezilaires/Metadata/Annotation/AnnotationDriver.php b/src/Xezilaires/Metadata/Annotation/AnnotationDriver.php
@@ -117,10 +117,7 @@ private function getOptions(\ReflectionClass $reflectionClass, ?array $additiona
         return array_filter($options);
     }
 
-    /**
-     * @return ColumnReference|HeaderReference
-     */
-    private function createReference(Annotation\Reference $annotation)
+    private function createReference(Annotation\Reference $annotation): ColumnReference|HeaderReference
     {
         switch (true) {
             case $annotation instanceof Annotation\ColumnReference:

diff --git a/src/Xezilaires/Metadata/Mapping.php b/src/Xezilaires/Metadata/Mapping.php
@@ -72,10 +72,7 @@ public function getReferences(): array
         return $this->references;
     }
 
-    /**
-     * @return null|bool|int|string
-     */
-    public function getOption(string $option)
+    public function getOption(string $option): null|bool|int|string
     {
         return $this->options[$option];
     }

diff --git a/src/Xezilaires/Metadata/Reference.php b/src/Xezilaires/Metadata/Reference.php
@@ -18,5 +18,5 @@ interface Reference
     /**
      * @return Reference[]|string
      */
-    public function getReference();
+    public function getReference(): array|string;
 }
diff --git a/src/Xezilaires/SpreadsheetIterator.php b/src/Xezilaires/SpreadsheetIterator.php
@@ -206,10 +206,8 @@ private function readArrayReference(array $row, ArrayReference $reference): arra
 
     /**
      * @param array<string, null|float|int|string> $row
-     *
-     * @return null|float|int|string
      */
-    private function readReference(array $row, Reference $reference)
+    private function readReference(array $row, Reference $reference): null|float|int|string
     {
         switch (true) {
             case $reference instanceof ColumnReference:

diff --git a/src/Xezilaires/Test/ExampleBundle/Serializer/ProductNormalizer.php b/src/Xezilaires/Test/ExampleBundle/Serializer/ProductNormalizer.php
@@ -48,11 +48,16 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         return (object) $data;
     }
 
-    public function supportsDenormalization(mixed $data, string $type, ?string $format = null): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         return $type === Product::class;
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [Product::class => true];
+    }
+
     private function cast(string $price): float
     {
         return (float) filter_var($price, \FILTER_SANITIZE_NUMBER_FLOAT, \FILTER_FLAG_ALLOW_FRACTION);

diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json
@@ -10,20 +10,20 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/serializer": "^5.4 || ^6.0"
+        "php": "^8.2",
+        "symfony/options-resolver": "^6.4 || ^7.0",
+        "symfony/serializer": "^6.4 || ^7.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.12",
         "nyholm/nsa": "^1.1",
         "openspout/openspout": "^4.0",
         "phpunit/phpunit": "^9.6",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/phpunit-bridge": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0"
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/phpunit-bridge": "^6.4 || ^7.0",
+        "symfony/property-access": "^6.4 || ^7.0",
+        "symfony/property-info": "^6.4 || ^7.0",
+        "symfony/validator": "^6.4 || ^7.0"
     },
     "conflict": {
         "nikic/php-parser": "< 4.14"