symfony · nicolas-grekas · Oct 30, 2019 · stof · Oct 30, 2019 · nicolas-grekas
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "psr/container": "^1.0",
         "psr/link": "^1.0",
         "psr/log": "~1.0",
-        "symfony/contracts": "^1.1.7|^2",
+        "symfony/contracts": "^1.2|^2",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-intl-idn": "^1.10",

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -13,7 +13,6 @@ CHANGELOG
  * made singly-implemented interfaces detection be scoped by file
  * added ability to define a static priority method for tagged service
  * added support for improved syntax to define method calls in Yaml
- * added `LazyString` for lazy computation of string values injected into services
  * made the `%env(base64:...)%` processor able to decode base64url
 
 4.3.0

diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyStringTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyStringTest.php
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -18,12 +18,11 @@
     "require": {
         "php": "^7.1.3",
         "psr/container": "^1.0",
-        "symfony/service-contracts": "^1.1.6|^2"
+        "symfony/service-contracts": "^1.2|^2"
     },
     "require-dev": {
         "symfony/yaml": "^3.4|^4.0|^5.0",
         "symfony/config": "^4.3|^5.0",
-        "symfony/error-handler": "^4.4|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0"
     },
     "suggest": {

diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": "^7.1.3",
         "psr/log": "^1.0",
-        "symfony/http-client-contracts": "^1.1.8|^2",
+        "symfony/http-client-contracts": "^1.2|^2",
         "symfony/polyfill-php73": "^1.11"
     },
     "require-dev": {

diff --git a/src/Symfony/Contracts/CHANGELOG.md b/src/Symfony/Contracts/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+1.2.0
+-----
+
+ * added `LazyString` for lazy computation of string values injected into services
+
 1.1.0
 -----
 

diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/...ponent/DependencyInjection/LazyString.php → src/Symfony/Contracts/Service/LazyString.php b/...ponent/DependencyInjection/LazyString.php → src/Symfony/Contracts/Service/LazyString.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\DependencyInjection;
+namespace Symfony\Contracts\Service;
 
 /**
  * A string whose value is computed lazily by a callback.
@@ -49,6 +49,47 @@ public static function fromCallable($callback, ...$arguments): self
         return $lazyString;
     }
 
+    /**
+     * @param object|string|int|float|bool $value A scalar or an object that implements the __toString() magic method
+     *
+     * @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)));
+        }
+
+        if (\is_object($value)) {
+            return static::fromCallable([$value, '__toString']);
+        }
+
+        $lazyString = new static();
+        $lazyString->value = (string) $value;
+
+        return $lazyString;
+    }
+
+    /**
+     * Tells whether the provided value can be cast to string.
+     */
+    final public static function isStringable($value): bool
+    {
+        return \is_string($value) || $value instanceof self || (\is_object($value) ? \is_callable([$value, '__toString']) : is_scalar($value));
+    }
+
+    /**
+     * Casts scalars and stringable objects to strings.
+     *
+     * @param object|string|int|float|bool $value
+     *
+     * @throws \TypeError When the provided value is not stringable
+     */
+    final public static function resolve($value): string
+    {
+        return $value;
+    }
+
     public function __toString()
     {
         if (\is_string($this->value)) {

diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/src/Symfony/Contracts/Tests/Service/LazyStringTest.php b/src/Symfony/Contracts/Tests/Service/LazyStringTest.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\ErrorHandler\ErrorHandler;
+use Symfony\Contracts\Service\LazyString;
+
+class LazyStringTest extends TestCase
+{
+    public function testLazyString()
+    {
+        $count = 0;
+        $s = LazyString::fromCallable(function () use (&$count) {
+            return ++$count;
+        });
+
+        $this->assertSame(0, $count);
+        $this->assertSame('1', (string) $s);
+        $this->assertSame(1, $count);
+    }
+
+    public function testLazyCallable()
+    {
+        $count = 0;
+        $s = LazyString::fromCallable([function () use (&$count) {
+            return new class($count) {
+                private $count;
+
+                public function __construct(int &$count)
+                {
+                    $this->count = &$count;
+                }
+
+                public function __invoke()
+                {
+                    return ++$this->count;
+                }
+            };
+        }]);
+
+        $this->assertSame(0, $count);
+        $this->assertSame('1', (string) $s);
+        $this->assertSame(1, $count);
+        $this->assertSame('1', (string) $s); // ensure the value is memoized
+        $this->assertSame(1, $count);
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testReturnTypeError()
+    {
+        ErrorHandler::register();
+
+        $s = LazyString::fromCallable(function () { return []; });
+
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('Return value of '.__NAMESPACE__.'\{closure}() passed to '.LazyString::class.'::fromCallable() must be of the type string, array returned.');
+
+        (string) $s;
+    }
+
+    public function testFromStringable()
+    {
+        $this->assertInstanceOf(LazyString::class, LazyString::fromStringable('abc'));
+        $this->assertSame('abc', (string) LazyString::fromStringable('abc'));
+        $this->assertSame('1', (string) LazyString::fromStringable(true));
+        $this->assertSame('', (string) LazyString::fromStringable(false));
+        $this->assertSame('123', (string) LazyString::fromStringable(123));
+        $this->assertSame('123.456', (string) LazyString::fromStringable(123.456));
+        $this->assertStringContainsString('hello', (string) LazyString::fromStringable(new \Exception('hello')));
+    }
+
+    public function testResolve()
+    {
+        $this->assertSame('abc', LazyString::resolve('abc'));
+        $this->assertSame('1', LazyString::resolve(true));
+        $this->assertSame('', LazyString::resolve(false));
+        $this->assertSame('123', LazyString::resolve(123));
+        $this->assertSame('123.456', LazyString::resolve(123.456));
+        $this->assertStringContainsString('hello', LazyString::resolve(new \Exception('hello')));
+    }
+
+    public function testIsStringable()
+    {
+        $this->assertTrue(LazyString::isStringable('abc'));
+        $this->assertTrue(LazyString::isStringable(true));
+        $this->assertTrue(LazyString::isStringable(false));
+        $this->assertTrue(LazyString::isStringable(123));
+        $this->assertTrue(LazyString::isStringable(123.456));
+        $this->assertTrue(LazyString::isStringable(new \Exception('hello')));
+    }
+
+    public function testIsNotStringable()
+    {
+        $this->assertFalse(LazyString::isStringable(null));
+        $this->assertFalse(LazyString::isStringable([]));
+        $this->assertFalse(LazyString::isStringable(STDIN));
+        $this->assertFalse(LazyString::isStringable(new \StdClass()));
+        $this->assertFalse(LazyString::isStringable(@eval('return new class() {private function __toString() {}};')));
+    }
+}
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
@@ -21,6 +21,7 @@
         "psr/container": "^1.0"
     },
     "require-dev": {
+        "symfony/error-handler": "^4.4|^5.0",
         "symfony/polyfill-intl-idn": "^1.10"
     },
     "replace": {
@@ -47,7 +48,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }