Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 93225d23a6e3 · 2021-07-02T18:38:59.000+02:00
* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/Caster/DOMCaster.php b/Caster/DOMCaster.php
@@ -82,7 +82,7 @@ public static function castLength($dom, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
-    public static function castImplementation($dom, array $a, Stub $stub, bool $isNested)
+    public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
             Caster::PREFIX_VIRTUAL.'Core' => '1.0',
diff --git a/Caster/LinkStub.php b/Caster/LinkStub.php
@@ -23,7 +23,7 @@ class LinkStub extends ConstStub
     private static $vendorRoots;
     private static $composerRoots;
 
-    public function __construct($label, int $line = 0, $href = null)
+    public function __construct(string $label, int $line = 0, string $href = null)
     {
         $this->value = $label;
 
diff --git a/Caster/RdKafkaCaster.php b/Caster/RdKafkaCaster.php
@@ -31,7 +31,7 @@
  */
 class RdKafkaCaster
 {
-    public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, $isNested)
+    public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -51,7 +51,7 @@ public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub,
         return $a;
     }
 
-    public static function castTopic(Topic $c, array $a, Stub $stub, $isNested)
+    public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -75,7 +75,7 @@ public static function castTopicPartition(TopicPartition $c, array $a)
         return $a;
     }
 
-    public static function castMessage(Message $c, array $a, Stub $stub, $isNested)
+    public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -86,7 +86,7 @@ public static function castMessage(Message $c, array $a, Stub $stub, $isNested)
         return $a;
     }
 
-    public static function castConf(Conf $c, array $a, Stub $stub, $isNested)
+    public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -97,7 +97,7 @@ public static function castConf(Conf $c, array $a, Stub $stub, $isNested)
         return $a;
     }
 
-    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNested)
+    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -108,7 +108,7 @@ public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNest
         return $a;
     }
 
-    public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested)
+    public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -121,14 +121,14 @@ public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested)
         return $a;
     }
 
-    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, $isNested)
+    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $a += iterator_to_array($c);
 
         return $a;
     }
 
-    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, $isNested)
+    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -140,7 +140,7 @@ public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub,
         return $a;
     }
 
-    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, $isNested)
+    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -153,7 +153,7 @@ public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stu
         return $a;
     }
 
