From f85adfea4f18f2ee646ee7ddd80fef5c63f365d2 Mon Sep 17 00:00:00 2001
From: Fabian Bircher <f.bircher@gmail.com>
Date: Sat, 3 Sep 2022 18:09:29 +0200
Subject: [PATCH] Update docs
---
.gitattributes | 16 ++++++++--------
phpstan.neon | 2 +-
src/Config/ConfigPatchMerge.php | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 977a2c6..23b99f0 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 422b619..2182bb4 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 5af0555..0552d3b 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);
--
GitLab