DX: re-apply self_accessor and phpdoc_types_order by PHP CS Fixer

keradus · nicolas-grekas · commit ccd78410e9be · 2023-10-29T13:45:54.000+01:00
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -91,7 +91,7 @@ public function attribute(string $key, mixed $value): static
     /**
      * Returns the parent node.
      */
-    public function end(): NodeParentInterface|NodeBuilder|NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition|null
+    public function end(): NodeParentInterface|NodeBuilder|self|ArrayNodeDefinition|VariableNodeDefinition|null
     {
         return $this->parent;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -781,7 +781,7 @@ public function setBindings(array $bindings): static
      *
      * @return $this
      */
-    public function addError(string|\Closure|Definition $error): static
+    public function addError(string|\Closure|self $error): static
     {
         if ($error instanceof self) {
             $this->errors = array_merge($this->errors, $error->errors);
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -662,7 +662,7 @@ public function outerHtml(): string
      * Since an XPath expression might evaluate to either a simple type or a \DOMNodeList,
      * this method will return either an array of simple types or a new Crawler instance.
      */
-    public function evaluate(string $xpath): array|Crawler
+    public function evaluate(string $xpath): array|self
     {
         if (null === $this->document) {
             throw new \LogicException('Cannot evaluate the expression on an uninitialized crawler.');
diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php
@@ -27,7 +27,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      *
      * @param array<string, mixed> $options
      */
-    public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): static;
+    public function add(string|self $child, string $type = null, array $options = []): static;
 
     /**
      * Creates a form builder.
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -331,7 +331,7 @@ public function prepare(Request $request): static
     /**
      * Sends HTTP headers.
      *
-     * @param null|positive-int $statusCode The status code to use, override the statusCode property if set and not null
+     * @param positive-int|null $statusCode The status code to use, override the statusCode property if set and not null
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -68,7 +68,7 @@ public function getCallback(): ?\Closure
     /**
      * This method only sends the headers once.
      *
-     * @param null|positive-int $statusCode The status code to use, override the statusCode property if set and not null
+     * @param positive-int|null $statusCode The status code to use, override the statusCode property if set and not null
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
@@ -76,7 +76,7 @@ class Type
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, array|Type $collectionKeyType = null, array|Type $collectionValueType = null)
+    public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, array|self $collectionKeyType = null, array|self $collectionValueType = null)
     {
         if (!\in_array($builtinType, self::$builtinTypes)) {
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType));
@@ -90,7 +90,7 @@ public function __construct(string $builtinType, bool $nullable = false, string
         $this->collectionValueType = $this->validateCollectionArgument($collectionValueType, 6, '$collectionValueType') ?? [];
     }
 
-    private function validateCollectionArgument(array|Type|null $collectionArgument, int $argumentIndex, string $argumentName): ?array
+    private function validateCollectionArgument(array|self|null $collectionArgument, int $argumentIndex, string $argumentName): ?array
     {
         if (null === $collectionArgument) {
             return null;
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -61,7 +61,7 @@ public function getRoutes(): array
     /**
      * Adds a route to a group.
      */
-    public function addRoute(string $prefix, array|StaticPrefixCollection $route): void
+    public function addRoute(string $prefix, array|self $route): void
     {
         [$prefix, $staticPrefix] = $this->getCommonPrefix($prefix, $prefix);
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function attribute(string $key, mixed $value): static`
`91`	`91`	`/**`
`92`	`92`	`* Returns the parent node.`
`93`	`93`	`*/`
`94`		`- public function end(): NodeParentInterface\|NodeBuilder\|NodeDefinition\|ArrayNodeDefinition\|VariableNodeDefinition\|null`
	`94`	`+ public function end(): NodeParentInterface\|NodeBuilder\|self\|ArrayNodeDefinition\|VariableNodeDefinition\|null`
`95`	`95`	`{`
`96`	`96`	`return $this->parent;`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,7 @@ public function setBindings(array $bindings): static`
`781`	`781`	`*`
`782`	`782`	`* @return $this`
`783`	`783`	`*/`
`784`		`- public function addError(string\|\Closure\|Definition $error): static`
	`784`	`+ public function addError(string\|\Closure\|self $error): static`
`785`	`785`	`{`
`786`	`786`	`if ($error instanceof self) {`
`787`	`787`	`$this->errors = array_merge($this->errors, $error->errors);`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ public function outerHtml(): string`
`662`	`662`	`* Since an XPath expression might evaluate to either a simple type or a \DOMNodeList,`
`663`	`663`	`* this method will return either an array of simple types or a new Crawler instance.`
`664`	`664`	`*/`
`665`		`- public function evaluate(string $xpath): array\|Crawler`
	`665`	`+ public function evaluate(string $xpath): array\|self`
`666`	`666`	`{`
`667`	`667`	`if (null === $this->document) {`
`668`	`668`	`throw new \LogicException('Cannot evaluate the expression on an uninitialized crawler.');`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild`
`27`	`27`	`*`
`28`	`28`	`* @param array<string, mixed> $options`
`29`	`29`	`*/`
`30`		`- public function add(string\|FormBuilderInterface $child, string $type = null, array $options = []): static;`
	`30`	`+ public function add(string\|self $child, string $type = null, array $options = []): static;`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Creates a form builder.`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ public function prepare(Request $request): static`
`331`	`331`	`/**`
`332`	`332`	`* Sends HTTP headers.`
`333`	`333`	`*`
`334`		`- * @param null\|positive-int $statusCode The status code to use, override the statusCode property if set and not null`
	`334`	`+ * @param positive-int\|null $statusCode The status code to use, override the statusCode property if set and not null`
`335`	`335`	`*`
`336`	`336`	`* @return $this`
`337`	`337`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function getCallback(): ?\Closure`
`68`	`68`	`/**`
`69`	`69`	`* This method only sends the headers once.`
`70`	`70`	`*`
`71`		`- * @param null\|positive-int $statusCode The status code to use, override the statusCode property if set and not null`
	`71`	`+ * @param positive-int\|null $statusCode The status code to use, override the statusCode property if set and not null`
`72`	`72`	`*`
`73`	`73`	`* @return $this`
`74`	`74`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class Type`
`76`	`76`	`*`
`77`	`77`	`* @throws \InvalidArgumentException`
`78`	`78`	`*/`
`79`		`- public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, array\|Type $collectionKeyType = null, array\|Type $collectionValueType = null)`
	`79`	`+ public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, array\|self $collectionKeyType = null, array\|self $collectionValueType = null)`
`80`	`80`	`{`
`81`	`81`	`if (!\in_array($builtinType, self::$builtinTypes)) {`
`82`	`82`	`throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType));`
`@@ -90,7 +90,7 @@ public function __construct(string $builtinType, bool $nullable = false, string`
`90`	`90`	`$this->collectionValueType = $this->validateCollectionArgument($collectionValueType, 6, '$collectionValueType') ?? [];`
`91`	`91`	`}`
`92`	`92`
`93`		`- private function validateCollectionArgument(array\|Type\|null $collectionArgument, int $argumentIndex, string $argumentName): ?array`
	`93`	`+ private function validateCollectionArgument(array\|self\|null $collectionArgument, int $argumentIndex, string $argumentName): ?array`
`94`	`94`	`{`
`95`	`95`	`if (null === $collectionArgument) {`
`96`	`96`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function getRoutes(): array`
`61`	`61`	`/**`
`62`	`62`	`* Adds a route to a group.`
`63`	`63`	`*/`
`64`		`- public function addRoute(string $prefix, array\|StaticPrefixCollection $route): void`
	`64`	`+ public function addRoute(string $prefix, array\|self $route): void`
`65`	`65`	`{`
`66`	`66`	`[$prefix, $staticPrefix] = $this->getCommonPrefix($prefix, $prefix);`
`67`	`67`