BACKPORT-CONFLICT

Author: DerManoMann

phpstan-baseline.neon

@@ -1,8 +1,28 @@
 parameters:
 	ignoreErrors:
 		-
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+			message: '#^Property OpenApi\\Annotations\\AbstractAnnotation\:\:\$x \(array\<string, mixed\>\) does not accept string\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: docs/examples/processors/schema-query-parameter/SchemaQueryParameter.php
+
+		-
+			message: '#^Attribute class JetBrains\\PhpStorm\\ArrayShape does not exist\.$#'
+			identifier: attribute.notFound
+			count: 1
+			path: docs/examples/specs/using-links/attributes/User.php
+
+		-
+>>>>>>> 34e473e ( BACKPORT-CONFLICT)
 			message: '#^Call to function method_exists\(\) with ReflectionProperty and ''isPromoted'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
+=======
+			message: '#^Call to an undefined method Reflector\:\:getAttributes\(\)\.$#'
+			identifier: method.notFound
+>>>>>>> 9cdd14a (Improve phpstan config (#1928))
 			count: 1
 			path: src/Analysers/AttributeAnnotationFactory.php
 
@@ -67,6 +87,28 @@ parameters:
 			path: src/Processors/DocBlockDescriptions.php
 
 		-
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+			message: '#^Property OpenApi\\Annotations\\JsonContent\:\:\$encoding \(array\<OpenApi\\Annotations\\Encoding\>\) does not accept string\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/Processors/MergeJsonContent.php
+
+		-
+			message: '#^Property OpenApi\\Annotations\\Schema\:\:\$examples \(array\<OpenApi\\Annotations\\Examples\>\) does not accept string\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/Processors/MergeJsonContent.php
+
+		-
+			message: '#^Property OpenApi\\Annotations\\Schema\:\:\$examples \(array\<OpenApi\\Annotations\\Examples\>\) does not accept string\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/Processors/MergeXmlContent.php
+
+		-
+>>>>>>> 34e473e ( BACKPORT-CONFLICT)
 			message: '#^Call to function method_exists\(\) with ReflectionProperty and ''isPromoted'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
 			count: 2
@@ -79,6 +121,8 @@ parameters:
 			path: src/Type/TypeInfoTypeResolver.php
 
 		-
+=======
+>>>>>>> 9cdd14a (Improve phpstan config (#1928))
 			message: '#^Parameter \#1 \$callback of function spl_autoload_register expects \(callable\(string\)\: void\)\|null, array\{Composer\\Autoload\\ClassLoader, ''findFile''\} given\.$#'
 			identifier: argument.type
 			count: 1