projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
web
/
core
/
tests
/
Drupal
/
Tests
/
Core
/
Render
/
Element
/
MachineNameTest.php
diff --git
a/web/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
b/web/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
index 0dcdc582903569bf4c1a491e6c439f53f375c15e..51f84615f4fa5e563ff2da4d85889b07d1c7b76c 100644
(file)
--- a/
web/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
+++ b/
web/core/tests/Drupal/Tests/Core/Render/Element/MachineNameTest.php
@@
-42,7
+42,6
@@
class MachineNameTest extends UnitTestCase {
return $data;
}
return $data;
}
-
/**
* @covers ::processMachineName
*/
/**
* @covers ::processMachineName
*/
@@
-60,7
+59,11
@@
class MachineNameTest extends UnitTestCase {
'maxlength' => 32,
'additional_property' => TRUE,
'#additional_property_with_hash' => TRUE,
'maxlength' => 32,
'additional_property' => TRUE,
'#additional_property_with_hash' => TRUE,
- ]
+ ],
+ // The process function requires these to be set. During regular form
+ // building they are always set.
+ '#name' => 'test_machine_name',
+ '#default_value' => NULL,
];
$complete_form = [
];
$complete_form = [
@@
-68,7
+71,7
@@
class MachineNameTest extends UnitTestCase {
'#type' => 'textfield',
'#id' => 'source',
],
'#type' => 'textfield',
'#id' => 'source',
],
- 'test_machine_name' => $element
+ 'test_machine_name' => $element
,
];
$form_state->setCompleteForm($complete_form);
];
$form_state->setCompleteForm($complete_form);
@@
-112,7
+115,9
@@
class MachineNameTest extends UnitTestCase {
namespace Drupal\Core\Render\Element;
if (!function_exists('t')) {
namespace Drupal\Core\Render\Element;
if (!function_exists('t')) {
+
function t($string, array $args = []) {
return strtr($string, $args);
}
function t($string, array $args = []) {
return strtr($string, $args);
}
+
}
}