Improve Random polyfill a bit

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,7 @@
 # 1.27.0
 
   * Add PHP 8.3 polyfill for `json_validate()`
+  * Add polyfill for PHP 8.2's `Random` interfaces, exceptions and `Secure` engine
   * Fix `IntlDateFormatter::formatObject()` signature
 
 # 1.26.0

README.md

@@ -67,7 +67,7 @@ Polyfills are provided for:
 - the `SensitiveParameterValue` class introduced in PHP 8.2;
 - the `Random\Engine` interface introduced in PHP 8.2;
 - the `Random\CryptoSafeEngine` interface introduced in PHP 8.2;
-- the `Random\Engine\Secure` class introduced in PHP 8.2;
+- the `Random\Engine\Secure` class introduced in PHP 8.2 (check [arokettu/random-polyfill](https://packagist.org/packages/arokettu/random-polyfill) for more engines);
 - the `json_validate` function introduced in PHP 8.3;
 
 It is strongly recommended to upgrade your PHP version and/or install the missing

src/Php82/NoDynamicProperties.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php82;
+
+/**
+ * @internal
+ */
+trait NoDynamicProperties
+{
+    public function __set(string $name, $value): void
+    {
+        throw new \Error('Cannot create dynamic property '.self::class.'::$'.$name);
+    }
+}

src/Php82/README.md

@@ -8,7 +8,7 @@ This component provides features added to PHP 8.2 core:
 - [`SensitiveParameterValue`](https://wiki.php.net/rfc/redact_parameters_in_back_traces)
 - [`Random\Engine`](https://wiki.php.net/rfc/rng_extension)
 - [`Random\Engine\CryptoSafeEngine`](https://wiki.php.net/rfc/rng_extension)
-- [`Random\Engine\Secure`](https://wiki.php.net/rfc/rng_extension)
+- [`Random\Engine\Secure`](https://wiki.php.net/rfc/rng_extension) (check [arokettu/random-polyfill](https://packagist.org/packages/arokettu/random-polyfill) for more engines)
 
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).

src/Php82/Random/Engine/Secure.php

@@ -11,29 +11,40 @@
 
 namespace Symfony\Polyfill\Php82\Random\Engine;
 
+use Random\RandomException;
+use Symfony\Polyfill\Php82\NoDynamicProperties;
+
 /**
  * @author Tim Düsterhus <[email protected]>
+ * @author Anton Smirnov <[email protected]>
  *
  * @internal
  */
 class Secure
 {
-    public function __construct()
-    {
-    }
+    use NoDynamicProperties;
 
     public function generate(): string
     {
-        return \random_bytes(\PHP_INT_SIZE);
+        try {
+            return random_bytes(\PHP_INT_SIZE);
+        } catch (\Exception $e) {
+            throw new RandomException($e->getMessage(), $e->getCode(), $e->getPrevious());
+        }
     }
 
     public function __sleep(): array
     {
-        throw new \Exception("Serialization of 'Random\\Engine\\Secure' is not allowed");
+        throw new \Exception("Serialization of 'Random\Engine\Secure' is not allowed");
     }
 
     public function __wakeup(): void
     {
-        throw new \Exception("Unserialization of 'Random\\Engine\\Secure' is not allowed");
+        throw new \Exception("Unserialization of 'Random\Engine\Secure' is not allowed");
+    }
+
+    public function __clone()
+    {
+        throw new \Error('Trying to clone an uncloneable object of class Random\Engine\Secure');
     }
 }

src/Php82/Resources/stubs/Random/BrokenRandomEngineError.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Random;
 
 if (\PHP_VERSION_ID < 80200) {

src/Php82/Resources/stubs/Random/CryptoSafeEngine.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Random;
 
 if (\PHP_VERSION_ID < 80200) {

src/Php82/Resources/stubs/Random/Engine.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Random;
 
 if (\PHP_VERSION_ID < 80200) {

src/Php82/Resources/stubs/Random/Engine/Secure.php

@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Random\Engine;
 
-use \Symfony\Polyfill\Php82 as p;
+use Symfony\Polyfill\Php82 as p;
 
 if (\PHP_VERSION_ID < 80200) {
     final class Secure extends p\Random\Engine\Secure implements \Random\CryptoSafeEngine

src/Php82/Resources/stubs/Random/RandomError.php

@@ -1,9 +1,21 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Random;
 
+use Symfony\Polyfill\Php82\NoDynamicProperties;
+
 if (\PHP_VERSION_ID < 80200) {
     class RandomError extends \Error
     {
+        use NoDynamicProperties;
     }
 }