From 1f4002bdda2c4cbd052e47f49af665ad57d3a8aa Mon Sep 17 00:00:00 2001
From: Warxcell <warxcell@gmail.com>
Date: Fri, 11 Aug 2023 11:25:47 +0300
Subject: [PATCH] Bump to symfony 8.0

---
 .idea/files.iml                   |  3 +--
 .idea/misc.xml                    |  5 -----
 .idea/php.xml                     | 21 ++++++++++++++++++++-
 composer.json                     |  2 +-
 src/Validator/Constraint/File.php | 31 +++++++++++++++++++------------
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.idea/files.iml b/.idea/files.iml
index 7233e26..a18a419 100644
--- a/.idea/files.iml
+++ b/.idea/files.iml
@@ -2,7 +2,6 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Arxy\FilesBundle\Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Arxy\FilesBundle\" />
       <excludeFolder url="file://$MODULE_DIR$/.phpunit.cache" />
@@ -12,4 +11,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d7c5271..28a804d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,9 +3,4 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="SwUserDefinedSpecifications">
-    <option name="specTypeByUrl">
-      <map />
-    </option>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index 64798a7..b5919b8 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="codingStandard" value="Custom" />
+    <option name="customRuleset" value="$PROJECT_DIR$/phpcs.xml" />
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
   <component name="PhpCSFixer">
     <phpcsfixer_settings>
       <PhpCSFixerConfiguration tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
@@ -124,7 +136,10 @@
       <path value="$PROJECT_DIR$/vendor/slevomat/coding-standard" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
   <component name="PhpUnit">
     <phpunit_settings>
       <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml.dist" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" phpunit_phar_path="" use_configuration_file="true" />
@@ -135,4 +150,8 @@
       <PsalmConfiguration tool_path="$PROJECT_DIR$/vendor/bin/psalm" />
     </Psalm_settings>
   </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="config" value="$PROJECT_DIR$/psalm.xml.dist" />
+    <option name="transferred" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 95681f6..2df9f8a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 | ^8.0",
+        "php": "^8.0",
         "league/mime-type-detection": "^1.7",
         "gabrielelana/byte-units": "^0.5.0"
     },
diff --git a/src/Validator/Constraint/File.php b/src/Validator/Constraint/File.php
index 5c10b56..e15ee71 100644
--- a/src/Validator/Constraint/File.php
+++ b/src/Validator/Constraint/File.php
@@ -4,6 +4,7 @@
 
 namespace Arxy\FilesBundle\Validator\Constraint;
 
+use Attribute;
 use Exception;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -16,29 +17,35 @@
  * @Annotation
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)]
 class File extends Constraint
 {
     public ?int $maxSize = null;
-    public string $maxSizeMessage = 'The file is too large ({{ size }}). Allowed maximum size is {{ limit }}.';
+
     /** @var array<int, string> */
     public array $mimeTypes = [];
-    public string $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
 
     /**
-     * @param array<string, mixed> $options
-     * @param array<int, string> $groups
-     * @param mixed $payload
+     * @param array<string>|string $mimeTypes
+     * @param array<string>|null $groups
      */
-    public function __construct(array $options = null, array $groups = null, $payload = null)
-    {
-        if (isset($options['maxSize']) && is_string($options['maxSize'])) {
-            $options['maxSize'] = $this->normalizeBinaryFormat($options['maxSize']);
+    public function __construct(
+        int|string|null $maxSize,
+        public string $maxSizeMessage = 'The file is too large ({{ size }}). Allowed maximum size is {{ limit }}.',
+        array|string $mimeTypes = [],
+        public string $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.',
+        array $groups = null,
+    ) {
+        if (is_string($maxSize)) {
+            $maxSize = $this->normalizeBinaryFormat($maxSize);
         }
+        $this->maxSize = $maxSize;
 
-        if (isset($options['mimeTypes']) && !is_array($options['mimeTypes'])) {
-            $options['mimeTypes'] = [$options['mimeTypes']];
+        if (!is_array($mimeTypes)) {
+            $mimeTypes = [$mimeTypes];
         }
-        parent::__construct($options, $groups, $payload);
+        $this->mimeTypes = $mimeTypes;
+        parent::__construct(groups: $groups);
     }
 
     private function normalizeBinaryFormat(string $maxSize): int