X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Ftoken%2Fsrc%2FTests%2FTokenTestTrait.php;h=471527459bed50d3ff3d862f89878223aa4b8d23;hp=b37cae9507feb2c85237b7963b719e541abdce78;hb=059867c3f96750652c80f39e44c442a58c2549ee;hpb=f8fc16ae6b862bef59baaad5d051dd37b7ff11b2

diff --git a/web/modules/contrib/token/src/Tests/TokenTestTrait.php b/web/modules/contrib/token/src/Tests/TokenTestTrait.php
index b37cae950..471527459 100644
--- a/web/modules/contrib/token/src/Tests/TokenTestTrait.php
+++ b/web/modules/contrib/token/src/Tests/TokenTestTrait.php
@@ -11,57 +11,57 @@ use Drupal\Core\Render\BubbleableMetadata;
  */
 trait TokenTestTrait {
 
-  function assertToken($type, array $data, $token, $expected, array $options = array()) {
-    return $this->assertTokens($type, $data, array($token => $expected), $options);
+  function assertToken($type, array $data, $token, $expected, array $options = []) {
+    return $this->assertTokens($type, $data, [$token => $expected], $options);
   }
 
-  function assertTokens($type, array $data, array $tokens, array $options = array()) {
+  function assertTokens($type, array $data, array $tokens, array $options = []) {
     $input = $this->mapTokenNames($type, array_keys($tokens));
     $bubbleable_metadata = new BubbleableMetadata();
     $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
     foreach ($tokens as $name => $expected) {
       $token = $input[$name];
       if (!isset($expected)) {
-        $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
+        $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", ['@type' => $type, '@token' => $token]));
       }
       elseif (!isset($replacements[$token])) {
-        $this->fail(t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
+        $this->fail(t("Token value for @token was not generated.", ['@type' => $type, '@token' => $token]));
       }
       elseif (!empty($options['regex'])) {
-        $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), t("Token value for @token was '@actual', matching regular expression pattern '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
+        $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), t("Token value for @token was '@actual', matching regular expression pattern '@expected'.", ['@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected]));
       }
       else {
-        $this->assertEqual($replacements[$token], $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
+        $this->assertEqual($replacements[$token], $expected, t("Token value for @token was '@actual', expected value '@expected'.", ['@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected]));
       }
     }
 
     return $replacements;
   }
 
-  function mapTokenNames($type, array $tokens = array()) {
-    $return = array();
+  function mapTokenNames($type, array $tokens = []) {
+    $return = [];
     foreach ($tokens as $token) {
       $return[$token] = "[$type:$token]";
     }
     return $return;
   }
 
-  function assertNoTokens($type, array $data, array $tokens, array $options = array()) {
+  function assertNoTokens($type, array $data, array $tokens, array $options = []) {
     $input = $this->mapTokenNames($type, $tokens);
     $bubbleable_metadata = new BubbleableMetadata();
     $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
     foreach ($tokens as $name) {
       $token = $input[$name];
-      $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
+      $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", ['@type' => $type, '@token' => $token]));
     }
   }
 
   function saveAlias($source, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
-    $alias = array(
+    $alias = [
       'source' => $source,
       'alias' => $alias,
       'language' => $language,
-    );
+    ];
     \Drupal::service('path.alias_storage')->save($alias['source'], $alias['alias']);
     return $alias;
   }
@@ -74,22 +74,22 @@ trait TokenTestTrait {
   /**
    * Make a page request and test for token generation.
    */
-  function assertPageTokens($url, array $tokens, array $data = array(), array $options = array()) {
+  function assertPageTokens($url, array $tokens, array $data = [], array $options = []) {
     if (empty($tokens)) {
       return TRUE;
     }
 
-    $token_page_tokens = array(
+    $token_page_tokens = [
       'tokens' => $tokens,
       'data' => $data,
       'options' => $options,
-    );
+    ];
     \Drupal::state()->set('token_page_tokens', $token_page_tokens);
 
-    $options += array('url_options' => array());
+    $options += ['url_options' => []];
     $this->drupalGet($url, $options['url_options']);
     $this->refreshVariables();
-    $result = \Drupal::state()->get('token_page_tokens', array());
+    $result = \Drupal::state()->get('token_page_tokens', []);
 
     if (!isset($result['values']) || !is_array($result['values'])) {
       return $this->fail('Failed to generate tokens.');
@@ -97,13 +97,13 @@ trait TokenTestTrait {
 
     foreach ($tokens as $token => $expected) {
       if (!isset($expected)) {
-        $this->assertTrue(!isset($result['values'][$token]) || $result['values'][$token] === $token, t("Token value for @token was not generated.", array('@token' => $token)));
+        $this->assertTrue(!isset($result['values'][$token]) || $result['values'][$token] === $token, t("Token value for @token was not generated.", ['@token' => $token]));
       }
       elseif (!isset($result['values'][$token])) {
-        $this->fail(t('Failed to generate token @token.', array('@token' => $token)));
+        $this->fail(t('Failed to generate token @token.', ['@token' => $token]));
       }
       else {
-        $this->assertIdentical($result['values'][$token], (string) $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@token' => $token, '@actual' => $result['values'][$token], '@expected' => $expected)));
+        $this->assertIdentical($result['values'][$token], (string) $expected, t("Token value for @token was '@actual', expected value '@expected'.", ['@token' => $token, '@actual' => $result['values'][$token], '@expected' => $expected]));
       }
     }
   }