Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2396793 by xjm: Token API will match tokens with empty types or tokens, e.g. [:invalid]

8.0.x
Alex Pott 2014-12-24 12:56:46 +01:00
parent 54c74fda4d
commit 62ba78dc35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Drupal/Core/Utility/Token.php
View File

@ -185,9 +185,9 @@ class Token {
// $type may not contain : or whitespace characters, but $name may.
preg_match_all('/
\[ # [ - pattern start
([^\s\[\]:]*) # match $type not containing whitespace : [ or ]
([^\s\[\]:]+) # match $type not containing whitespace : [ or ]
: # : - separator
([^\[\]]*) # match $name not containing [ or ]
([^\[\]]+) # match $name not containing [ or ]
\] # ] - pattern end
/x', $text, $matches);

6
core/modules/system/src/Tests/System/TokenScanTest.php
View File

@ -24,12 +24,18 @@ class TokenScanTest extends WebTestBase {
// strings.
$text = 'First a [valid:simple], but dummy token, and a dummy [valid:token with: spaces].';
$text .= 'Then a [not valid:token].';
$text .= 'Then an [:empty token type].';
$text .= 'Then an [empty token:].';
$text .= 'Then a totally empty token: [:].';
$text .= 'Last an existing token: [node:author:name].';
$token_wannabes = \Drupal::token()->scan($text);
$this->assertTrue(isset($token_wannabes['valid']['simple']), 'A simple valid token has been matched.');
$this->assertTrue(isset($token_wannabes['valid']['token with: spaces']), 'A valid token with space characters in the token name has been matched.');
$this->assertFalse(isset($token_wannabes['not valid']), 'An invalid token with spaces in the token type has not been matched.');
$this->assertFalse(isset($token_wannabes['empty token']), 'An empty token has not been matched.');
$this->assertFalse(isset($token_wannabes['']['empty token type']), 'An empty token type has not been matched.');
$this->assertFalse(isset($token_wannabes['']['']), 'An empty token and type has not been matched.');
$this->assertTrue(isset($token_wannabes['node']), 'An existing valid token has been matched.');
}