More updates to stop using dev or alpha or beta versions.

[yaffs-website] / web / core / tests / Drupal / Tests / Component / PhpStorage / FileStorageReadOnlyTest.php

diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
index 8b8c95acd9e35b0ec5d54983ccf5663405062e95..991006b5a24c1920a80cd6daa89f78d4e71e7d9b 100644 (file)
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\Component\PhpStorage;
 
 use Drupal\Component\PhpStorage\FileStorage;
 use Drupal\Component\PhpStorage\FileReadOnlyStorage;
+use Drupal\Component\Utility\Random;
 
 /**
  * @coversDefaultClass \Drupal\Component\PhpStorage\FileReadOnlyStorage
@@ -48,8 +49,11 @@ class FileStorageReadOnlyTest extends PhpStorageTestBase {
    * Tests writing with one class and reading with another.
    */
   public function testReadOnly() {
+    // Random generator.
+    $random = new Random();
+
     $php = new FileStorage($this->standardSettings);
-    $name = $this->randomMachineName() . '/' . $this->randomMachineName() . '.php';
+    $name = $random->name(8, TRUE) . '/' . $random->name(8, TRUE) . '.php';
 
     // Find a global that doesn't exist.
     do {
@@ -59,14 +63,14 @@ class FileStorageReadOnlyTest extends PhpStorageTestBase {
     // Write out a PHP file and ensure it's successfully loaded.
     $code = "<?php\n\$GLOBALS[$random] = TRUE;";
     $success = $php->save($name, $code);
-    $this->assertSame($success, TRUE);
+    $this->assertSame(TRUE, $success);
     $php_read = new FileReadOnlyStorage($this->readonlyStorage);
     $php_read->load($name);
     $this->assertTrue($GLOBALS[$random]);
 
     // If the file was successfully loaded, it must also exist, but ensure the
     // exists() method returns that correctly.
-    $this->assertSame($php_read->exists($name), TRUE);
+    $this->assertSame(TRUE, $php_read->exists($name));
     // Saving and deleting should always fail.
     $this->assertFalse($php_read->save($name, $code));
     $this->assertFalse($php_read->delete($name));
@@ -85,8 +89,11 @@ class FileStorageReadOnlyTest extends PhpStorageTestBase {
    * @covers ::deleteAll
    */
   public function testDeleteAll() {
+    // Random generator.
+    $random = new Random();
+
     $php = new FileStorage($this->standardSettings);
-    $name = $this->randomMachineName() . '/' . $this->randomMachineName() . '.php';
+    $name = $random->name(8, TRUE) . '/' . $random->name(8, TRUE) . '.php';
 
     // Find a global that doesn't exist.
     do {