diff --git a/core/lib/Drupal/Component/Utility/Unicode.php b/core/lib/Drupal/Component/Utility/Unicode.php
index fab79ba..5c5f0d4 100644
--- a/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -269,7 +269,7 @@ public static function truncateBytes($string, $len) {
       return substr($string, 0, $len);
     }
     // Scan backwards to beginning of the byte sequence.
-    while (--$len >= 0 && ord($string[$len]) >= 0x80 && ord($string[$len]) < 0xC0);
+    while (--$len >= 0 && ord($string[$len]) >= 0x80 && ord($string[$len]) < 0xC0) {}
 
     return substr($string, 0, $len);
   }
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 18283ce..3382ec8 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -487,8 +487,8 @@ public function makeSequenceName($table, $field) {
    *   A sanitized comment string.
    */
   public function makeComment($comments) {
-    if (empty($comments))
-      return '';
+    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 0fbfc04..dd03b9d 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -502,8 +502,8 @@ 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]))
-      return array();
+    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/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
index f5d2860..54dfa1b 100644
--- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
+++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
@@ -69,7 +69,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     }
 
     // Decide on a default backend.
-    if ($authorize_filetransfer_default = $form_state->getValue(array('connection_settings', 'authorize_filetransfer_default')));
+    if ($authorize_filetransfer_default = $form_state->getValue(array('connection_settings', 'authorize_filetransfer_default'))) {}
     elseif ($authorize_filetransfer_default = $this->config('system.authorize')->get('filetransfer_default'));
     else {
       $authorize_filetransfer_default = key($available_backends);
diff --git a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
index 490e7e8..dd29de6 100644
--- a/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
@@ -30,7 +30,7 @@ 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 8b8abf5..15ad5bc 100644
--- a/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
+++ b/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
@@ -74,7 +74,7 @@ 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/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index 9a67a26..bfbe768 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -197,7 +197,7 @@ 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->discovery->getDefinitions()->willReturn($definitions);
   }