Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 7a0787c8bd08 · 2019-08-20T23:02:25.000+02:00
* 3.4:
  More docblock fixes
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -60,6 +60,8 @@ public function isHit()
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function set($value)
     {
@@ -70,6 +72,8 @@ public function set($value)
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function expiresAt($expiration)
     {
@@ -86,6 +90,8 @@ public function expiresAt($expiration)
 
     /**
      * {@inheritdoc}
+     *
+     * @return $this
      */
     public function expiresAfter($time)
     {
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -121,8 +121,10 @@ public function set($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 {
@@ -140,26 +142,6 @@ public function all()
         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 string $base   The fully qualified name of the base field
-     * @param array  $values The values of the fields
-     *
-     * @return static
-     */
-    private static function create($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
`@@ -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`