symfony
diff --git a/Collapse file
‎composer.json‎
Copy file name to clipboardExpand all lines: composer.json
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎composer.json‎
Copy file name to clipboardExpand all lines: composer.json
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎src/Symfony/Component/String/AbstractString.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/AbstractString.php
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/Symfony/Component/String/AbstractString.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/AbstractString.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/Symfony/Component/String/LazyString.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/LazyString.php
+7-4Lines changed: 7 additions & 4 deletions b/Collapse file
‎src/Symfony/Component/String/LazyString.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/LazyString.php
+7-4Lines changed: 7 additions & 4 deletions
diff --git a/Collapse file
‎src/Symfony/Component/String/composer.json‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/composer.json
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file
‎src/Symfony/Component/String/composer.json‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/String/composer.json
+2-1Lines changed: 2 additions & 1 deletion
@@ -34,6 +34,7 @@
         "symfony/polyfill-intl-normalizer": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php73": "^1.11",
+        "symfony/polyfill-php80": "^1.15",
         "symfony/polyfill-uuid": "^1.15"
     },
     "replace": {
 
@@ -27,7 +27,7 @@
  *
  * @throws ExceptionInterface
  */
-abstract class AbstractString implements \JsonSerializable
+abstract class AbstractString implements \Stringable, \JsonSerializable
 {
     public const PREG_PATTERN_ORDER = PREG_PATTERN_ORDER;
     public const PREG_SET_ORDER = PREG_SET_ORDER;
 
@@ -16,7 +16,7 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class LazyString implements \JsonSerializable
+class LazyString implements \Stringable, \JsonSerializable
 {
     private $value;
 
@@ -50,14 +50,14 @@ public static function fromCallable($callback, ...$arguments): self
     }
 
     /**
-     * @param object|string|int|float|bool $value A scalar or an object that implements the __toString() magic method
+     * @param string|int|float|bool|\Stringable $value
      *
      * @return static
      */
     public static function fromStringable($value): self
     {
         if (!self::isStringable($value)) {
-            throw new \TypeError(sprintf('Argument 1 passed to %s() must be a scalar or an object that implements the __toString() magic method, %s given.', __METHOD__, \is_object($value) ? \get_class($value) : \gettype($value)));
+            throw new \TypeError(sprintf('Argument 1 passed to %s() must be a scalar or a stringable object, %s given.', __METHOD__, \is_object($value) ? \get_class($value) : \gettype($value)));
         }
 
         if (\is_object($value)) {
@@ -75,7 +75,7 @@ public static function fromStringable($value): self
      */
     final public static function isStringable($value): bool
     {
-        return \is_string($value) || $value instanceof self || (\is_object($value) ? \is_callable([$value, '__toString']) : is_scalar($value));
+        return \is_string($value) || $value instanceof self || (\is_object($value) ? method_exists($value, '__toString') : is_scalar($value));
     }
 
     /**
@@ -90,6 +90,9 @@ final public static function resolve($value): string
         return $value;
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         if (\is_string($this->value)) {
 
@@ -19,7 +19,8 @@
         "php": "^7.2.5",
         "symfony/polyfill-intl-grapheme": "~1.0",
         "symfony/polyfill-intl-normalizer": "~1.0",
-        "symfony/polyfill-mbstring": "~1.0"
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php80": "~1.15"
     },
     "require-dev": {
         "symfony/error-handler": "^4.4|^5.0",
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @throws ExceptionInterface`
`29`	`29`	`*/`
`30`		`-abstract class AbstractString implements \JsonSerializable`
	`30`	`+abstract class AbstractString implements \Stringable, \JsonSerializable`
`31`	`31`	`{`
`32`	`32`	`public const PREG_PATTERN_ORDER = PREG_PATTERN_ORDER;`
`33`	`33`	`public const PREG_SET_ORDER = PREG_SET_ORDER;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Nicolas Grekas <p@tchwork.com>`
`18`	`18`	`*/`
`19`		`-class LazyString implements \JsonSerializable`
	`19`	`+class LazyString implements \Stringable, \JsonSerializable`
`20`	`20`	`{`
`21`	`21`	`private $value;`
`22`	`22`
`@@ -50,14 +50,14 @@ public static function fromCallable($callback, ...$arguments): self`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
`53`		`- * @param object\|string\|int\|float\|bool $value A scalar or an object that implements the __toString() magic method`
	`53`	`+ * @param string\|int\|float\|bool\|\Stringable $value`
`54`	`54`	`*`
`55`	`55`	`* @return static`
`56`	`56`	`*/`
`57`	`57`	`public static function fromStringable($value): self`
`58`	`58`	`{`
`59`	`59`	`if (!self::isStringable($value)) {`
`60`		`- throw new \TypeError(sprintf('Argument 1 passed to %s() must be a scalar or an object that implements the __toString() magic method, %s given.', __METHOD__, \is_object($value) ? \get_class($value) : \gettype($value)));`
	`60`	`+ throw new \TypeError(sprintf('Argument 1 passed to %s() must be a scalar or a stringable object, %s given.', __METHOD__, \is_object($value) ? \get_class($value) : \gettype($value)));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if (\is_object($value)) {`
`@@ -75,7 +75,7 @@ public static function fromStringable($value): self`
`75`	`75`	`*/`
`76`	`76`	`final public static function isStringable($value): bool`
`77`	`77`	`{`
`78`		`- return \is_string($value) \|\| $value instanceof self \|\| (\is_object($value) ? \is_callable([$value, '__toString']) : is_scalar($value));`
	`78`	`+ return \is_string($value) \|\| $value instanceof self \|\| (\is_object($value) ? method_exists($value, '__toString') : is_scalar($value));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
`@@ -90,6 +90,9 @@ final public static function resolve($value): string`
`90`	`90`	`return $value;`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ /**`
	`94`	`+ * @return string`
	`95`	`+ */`
`93`	`96`	`public function __toString()`
`94`	`97`	`{`
`95`	`98`	`if (\is_string($this->value)) {`