comparison core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

 <?php
 
 namespace Drupal\KernelTests\Component\Utility;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Provides a test covering integration of SafeMarkup with other systems.

 
     $this->container->get('router.builder')->rebuild();
   }
 
   /**
-   * Gets arguments for SafeMarkup::format() based on Url::fromUri() parameters.
+   * Gets arguments for FormattableMarkup based on Url::fromUri() parameters.
    *
    * @param string $uri
    *   The URI of the resource.
    * @param array $options
    *   The options to pass to Url::fromUri().
    *
    * @return array
    *   Array containing:
    *   - ':url': A URL string.
+   *
+   * @see \Drupal\Component\Render\FormattableMarkup
    */
   protected static function getSafeMarkupUriArgs($uri, $options = []) {
     $args[':url'] = Url::fromUri($uri, $options)->toString();
     return $args;
   }
 
   /**
-   * Tests URL ":placeholders" in SafeMarkup::format().
+   * Tests URL ":placeholders" in \Drupal\Component\Render\FormattableMarkup.
    *
    * @dataProvider providerTestSafeMarkupUri
    */
   public function testSafeMarkupUri($string, $uri, $options, $expected) {
     $args = self::getSafeMarkupUriArgs($uri, $options);
-    $this->assertEquals($expected, SafeMarkup::format($string, $args));
+    $this->assertEquals($expected, new FormattableMarkup($string, $args));
   }
 
   /**
    * @return array
    */

   public function testSafeMarkupUriWithExceptionUri($string, $uri) {
     // Should throw an \InvalidArgumentException, due to Uri::toString().
     $this->setExpectedException(\InvalidArgumentException::class);
     $args = self::getSafeMarkupUriArgs($uri);
 
-    SafeMarkup::format($string, $args);
+    new FormattableMarkup($string, $args);
   }
 
   /**
    * @return array
    */