Merge branch '4.3' into 4.4

* 4.3: Fix some return type annotations.
symfony · Aug 7, 2019 · d3a7be8 · d3a7be8
2 parents 158482f + 1aba480
commit d3a7be8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 30 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -188,8 +188,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     /**
      * Writes data as json.
-     *
-     * @return array|string
      */
     private function writeData(array $data, array $options)
     {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -142,8 +142,6 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     /**
      * Writes DOM document.
-     *
-     * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
     {

diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -92,8 +92,6 @@ protected function describeApplication(Application $application, array $options
 
     /**
      * Writes data as json.
-     *
-     * @return array|string
      */
     private function writeData(array $data, array $options)
     {

diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -179,8 +179,6 @@ private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
 
     /**
      * Writes DOM document.
-     *
-     * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
     {

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -320,7 +320,7 @@ public function addNode(\DOMNode $node)
      *
      * @param int $position The position
      *
-     * @return self
+     * @return static
      */
     public function eq($position)
     {
@@ -363,7 +363,7 @@ public function each(\Closure $closure)
      * @param int $offset
      * @param int $length
      *
-     * @return self
+     * @return static
      */
     public function slice($offset = 0, $length = null)
     {
@@ -377,7 +377,7 @@ public function slice($offset = 0, $length = null)
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return self
+     * @return static
      */
     public function reduce(\Closure $closure)
     {
@@ -394,7 +394,7 @@ public function reduce(\Closure $closure)
     /**
      * Returns the first node of the current selection.
      *
-     * @return self
+     * @return static
      */
     public function first()
     {
@@ -404,7 +404,7 @@ public function first()
     /**
      * Returns the last node of the current selection.
      *
-     * @return self
+     * @return static
      */
     public function last()
     {
@@ -414,7 +414,7 @@ public function last()
     /**
      * Returns the siblings nodes of the current selection.
      *
-     * @return self
+     * @return static
      *
      * @throws \InvalidArgumentException When current node is empty
      */
@@ -430,7 +430,7 @@ public function siblings()
     /**
      * Returns the next siblings nodes of the current selection.
      *
-     * @return self
+     * @return static
      *
      * @throws \InvalidArgumentException When current node is empty
      */
@@ -446,7 +446,7 @@ public function nextAll()
     /**
      * Returns the previous sibling nodes of the current selection.
      *
-     * @return self
+     * @return static
      *
      * @throws \InvalidArgumentException
      */
@@ -462,7 +462,7 @@ public function previousAll()
     /**
      * Returns the parents nodes of the current selection.
      *
-     * @return self
+     * @return static
      *
      * @throws \InvalidArgumentException When current node is empty
      */
@@ -489,7 +489,7 @@ public function parents()
      *
      * @param string|null $selector An optional CSS selector to filter children
      *
-     * @return self
+     * @return static
      *
      * @throws \InvalidArgumentException When current node is empty
      * @throws \RuntimeException         If the CssSelector Component is not available and $selector is provided
@@ -686,7 +686,7 @@ public function extract($attributes)
      *
      * @param string $xpath An XPath expression
      *
-     * @return self
+     * @return static
      */
     public function filterXPath($xpath)
     {
@@ -707,7 +707,7 @@ public function filterXPath($xpath)
      *
      * @param string $selector A CSS selector
      *
-     * @return self
+     * @return static
      *
      * @throws \RuntimeException if the CssSelector Component is not available
      */
@@ -724,7 +724,7 @@ public function filter($selector)
      *
      * @param string $value The link text
      *
-     * @return self
+     * @return static
      */
     public function selectLink($value)
     {
@@ -738,7 +738,7 @@ public function selectLink($value)
      *
      * @param string $value The image alt
      *
-     * @return self A new instance of Crawler with the filtered list of nodes
+     * @return static A new instance of Crawler with the filtered list of nodes
      */
     public function selectImage($value)
     {
@@ -752,7 +752,7 @@ public function selectImage($value)
      *
      * @param string $value The button text
      *
-     * @return self
+     * @return static
      */
     public function selectButton($value)
     {
@@ -949,7 +949,7 @@ public static function xpathLiteral($s)
      *
      * The XPath expression should already be processed to apply it in the context of each node.
      *
-     * @return self
+     * @return static
      */
     private function filterRelativeXPath(string $xpath)
     {

diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -192,7 +192,7 @@ private static function getRequestMethod()
      * This method is identical to {@link \Symfony\Component\HttpFoundation\FileBag::fixPhpFilesArray}
      * and should be kept as such in order to port fixes quickly and easily.
      *
-     * @return array
+     * @return mixed
      */
     private static function fixPhpFilesArray($data)
     {
@@ -228,9 +228,7 @@ private static function fixPhpFilesArray($data)
     /**
      * Sets empty uploaded files to NULL in the given uploaded files array.
      *
-     * @param mixed $data The file upload data
-     *
-     * @return array|null Returns the stripped upload data
+     * @return mixed Returns the stripped upload data
      */
     private static function stripEmptyFiles($data)
     {

diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -342,13 +342,13 @@ private function doPurge(string $url)
     /**
      * Loads data for the given key.
      *
-     * @return string The data associated with the key
+     * @return string|null The data associated with the key
      */
     private function load(string $key)
     {
         $path = $this->getPath($key);
 
-        return file_exists($path) ? file_get_contents($path) : false;
+        return file_exists($path) ? file_get_contents($path) : null;
     }
 
     /**