Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit af6cf3140d4d · 2019-08-20T23:03:47.000+02:00
* 4.3:
  More docblock fixes
  fix test
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -65,7 +65,7 @@ public function isHit()
     /**
      * {@inheritdoc}
      *
-     * @return static
+     * @return $this
      */
     public function set($value)
     {
@@ -77,7 +77,7 @@ public function set($value)
     /**
      * {@inheritdoc}
      *
-     * @return static
+     * @return $this
      */
     public function expiresAt($expiration)
     {
@@ -95,7 +95,7 @@ public function expiresAt($expiration)
     /**
      * {@inheritdoc}
      *
-     * @return static
+     * @return $this
      */
     public function expiresAfter($time)
     {
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -114,8 +114,10 @@ public function set(string $name, $value)
         if ((!\is_array($value) && $target instanceof Field\FormField) || $target instanceof Field\ChoiceFormField) {
             $target->setValue($value);
         } elseif (\is_array($value)) {
-            $fields = self::create($name, $value);
-            foreach ($fields->all() as $k => $v) {
+            $registry = new static();
+            $registry->base = $name;
+            $registry->fields = $value;
+            foreach ($registry->all() as $k => $v) {
                 $this->set($k, $v);
             }
         } else {
@@ -133,25 +135,6 @@ public function all(): array
         return $this->walk($this->fields, $this->base);
     }
 
-    /**
-     * Creates an instance of the class.
-     *
-     * This function is made private because it allows overriding the $base and
-     * the $values properties without any type checking.
-     *
-     * @param array $values The values of the fields
-     *
-     * @return static
-     */
-    private static function create(string $base, array $values)
-    {
-        $registry = new static();
-        $registry->base = $base;
-        $registry->fields = $values;
-
-        return $registry;
-    }
-
     /**
      * Transforms a PHP array in a list of fully qualified name / value.
      */
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -34,7 +34,7 @@ interface DenormalizerInterface
      * @param string $format  Format the given data was extracted from
      * @param array  $context Options available to the denormalizer
      *
-     * @return object
+     * @return object|array
      *
      * @throws BadMethodCallException   Occurs when the normalizer is not called in an expected context
      * @throws InvalidArgumentException Occurs when the arguments are not coherent or not supported

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function isHit()`
`65`	`65`	`/**`
`66`	`66`	`* {@inheritdoc}`
`67`	`67`	`*`
`68`		`- * @return static`
	`68`	`+ * @return $this`
`69`	`69`	`*/`
`70`	`70`	`public function set($value)`
`71`	`71`	`{`
`@@ -77,7 +77,7 @@ public function set($value)`
`77`	`77`	`/**`
`78`	`78`	`* {@inheritdoc}`
`79`	`79`	`*`
`80`		`- * @return static`
	`80`	`+ * @return $this`
`81`	`81`	`*/`
`82`	`82`	`public function expiresAt($expiration)`
`83`	`83`	`{`
`@@ -95,7 +95,7 @@ public function expiresAt($expiration)`
`95`	`95`	`/**`
`96`	`96`	`* {@inheritdoc}`
`97`	`97`	`*`
`98`		`- * @return static`
	`98`	`+ * @return $this`
`99`	`99`	`*/`
`100`	`100`	`public function expiresAfter($time)`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ interface DenormalizerInterface`
`34`	`34`	`* @param string $format Format the given data was extracted from`
`35`	`35`	`* @param array $context Options available to the denormalizer`
`36`	`36`	`*`
`37`		`- * @return object`
	`37`	`+ * @return object\|array`
`38`	`38`	`*`
`39`	`39`	`* @throws BadMethodCallException Occurs when the normalizer is not called in an expected context`
`40`	`40`	`* @throws InvalidArgumentException Occurs when the arguments are not coherent or not supported`