-    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, $isNested)
+    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
diff --git a/Caster/ResourceCaster.php b/Caster/ResourceCaster.php
@@ -48,7 +48,7 @@ public static function castProcess($process, array $a, Stub $stub, bool $isNeste
     public static function castStream($stream, array $a, Stub $stub, bool $isNested)
     {
         $a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
-        if (isset($a['uri'])) {
+        if ($a['uri'] ?? false) {
             $a['uri'] = new LinkStub($a['uri']);
         }
 
@@ -60,7 +60,7 @@ public static function castStreamContext($stream, array $a, Stub $stub, bool $is
         return @stream_context_get_params($stream) ?: $a;
     }
 
-    public static function castGd($gd, array $a, Stub $stub, $isNested)
+    public static function castGd($gd, array $a, Stub $stub, bool $isNested)
     {
         $a['size'] = imagesx($gd).'x'.imagesy($gd);
         $a['trueColor'] = imageistruecolor($gd);
diff --git a/Caster/SplCaster.php b/Caster/SplCaster.php
@@ -39,7 +39,7 @@ public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub
         return self::castSplArray($c, $a, $stub, $isNested);
     }
 
-    public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
+    public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested)
     {
         $a += [
             Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),
@@ -129,7 +129,7 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool
             }
         }
 
-        if (isset($a[$prefix.'realPath'])) {
+        if ($a[$prefix.'realPath'] ?? false) {
             $a[$prefix.'realPath'] = new LinkStub($a[$prefix.'realPath']);
         }
 
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -324,7 +324,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int
      * @param bool $hasChild When the dump of the hash has child item
      * @param int  $cut      The number of items the hash has been cut by
      */
-    protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut)
+    protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)
     {
         if ($cut) {
             $this->line .= ' …';
@@ -428,7 +428,7 @@ protected function dumpKey(Cursor $cursor)
      *
      * @return string The value with style decoration
      */
-    protected function style($style, $value, $attr = [])
+    protected function style(string $style, string $value, array $attr = [])
     {
         if (null === $this->colors) {
             $this->colors = $this->supportsColors();
diff --git a/Dumper/HtmlDumper.php b/Dumper/HtmlDumper.php
@@ -116,21 +116,16 @@ public function setDisplayOptions(array $displayOptions)
 
     /**
      * Sets an HTML header that will be dumped once in the output stream.
-     *
-     * @param string $header An HTML string
      */
-    public function setDumpHeader($header)
+    public function setDumpHeader(string $header)
     {
         $this->dumpHeader = $header;
     }
 
     /**
      * Sets an HTML prefix and suffix that will encapse every single dump.
-     *
-     * @param string $prefix The prepended HTML string
-     * @param string $suffix The appended HTML string
      */
-    public function setDumpBoundaries($prefix, $suffix)
+    public function setDumpBoundaries(string $prefix, string $suffix)
     {
         $this->dumpPrefix = $prefix;
         $this->dumpSuffix = $suffix;
@@ -851,7 +846,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int
     /**
      * {@inheritdoc}
      */
-    protected function style($style, $value, $attr = [])
+    protected function style(string $style, string $value, array $attr = [])
     {
         if ('' === $value) {
             return '';
@@ -985,7 +980,7 @@ private function getSourceLink(string $file, int $line)
     }
 }
 
-function esc($str)
+function esc(string $str)
 {
     return htmlspecialchars($str, \ENT_QUOTES, 'UTF-8');
 }
diff --git a/Server/Connection.php b/Server/Connection.php
@@ -78,7 +78,7 @@ public function write(Data $data): bool
         return false;
     }
 
-    private static function nullErrorHandler($t, $m)
+    private static function nullErrorHandler(int $t, string $m)
     {
         // no-op
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static function castLength($dom, array $a, Stub $stub, bool $isNested)`
`82`	`82`	`return $a;`
`83`	`83`	`}`
`84`	`84`
`85`		`- public static function castImplementation($dom, array $a, Stub $stub, bool $isNested)`
	`85`	`+ public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested)`
`86`	`86`	`{`
`87`	`87`	`$a += [`
`88`	`88`	`Caster::PREFIX_VIRTUAL.'Core' => '1.0',`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class LinkStub extends ConstStub`
`23`	`23`	`private static $vendorRoots;`
`24`	`24`	`private static $composerRoots;`
`25`	`25`
`26`		`- public function __construct($label, int $line = 0, $href = null)`
	`26`	`+ public function __construct(string $label, int $line = 0, string $href = null)`
`27`	`27`	`{`
`28`	`28`	`$this->value = $label;`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*/`
`32`	`32`	`class RdKafkaCaster`
`33`	`33`	`{`
`34`		`- public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, $isNested)`
	`34`	`+ public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested)`
`35`	`35`	`{`
`36`	`36`	`$prefix = Caster::PREFIX_VIRTUAL;`
`37`	`37`
`@@ -51,7 +51,7 @@ public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub,`
`51`	`51`	`return $a;`
`52`	`52`	`}`
`53`	`53`
`54`		`- public static function castTopic(Topic $c, array $a, Stub $stub, $isNested)`
	`54`	`+ public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)`
`55`	`55`	`{`
`56`	`56`	`$prefix = Caster::PREFIX_VIRTUAL;`
`57`	`57`
`@@ -75,7 +75,7 @@ public static function castTopicPartition(TopicPartition $c, array $a)`
`75`	`75`	`return $a;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public static function castMessage(Message $c, array $a, Stub $stub, $isNested)`
	`78`	`+ public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested)`
`79`	`79`	`{`
`80`	`80`	`$prefix = Caster::PREFIX_VIRTUAL;`
`81`	`81`
`@@ -86,7 +86,7 @@ public static function castMessage(Message $c, array $a, Stub $stub, $isNested)`
`86`	`86`	`return $a;`
`87`	`87`	`}`
`88`	`88`
`89`		`- public static function castConf(Conf $c, array $a, Stub $stub, $isNested)`
	`89`	`+ public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)`
`90`	`90`	`{`
`91`	`91`	`$prefix = Caster::PREFIX_VIRTUAL;`
`92`	`92`
`@@ -97,7 +97,7 @@ public static function castConf(Conf $c, array $a, Stub $stub, $isNested)`
`97`	`97`	`return $a;`
`98`	`98`	`}`
`99`	`99`
`100`		`- public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNested)`
	`100`	`+ public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested)`
`101`	`101`	`{`
`102`	`102`	`$prefix = Caster::PREFIX_VIRTUAL;`
`103`	`103`
`@@ -108,7 +108,7 @@ public static function castTopicConf(TopicConf $c, array $a, Stub $stub, $isNest`
`108`	`108`	`return $a;`
`109`	`109`	`}`
`110`	`110`
`111`		`- public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested)`
	`111`	`+ public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested)`
`112`	`112`	`{`
`113`	`113`	`$prefix = Caster::PREFIX_VIRTUAL;`
`114`	`114`
`@@ -121,14 +121,14 @@ public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, $isNested)`
`121`	`121`	`return $a;`
`122`	`122`	`}`
`123`	`123`
`124`		`- public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, $isNested)`
	`124`	`+ public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested)`
`125`	`125`	`{`
`126`	`126`	`$a += iterator_to_array($c);`
`127`	`127`
`128`	`128`	`return $a;`
`129`	`129`	`}`
`130`	`130`
`131`		`- public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, $isNested)`
	`131`	`+ public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested)`
`132`	`132`	`{`
`133`	`133`	`$prefix = Caster::PREFIX_VIRTUAL;`
`134`	`134`
`@@ -140,7 +140,7 @@ public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub,`
`140`	`140`	`return $a;`
`141`	`141`	`}`
`142`	`142`
`143`		`- public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, $isNested)`
	`143`	`+ public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested)`
`144`	`144`	`{`
`145`	`145`	`$prefix = Caster::PREFIX_VIRTUAL;`
`146`	`146`
`@@ -153,7 +153,7 @@ public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stu`
`153`	`153`	`return $a;`
`154`	`154`	`}`
`155`	`155`
`156`		`- public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, $isNested)`
	`156`	`+ public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested)`
`157`	`157`	`{`
`158`	`158`	`$prefix = Caster::PREFIX_VIRTUAL;`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function castProcess($process, array $a, Stub $stub, bool $isNeste`
`48`	`48`	`public static function castStream($stream, array $a, Stub $stub, bool $isNested)`
`49`	`49`	`{`
`50`	`50`	`$a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);`
`51`		`- if (isset($a['uri'])) {`
	`51`	`+ if ($a['uri'] ?? false) {`
`52`	`52`	`$a['uri'] = new LinkStub($a['uri']);`
`53`	`53`	`}`
`54`	`54`
`@@ -60,7 +60,7 @@ public static function castStreamContext($stream, array $a, Stub $stub, bool $is`
`60`	`60`	`return @stream_context_get_params($stream) ?: $a;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public static function castGd($gd, array $a, Stub $stub, $isNested)`
	`63`	`+ public static function castGd($gd, array $a, Stub $stub, bool $isNested)`
`64`	`64`	`{`
`65`	`65`	`$a['size'] = imagesx($gd).'x'.imagesy($gd);`
`66`	`66`	`$a['trueColor'] = imageistruecolor($gd);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub`
`39`	`39`	`return self::castSplArray($c, $a, $stub, $isNested);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)`
	`42`	`+ public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested)`
`43`	`43`	`{`
`44`	`44`	`$a += [`
`45`	`45`	`Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),`
`@@ -129,7 +129,7 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`- if (isset($a[$prefix.'realPath'])) {`
	`132`	`+ if ($a[$prefix.'realPath'] ?? false) {`
`133`	`133`	`$a[$prefix.'realPath'] = new LinkStub($a[$prefix.'realPath']);`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int`
`324`	`324`	`* @param bool $hasChild When the dump of the hash has child item`
`325`	`325`	`* @param int $cut The number of items the hash has been cut by`
`326`	`326`	`*/`
`327`		`- protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut)`
	`327`	`+ protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)`
`328`	`328`	`{`
`329`	`329`	`if ($cut) {`
`330`	`330`	`$this->line .= ' …';`
`@@ -428,7 +428,7 @@ protected function dumpKey(Cursor $cursor)`
`428`	`428`	`*`
`429`	`429`	`* @return string The value with style decoration`
`430`	`430`	`*/`
`431`		`- protected function style($style, $value, $attr = [])`
	`431`	`+ protected function style(string $style, string $value, array $attr = [])`
`432`	`432`	`{`
`433`	`433`	`if (null === $this->colors) {`
`434`	`434`	`$this->colors = $this->supportsColors();`
Original file line number	Diff line number	Diff line change
`@@ -116,21 +116,16 @@ public function setDisplayOptions(array $displayOptions)`
`116`	`116`
`117`	`117`	`/**`
`118`	`118`	`* Sets an HTML header that will be dumped once in the output stream.`
`119`		`- *`
`120`		`- * @param string $header An HTML string`
`121`	`119`	`*/`
`122`		`- public function setDumpHeader($header)`
	`120`	`+ public function setDumpHeader(string $header)`
`123`	`121`	`{`
`124`	`122`	`$this->dumpHeader = $header;`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`/**`
`128`	`126`	`* Sets an HTML prefix and suffix that will encapse every single dump.`
`129`		`- *`
`130`		`- * @param string $prefix The prepended HTML string`
`131`		`- * @param string $suffix The appended HTML string`
`132`	`127`	`*/`
`133`		`- public function setDumpBoundaries($prefix, $suffix)`
	`128`	`+ public function setDumpBoundaries(string $prefix, string $suffix)`
`134`	`129`	`{`
`135`	`130`	`$this->dumpPrefix = $prefix;`
`136`	`131`	`$this->dumpSuffix = $suffix;`
`@@ -851,7 +846,7 @@ public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int`
`851`	`846`	`/**`
`852`	`847`	`* {@inheritdoc}`
`853`	`848`	`*/`
`854`		`- protected function style($style, $value, $attr = [])`
	`849`	`+ protected function style(string $style, string $value, array $attr = [])`
`855`	`850`	`{`
`856`	`851`	`if ('' === $value) {`
`857`	`852`	`return '';`
`@@ -985,7 +980,7 @@ private function getSourceLink(string $file, int $line)`
`985`	`980`	`}`
`986`	`981`	`}`
`987`	`982`
`988`		`-function esc($str)`
	`983`	`+function esc(string $str)`
`989`	`984`	`{`
`990`	`985`	`return htmlspecialchars($str, \ENT_QUOTES, 'UTF-8');`
`991`	`986`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function write(Data $data): bool`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
`81`		`- private static function nullErrorHandler($t, $m)`
	`81`	`+ private static function nullErrorHandler(int $t, string $m)`
`82`	`82`	`{`
`83`	`83`	`// no-op`
`84`	`84`	`}`