commit 91c9ee08eac1dc9514c4d7a3511bfb7b042677fd Author: Joel Pittet Date: Fri Oct 11 20:56:34 2013 -0700 whitepsace fix diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 13b720c..9b0ef4c 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -14,7 +14,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php index 9ba4bf4..a618409 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php @@ -50,7 +50,7 @@ function testContainer() { '#type' => 'container', '#markup' => 'foo', ), - 'expected' => '
foo
', + 'expected' => '
foo
' . "\n", ), // Container with a class. array( @@ -62,7 +62,7 @@ function testContainer() { 'class' => 'bar', ), ), - 'expected' => '
foo
', + 'expected' => '
foo
' . "\n", ), // Container with children. array( @@ -73,7 +73,7 @@ function testContainer() { '#markup' => 'foo', ), ), - 'expected' => '
foo
', + 'expected' => '
foo
' . "\n", ), ); diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php index 4aa8eb8..b7a6f18 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php @@ -94,7 +94,7 @@ function testRequiredFields() { $elements['file']['empty_values'] = $empty_strings; // Regular expression to find the expected marker on required elements. - $required_marker_preg = '@\*@'; + $required_marker_preg = '@\*\n@'; // Go through all the elements and all the empty values for them. foreach ($elements as $type => $data) { diff --git a/core/modules/system/templates/container.html.twig b/core/modules/system/templates/container.html.twig index 10b9426..933a201 100644 --- a/core/modules/system/templates/container.html.twig +++ b/core/modules/system/templates/container.html.twig @@ -12,4 +12,4 @@ * @ingroup themeable */ #} -{{ children }}{# Comment removes trailing newline #} +{{ children }} diff --git a/core/modules/system/templates/form-required-marker.html.twig b/core/modules/system/templates/form-required-marker.html.twig index 341cc4f..711f7d5 100644 --- a/core/modules/system/templates/form-required-marker.html.twig +++ b/core/modules/system/templates/form-required-marker.html.twig @@ -11,4 +11,4 @@ * @ingroup themeable */ #} -*{# Comment removes trailing newline #} +* diff --git a/core/modules/system/templates/textarea.html.twig b/core/modules/system/templates/textarea.html.twig index 46a398e..16819e6 100644 --- a/core/modules/system/templates/textarea.html.twig +++ b/core/modules/system/templates/textarea.html.twig @@ -14,4 +14,4 @@ #} {{ value }} -{# Comment removes trailing newline #} +