diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 2002e9e..57f3fcf 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -489,8 +489,9 @@ public function makeSequenceName($table, $field) {
    *   A sanitized comment string.
    */
   public function makeComment($comments) {
-    if (empty($comments))
+    if (empty($comments)) {
       return '';
+    }
 
     // Flatten the array of comments.
     $comment = implode('. ', $comments);
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index ab6236a..8d6caca 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -497,9 +497,9 @@ public function fetchCol($index = 0) {
    * {@inheritdoc}
    */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
-    if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index]))
+    if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index])) {
       return array();
-
+    }
     $key = $this->columnNames[$key_index];
     $value = $this->columnNames[$value_index];
 
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index ca0dc3a..11afb3b 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -795,10 +795,15 @@ function _color_hsl2rgb($hsl) {
  */
 function _color_hue2rgb($m1, $m2, $h) {
   $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-  if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-  if ($h * 2 < 1) return $m2;
-  if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
-
+  if ($h * 6 < 1) {
+    return $m1 + ($m2 - $m1) * $h * 6;
+  }
+  if ($h * 2 < 1) {
+    return $m2;	
+  }
+  if ($h * 3 < 2) {
+    return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+  }
   return $m1;
 }
 
@@ -821,11 +826,16 @@ function _color_rgb2hsl($rgb) {
 
   $h = 0;
   if ($delta > 0) {
-    if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-    if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-    if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+    if ($max == $r && $max != $g) {
+      $h += ($g - $b) / $delta;
+    }
+    if ($max == $g && $max != $b) {
+      $h += (2 + ($b - $r) / $delta);
+    }
+    if ($max == $b && $max != $r) {
+      $h += (4 + ($r - $g) / $delta);
+    }
     $h /= 6;
   }
-
   return array($h, $s, $l);
 }
diff --git a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
index dcd4967..d0b3904 100644
--- a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
@@ -25,7 +25,9 @@ public function testTaxonomyPageLocalTasks($route, $subtask = array()) {
     $tasks = array(
       0 => array('entity.taxonomy_term.canonical', 'entity.taxonomy_term.edit_form'),
     );
-    if ($subtask) $tasks[] = $subtask;
+    if ($subtask) {
+      $tasks[] = $subtask;
+    }
     $this->assertLocalTasks($route, $tasks);
   }
 
diff --git a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
index 97e9f33..b60f363 100644
--- a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
+++ b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
@@ -69,7 +69,9 @@ public function testUserPageLocalTasks($route, $subtask = array()) {
     $tasks = array(
       0 => array('entity.user.canonical', 'entity.user.edit_form',),
     );
-    if ($subtask) $tasks[] = $subtask;
+    if ($subtask) {
+      $tasks[] = $subtask;
+    }
     $this->assertLocalTasks($route, $tasks);
   }
 
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index f860ff6..ff56307 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -62,6 +62,7 @@
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
   <rule ref="Drupal.ControlStructures.ControlSignature"/>
+  <rule ref="Drupal.ControlStructures.InlineControlStructure"/>
   <rule ref="Drupal.Files.EndFileNewline"/>
   <rule ref="Drupal.Files.TxtFileLineLength"/>
   <rule ref="Drupal.Formatting.SpaceInlineIf"/>
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
index 6242322..5437033 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
@@ -136,7 +136,9 @@ protected function setUpEntityTypeDefinitions($definitions = []) {
         elseif (!$exception_on_invalid) {
           return NULL;
         }
-        else throw new PluginNotFoundException($entity_type_id);
+        else {
+          throw new PluginNotFoundException($entity_type_id);
+        }
       });
     $this->entityTypeManager->getDefinitions()->willReturn($definitions);
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
index c2325d4..25fe45d 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
@@ -112,7 +112,9 @@ protected function setUpEntityTypeDefinitions($definitions = []) {
         elseif (!$exception_on_invalid) {
           return NULL;
         }
-        else throw new PluginNotFoundException($entity_type_id);
+        else {
+          throw new PluginNotFoundException($entity_type_id);
+        }
       });
     $this->discovery->getDefinitions()->willReturn($definitions);
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
index 3761e0d..273d296 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
@@ -71,7 +71,9 @@ protected function setUpEntityTypeDefinitions($definitions = []) {
         elseif (!$exception_on_invalid) {
           return NULL;
         }
-        else throw new PluginNotFoundException($entity_type_id);
+        else {
+          throw new PluginNotFoundException($entity_type_id);
+        }
       });
     $this->entityTypeManager->getDefinitions()->willReturn($definitions);
   }
diff --git a/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php b/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
index 9ee719e..f7a7fc4 100644
--- a/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
+++ b/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
@@ -101,7 +101,9 @@ protected function setUpEntityManager($definitions = array()) {
         elseif (!$exception_on_invalid) {
           return NULL;
         }
-        else throw new PluginNotFoundException($entity_type_id);
+        else {
+          throw new PluginNotFoundException($entity_type_id);
+        }
       });
     $this->entityTypeManager->getDefinitions()->willReturn($definitions);
   }