[WebLink] Added missing types

tarlepp · nicolas-grekas · commit 719355762208 · 2021-06-03T16:02:54.000+02:00
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "psr/cache": "^1.0|^2.0",
         "psr/container": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/link": "^1.0",
+        "psr/link": "^1.1",
         "psr/log": "~1.0",
         "symfony/contracts": "^2.1",
         "symfony/polyfill-ctype": "~1.8",
diff --git a/src/Symfony/Component/WebLink/GenericLinkProvider.php b/src/Symfony/Component/WebLink/GenericLinkProvider.php
@@ -46,7 +46,7 @@ public function getLinks(): array
     /**
      * {@inheritdoc}
      */
-    public function getLinksByRel($rel): array
+    public function getLinksByRel(string $rel): array
     {
         $links = [];
 
diff --git a/src/Symfony/Component/WebLink/Link.php b/src/Symfony/Component/WebLink/Link.php
@@ -46,7 +46,7 @@ class Link implements EvolvableLinkInterface
     private $rel = [];
 
     /**
-     * @var string[]
+     * @var array<string, string|\Stringable|int|float|bool|array>
      */
     private $attributes = [];
 
@@ -95,7 +95,7 @@ public function getAttributes(): array
      *
      * @return static
      */
-    public function withHref($href)
+    public function withHref(string|\Stringable $href)
     {
         $that = clone $this;
         $that->href = $href;
@@ -108,7 +108,7 @@ public function withHref($href)
      *
      * @return static
      */
-    public function withRel($rel)
+    public function withRel(string $rel)
     {
         $that = clone $this;
         $that->rel[$rel] = $rel;
@@ -121,7 +121,7 @@ public function withRel($rel)
      *
      * @return static
      */
-    public function withoutRel($rel)
+    public function withoutRel(string $rel)
     {
         $that = clone $this;
         unset($that->rel[$rel]);
@@ -134,7 +134,7 @@ public function withoutRel($rel)
      *
      * @return static
      */
-    public function withAttribute($attribute, $value)
+    public function withAttribute(string $attribute, string|\Stringable|int|float|bool|array $value)
     {
         $that = clone $this;
         $that->attributes[$attribute] = $value;
@@ -147,7 +147,7 @@ public function withAttribute($attribute, $value)
      *
      * @return static
      */
-    public function withoutAttribute($attribute)
+    public function withoutAttribute(string $attribute)
     {
         $that = clone $this;
         unset($that->attributes[$attribute]);
diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json
@@ -20,7 +20,7 @@
     },
     "require": {
         "php": ">=8.0.2",
-        "psr/link": "^1.0"
+        "psr/link": "^1.1"
     },
     "suggest": {
         "symfony/http-kernel": ""

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getLinks(): array`
`46`	`46`	`/**`
`47`	`47`	`* {@inheritdoc}`
`48`	`48`	`*/`
`49`		`- public function getLinksByRel($rel): array`
	`49`	`+ public function getLinksByRel(string $rel): array`
`50`	`50`	`{`
`51`	`51`	`$links = [];`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class Link implements EvolvableLinkInterface`
`46`	`46`	`private $rel = [];`
`47`	`47`
`48`	`48`	`/**`
`49`		`- * @var string[]`
	`49`	`+ * @var array<string, string\|\Stringable\|int\|float\|bool\|array>`
`50`	`50`	`*/`
`51`	`51`	`private $attributes = [];`
`52`	`52`
`@@ -95,7 +95,7 @@ public function getAttributes(): array`
`95`	`95`	`*`
`96`	`96`	`* @return static`
`97`	`97`	`*/`
`98`		`- public function withHref($href)`
	`98`	`+ public function withHref(string\|\Stringable $href)`
`99`	`99`	`{`
`100`	`100`	`$that = clone $this;`
`101`	`101`	`$that->href = $href;`
`@@ -108,7 +108,7 @@ public function withHref($href)`
`108`	`108`	`*`
`109`	`109`	`* @return static`
`110`	`110`	`*/`
`111`		`- public function withRel($rel)`
	`111`	`+ public function withRel(string $rel)`
`112`	`112`	`{`
`113`	`113`	`$that = clone $this;`
`114`	`114`	`$that->rel[$rel] = $rel;`
`@@ -121,7 +121,7 @@ public function withRel($rel)`
`121`	`121`	`*`
`122`	`122`	`* @return static`
`123`	`123`	`*/`
`124`		`- public function withoutRel($rel)`
	`124`	`+ public function withoutRel(string $rel)`
`125`	`125`	`{`
`126`	`126`	`$that = clone $this;`
`127`	`127`	`unset($that->rel[$rel]);`
`@@ -134,7 +134,7 @@ public function withoutRel($rel)`
`134`	`134`	`*`
`135`	`135`	`* @return static`
`136`	`136`	`*/`
`137`		`- public function withAttribute($attribute, $value)`
	`137`	`+ public function withAttribute(string $attribute, string\|\Stringable\|int\|float\|bool\|array $value)`
`138`	`138`	`{`
`139`	`139`	`$that = clone $this;`
`140`	`140`	`$that->attributes[$attribute] = $value;`
`@@ -147,7 +147,7 @@ public function withAttribute($attribute, $value)`
`147`	`147`	`*`
`148`	`148`	`* @return static`
`149`	`149`	`*/`
`150`		`- public function withoutAttribute($attribute)`
	`150`	`+ public function withoutAttribute(string $attribute)`
`151`	`151`	`{`
`152`	`152`	`$that = clone $this;`
`153`	`153`	`unset($that->attributes[$attribute]);`