summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2017-08-21 05:03:04 (GMT)
committerNathaniel Catchpole2017-08-21 05:03:04 (GMT)
commitebc6484967c774c0958fa06491ae936a60dd7721 (patch)
treeeefab2aae3957a3d79336430797662da56c41ded
parent02a8ccbdcbe2600e2c79e5a5f891ca378c8264f4 (diff)
Issue #2902717 by mfernea: Fix 'Drupal.Formatting.MultiLineAssignment' coding standard
-rw-r--r--core/lib/Drupal/Component/Diff/Engine/DiffEngine.php3
-rw-r--r--core/phpcs.xml.dist1
2 files changed, 2 insertions, 2 deletions
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index 7885c6f..dadde4e 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -302,8 +302,7 @@ class DiffEngine {
//$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
//$nchunks = max(2, min(8, (int)$nchunks));
$nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
- list($lcs, $seps)
- = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+ list($lcs, $seps) = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
}
if ($lcs == 0) {
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 0c6a9e9..ebc35b9 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -68,6 +68,7 @@
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/ControlStructures/ControlSignatureSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Files/EndFileNewlineSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php"/>
+ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Formatting/MultiLineAssignmentSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Formatting/SpaceInlineIfSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Formatting/SpaceUnaryOperatorSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Functions/DiscouragedFunctionsSniff.php"/>