summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-11-29 11:57:22 (GMT)
committerxjm2017-11-29 11:59:35 (GMT)
commit3ed16f08d71b2315fa41d9fb2e64da3c938fe0b0 (patch)
tree1fd594b31d45398036d39cf6b3329fbee55d9e7a
parent4daa23c89bedd6c757ee6e4c4532f33a5edf8937 (diff)
Issue #2923884 by mfernea: Fix 'Squiz.WhiteSpace.SemicolonSpacing' coding standard
-rw-r--r--core/lib/Drupal/Core/GeneratedLink.php2
-rw-r--r--core/lib/Drupal/Core/GeneratedUrl.php2
-rw-r--r--core/modules/node/node.module2
-rw-r--r--core/phpcs.xml.dist1
-rw-r--r--core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php4
5 files changed, 6 insertions, 5 deletions
diff --git a/core/lib/Drupal/Core/GeneratedLink.php b/core/lib/Drupal/Core/GeneratedLink.php
index 0941187..c2c4900 100644
--- a/core/lib/Drupal/Core/GeneratedLink.php
+++ b/core/lib/Drupal/Core/GeneratedLink.php
@@ -32,7 +32,7 @@ class GeneratedLink extends BubbleableMetadata implements MarkupInterface, \Coun
* @return string
*/
public function getGeneratedLink() {
- return $this->generatedLink ;
+ return $this->generatedLink;
}
/**
diff --git a/core/lib/Drupal/Core/GeneratedUrl.php b/core/lib/Drupal/Core/GeneratedUrl.php
index f3bf658..ccb6e9a 100644
--- a/core/lib/Drupal/Core/GeneratedUrl.php
+++ b/core/lib/Drupal/Core/GeneratedUrl.php
@@ -25,7 +25,7 @@ class GeneratedUrl extends BubbleableMetadata {
* @return string
*/
public function getGeneratedUrl() {
- return $this->generatedUrl ;
+ return $this->generatedUrl;
}
/**
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index b8eb7e6..208deb5 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -133,7 +133,7 @@ function node_help($route_name, RouteMatchInterface $route_match) {
case 'entity.entity_form_display.node.default':
case 'entity.entity_form_display.node.form_mode':
$type = $route_match->getParameter('node_type');
- return '<p>' . t('Content items can be edited using different form modes. Here, you can define which fields are shown and hidden when %type content is edited in each form mode, and define how the field form widgets are displayed in each form mode.', ['%type' => $type->label()]) . '</p>' ;
+ return '<p>' . t('Content items can be edited using different form modes. Here, you can define which fields are shown and hidden when %type content is edited in each form mode, and define how the field form widgets are displayed in each form mode.', ['%type' => $type->label()]) . '</p>';
case 'entity.entity_view_display.node.default':
case 'entity.entity_view_display.node.view_mode':
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 7e6d6e6..1dc18b7 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -297,6 +297,7 @@
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
+ <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
<!-- Zend sniffs -->
diff --git a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index d283d9b..8148a89 100644
--- a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -383,7 +383,7 @@ class ToolkitGdTest extends KernelTestBase {
$image = $this->imageFactory->get();
$image->createNew(50, 20, image_type_to_extension($type, FALSE), '#ffff00');
$file = 'from_null' . image_type_to_extension($type);
- $file_path = $directory . '/' . $file ;
+ $file_path = $directory . '/' . $file;
$this->assertEqual(50, $image->getWidth(), SafeMarkup::format('Image file %file has the correct width.', ['%file' => $file]));
$this->assertEqual(20, $image->getHeight(), SafeMarkup::format('Image file %file has the correct height.', ['%file' => $file]));
$this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', ['%file' => $file]));
@@ -463,7 +463,7 @@ class ToolkitGdTest extends KernelTestBase {
// Color at top-right pixel should be fully transparent while in memory,
// fully opaque after flushing image to file.
$file = 'image-test-no-transparent-color-set.gif';
- $file_path = $directory . '/' . $file ;
+ $file_path = $directory . '/' . $file;
// Create image.
$image = $this->imageFactory->get();
$image->createNew(50, 20, 'gif', NULL);