diff --git a/.gitattributes b/.gitattributes
index 977a2c6ec1d22c52cc7bb59c5f87b503843ae699..23b99f09c4bff373fe40d8f0a5c9b1542e8522b5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,24 +19,24 @@
 *.config  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.dist    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
-*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.js      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.po      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.script  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.sql     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.svg     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.twig    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.txt     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
diff --git a/phpstan.neon b/phpstan.neon
index 422b6198f0cc1304b961a21a4cb49024404f0dcb..2182bb478b96970d541d3fcb1690bb4203f6d169 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,7 +7,7 @@ parameters:
     - '#Unsafe usage of new static\(\)\.#'
     # These are wrong annotations on core classes.
     - '#Method Drupal\\config_split\\Config\\SplitCollectionStorage::createCollection\(\) should return \$this\(Drupal\\config_split\\Config\\SplitCollectionStorage\) but returns static\(Drupal\\config_split\\Config\\SplitCollectionStorage\)\.#'
-    - '#Method Drupal\\config_split\\Config\\StatusOverride::createConfigObject\(\) should return Drupal\\Core\\Config\\StorableConfigBase but returns null\.#'
+    - '#Method Drupal\\config_split\\Config\\StatusConfigFactoryOverride::createConfigObject\(\) should return Drupal\\Core\\Config\\StorableConfigBase but returns null\.#'
   paths:
     - src
 #    - tests
diff --git a/src/Config/ConfigPatchMerge.php b/src/Config/ConfigPatchMerge.php
index 5af05551b998832623f6e1cdc37e636d604383d9..0552d3bb236e47ab053ee36b82306d904453a3b4 100644
--- a/src/Config/ConfigPatchMerge.php
+++ b/src/Config/ConfigPatchMerge.php
@@ -105,7 +105,7 @@ public function mergePatch(array $config, ConfigPatch $patch, string $name): arr
   /**
    * Recursively computes the difference of arrays.
    *
-   * This method transforms the sequence keys and then calls the utility method.
+   * This method transforms the sequence keys and then acts like the utility.
    *
    * @param array $array1
    *   The array to compare from.
@@ -120,7 +120,7 @@ public function mergePatch(array $config, ConfigPatch $patch, string $name): arr
    *   Returns an array containing all the values from array1 that are not
    *   present in array2.
    *
-   * @see self::utilityDiffAssocRecursive()
+   * @see \Drupal\Component\Utility\DiffArray::diffAssocRecursive()
    */
   private static function diffArray(array $array1, array $array2, Element $element, string $path = ''): array {
     // This should not be necessary, but somehow objects have been part of it.
@@ -183,7 +183,7 @@ private static function diffArray(array $array1, array $array2, Element $element
    * @return array
    *   The merged array.
    *
-   * @see self::utilityMergeDeepArray()
+   * @see \Drupal\Component\Utility\NestedArray::mergeDeepArray()
    */
   private static function mergeArray(array $array1, array $array2, Element $element, string $path = ''): array {
     $type = self::getType($element, $path);