Merge pull request #1021 from spiral/sf-7

Allow Symfony 7.0 components
spiral · Dec 5, 2023 · 4a2a096 · 4a2a096
2 parents ac995f5 + e38946b
commit 4a2a096
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -51,10 +51,10 @@
         "psr/simple-cache": "2 - 3",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/composer-publish-plugin": "^1.0",
-        "symfony/console": "^6.1",
-        "symfony/finder": "^5.3.7|^6.0",
-        "symfony/mailer": "^5.1|^6.0",
-        "symfony/translation": "^5.1|^6.0",
+        "symfony/console": "^6.1 || ^7.0",
+        "symfony/finder": "^5.3.7 || ^6.0 || ^7.0",
+        "symfony/mailer": "^5.1 || ^6.0 || ^7.0",
+        "symfony/translation": "^5.1 || ^6.0 || ^7.0",
         "vlucas/phpdotenv": "^5.4"
     },
     "autoload": {

diff --git a/src/Console/composer.json b/src/Console/composer.json
@@ -32,7 +32,7 @@
         "spiral/events": "^3.11",
         "spiral/hmvc": "^3.11",
         "spiral/tokenizer": "^3.11",
-        "symfony/console": "^6.1"
+        "symfony/console": "^6.1 || ^7.0"
     },
     "require-dev": {
         "spiral/boot": "^3.11",

diff --git a/src/Console/src/InputProxy.php b/src/Console/src/InputProxy.php
@@ -18,6 +18,11 @@ public function __construct(
     ) {
     }
 
+    public function __toString(): string
+    {
+        return $this->input->__toString();
+    }
+
     public function getFirstArgument(): ?string
     {
         return $this->overwrite['firstArgument'] ?? $this->input->getFirstArgument();
@@ -36,20 +41,14 @@ public function getParameterOption(
         return $this->input->getParameterOption($values, $default, $onlyParams);
     }
 
-    /**
-     * Since v4.0 the return type will be changed to void {@see InputInterface::bind}.
-     *
-     * @return void
-     * @psalm-suppress InvalidReturnStatement
-     */
-    public function bind(InputDefinition $definition): mixed
+    public function bind(InputDefinition $definition): void
     {
-        return $this->input->bind($definition);
+        $this->input->bind($definition);
     }
 
-    public function validate(): ?bool
+    public function validate(): void
     {
-        return $this->input->validate();
+        $this->input->validate();
     }
 
     public function getArguments(): array

diff --git a/src/SendIt/composer.json b/src/SendIt/composer.json
@@ -34,7 +34,7 @@
         "spiral/logger": "^3.11",
         "spiral/mailer": "^3.11",
         "spiral/views": "^3.11",
-        "symfony/mailer": "^5.1|^6.0",
+        "symfony/mailer": "^5.1 || ^6.0 || ^7.0",
         "psr/event-dispatcher": "^1.0"
     },
     "require-dev": {

diff --git a/src/Snapshots/composer.json b/src/Snapshots/composer.json
@@ -30,7 +30,7 @@
         "php": ">=8.1",
         "spiral/exceptions": "^3.11",
         "spiral/files": "^3.11",
-        "symfony/finder": "^5.3.7|^6.0"
+        "symfony/finder": "^5.3.7 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "spiral/storage": "^3.11",

diff --git a/src/Tokenizer/composer.json b/src/Tokenizer/composer.json
@@ -31,7 +31,7 @@
         "ext-tokenizer": "*",
         "spiral/core": "^3.11",
         "spiral/logger": "^3.11",
-        "symfony/finder": "^5.3.7|^6.0"
+        "symfony/finder": "^5.3.7 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "spiral/attributes": "^2.8|^3.0",

diff --git a/src/Translator/composer.json b/src/Translator/composer.json
@@ -31,7 +31,7 @@
         "spiral/core": "^3.11",
         "spiral/logger": "^3.11",
         "spiral/tokenizer": "^3.11",
-        "symfony/translation": "^5.1|^6.0",
+        "symfony/translation": "^5.1 || ^6.0 || ^7.0",
         "psr/event-dispatcher": "^1.0"
     },
     "require-dev": {