diff --git a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
index fb52b0f..c7d6e6d 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -124,7 +124,8 @@ public function getDefinitions() {
             if ($fileinfo->getExtension() == 'php') {
               if ($cached = $this->fileCache->get($fileinfo->getPathName())) {
                 if (isset($cached['id'])) {
-                  // Explicitly unserialize this to create a new object instance.
+                  // Explicitly unserialize this to create a new object
+                  // instance.
                   $definitions[$cached['id']] = unserialize($cached['content']);
                 }
                 continue;
diff --git a/core/lib/Drupal/Component/FileCache/FileCacheFactory.php b/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
index 15b2026..d9d5a10 100644
--- a/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
+++ b/core/lib/Drupal/Component/FileCache/FileCacheFactory.php
@@ -39,7 +39,8 @@ class FileCacheFactory {
    *   The initialized FileCache object.
    */
   public static function get($collection, $default_configuration = []) {
-    // If there is a special key in the configuration, disable FileCache completely.
+    // If there is a special key in the configuration, disable FileCache
+    // completely.
     if (!empty(static::$configuration[static::DISABLE_CACHE])) {
       return new NullFileCache('', '');
     }
diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 3e85b0b..156e952 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -368,8 +368,8 @@ public static function escapeCdataElement(\DOMNode $node, $comment_start = '//',
    * previous sanitization efforts (&lt;script&gt; will become <script>).
    *
    * This method is not the opposite of Html::escape(). For example, this method
-   * will convert "&eacute;" to "é", whereas Html::escape() will not convert
-   * "é" to "&eacute;".
+   * will convert "&eacute;" to "é", whereas Html::escape() will not convert "é"
+   * to "&eacute;".
    *
    * @param string $text
    *   The text to decode entities in.
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 838cbd9..2ba9b7d 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -2,6 +2,7 @@
 <ruleset name="drupal_core">
   <description>Default PHP CodeSniffer configuration for Drupal core.</description>
   <file>.</file>
+  <arg name="encoding" value="utf-8"/>
   <arg name="extensions" value="inc,install,module,php,profile,test,theme"/>
 
   <!--Exclude third party code.-->