diff --git a/core/lib/Drupal/Component/Diff/DiffFormatter.php b/core/lib/Drupal/Component/Diff/DiffFormatter.php
index 1789810..35eeb07 100644
--- a/core/lib/Drupal/Component/Diff/DiffFormatter.php
+++ b/core/lib/Drupal/Component/Diff/DiffFormatter.php
@@ -78,7 +78,7 @@ public function format(Diff $diff) {
         $context = $edit->orig;
       }
       else {
-        if (! is_array($block)) {
+        if (!is_array($block)) {
           $context = array_slice($context, sizeof($context) - $nlead);
           $x0 = $xi - sizeof($context);
           $y0 = $yi - sizeof($context);
diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index 387c401..f01b695 100644
--- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -368,7 +368,7 @@ protected function _shift_boundaries($lines, &$changed, $other_changed) {
       while ($j < $other_len && $other_changed[$j]) {
         $j++;
       }
-      while ($i < $len && ! $changed[$i]) {
+      while ($i < $len && !$changed[$i]) {
         $this::USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
         $i++;
         $j++;
diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index a775cdb..55204c7 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -164,7 +164,7 @@ public static function getUniqueId($id) {
     // return unique IDs and also helps us re-create the $seen_ids array during
     // Ajax requests.
     if (isset(static::$seenIds[$id])) {
-      $id = $id . '--' . ++static::$seenIds[$id];
+      $id = $id . '--' . ++$seenIds[$id];
     }
     else {
       static::$seenIds[$id] = 1;
diff --git a/core/lib/Drupal/Component/Utility/Timer.php b/core/lib/Drupal/Component/Utility/Timer.php
index 714ca03..d164fd6 100644
--- a/core/lib/Drupal/Component/Utility/Timer.php
+++ b/core/lib/Drupal/Component/Utility/Timer.php
@@ -27,7 +27,7 @@ class Timer {
    */
   static public function start($name) {
     static::$timers[$name]['start'] = microtime(TRUE);
-    static::$timers[$name]['count'] = isset(static::$timers[$name]['count']) ? ++static::$timers[$name]['count'] : 1;
+    static::$timers[$name]['count'] = isset(static::$timers[$name]['count']) ? ++$timers[$name]['count'] : 1;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index e1a976a..cc95635 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -85,7 +85,7 @@ public function addField($field, $type, $langcode) {
     $entity_type = $this->entityManager->getDefinition($entity_type_id);
 
     $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
-    for ($key = 0; $key <= $count; $key ++) {
+    for ($key = 0; $key <= $count; $key ++{
       // If there is revision support and only the current revision is being
       // queried then use the revision id. Otherwise, the entity id will do.
       if (($revision_key = $entity_type->getKey('revision')) && $all_revisions) {
diff --git a/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
index 86e8553..aa76e1f 100644
--- a/core/lib/Drupal/Core/Mail/MailFormatHelper.php
+++ b/core/lib/Drupal/Core/Mail/MailFormatHelper.php
@@ -185,7 +185,7 @@ public static function htmlToText($string, $allowed_tags = NULL) {
             break;
 
           case 'li':
-            $indent[] = isset($lists[0]) && is_numeric($lists[0]) ? ' ' . $lists[0]++ . ') ' : ' * ';
+            $indent[] = isset($lists[0]) && is_numeric($lists[0]) ? ' ' . $lists[0]++ ') ' : ' * ';
             break;
 
           case 'dd':
diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php
index e6aea74..f00e1ca 100644
--- a/core/modules/system/src/Tests/Database/SchemaTest.php
+++ b/core/modules/system/src/Tests/Database/SchemaTest.php
@@ -557,7 +557,7 @@ function testSchemaAddField() {
    */
   protected function assertFieldAdditionRemoval($field_spec) {
     // Try creating the field on a new table.
-    $table_name = 'test_table_' . ($this->counter++);
+    $table_name = 'test_table_' . ($this->counter++;
     $table_spec = array(
       'fields' => array(
         'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
@@ -575,7 +575,7 @@ protected function assertFieldAdditionRemoval($field_spec) {
     db_drop_table($table_name);
 
     // Try adding a field to an existing table.
-    $table_name = 'test_table_' . ($this->counter++);
+    $table_name = 'test_table_' . ($this->counter++;
     $table_spec = array(
       'fields' => array(
         'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
@@ -693,7 +693,7 @@ function testSchemaChangeField() {
    *   The ending field specification.
    */
   protected function assertFieldChange($old_spec, $new_spec, $test_data = NULL) {
-    $table_name = 'test_table_' . ($this->counter++);
+    $table_name = 'test_table_' . ($this->counter++;
     $table_spec = array(
       'fields' => array(
         'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index e6e31aa..29cce9e 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -219,7 +219,7 @@ public function ensureMyTable() {
             if (!isset($this->handler->view->many_to_one_count[$this->handler->table])) {
               $this->handler->view->many_to_one_count[$this->handler->table] = 0;
             }
-            $this->handler->view->many_to_one_aliases[$field][$value] = $this->handler->table . '_value_' . ($this->handler->view->many_to_one_count[$this->handler->table]++);
+            $this->handler->view->many_to_one_aliases[$field][$value] = $this->handler->table . '_value_' . ($this->handler->view->many_to_one_count[$this->handler->table]++;
           }
 
           $this->handler->tableAliases[$value] = $this->addTable($join, $this->handler->view->many_to_one_aliases[$field][$value]);