Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 8881221244e8 · 2017-02-28T14:13:45.000+01:00
* 2.7:
  [2.7] Fix issues reported by static analyse
  [Serializer] Reduce nesting in YamlFileLoader
diff --git a/src/Symfony/Bridge/Twig/TwigEngine.php b/src/Symfony/Bridge/Twig/TwigEngine.php
@@ -112,7 +112,7 @@ public function supports($name)
      * @param string|TemplateReferenceInterface|\Twig_Template $name A template name or an instance of
      *                                                               TemplateReferenceInterface or \Twig_Template
      *
-     * @return \Twig_TemplateInterface A \Twig_TemplateInterface instance
+     * @return \Twig_Template A \Twig_Template instance
      *
      * @throws \InvalidArgumentException if the template does not exist
      */
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -67,7 +67,7 @@ public function getName(Profile $profile, $panel)
      *
      * @param Profile $profile
      *
-     * @return Twig_Template[]
+     * @return \Twig_Template[]
      *
      * @deprecated not used anymore internally
      */
diff --git a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -60,39 +60,39 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
             $this->classes = $classes;
         }
 
-        if (isset($this->classes[$classMetadata->getName()])) {
-            $yaml = $this->classes[$classMetadata->getName()];
-
-            if (isset($yaml['attributes']) && is_array($yaml['attributes'])) {
-                $attributesMetadata = $classMetadata->getAttributesMetadata();
-
-                foreach ($yaml['attributes'] as $attribute => $data) {
-                    if (isset($attributesMetadata[$attribute])) {
-                        $attributeMetadata = $attributesMetadata[$attribute];
-                    } else {
-                        $attributeMetadata = new AttributeMetadata($attribute);
-                        $classMetadata->addAttributeMetadata($attributeMetadata);
-                    }
+        if (!isset($this->classes[$classMetadata->getName()])) {
+            return false;
+        }
 
-                    if (isset($data['groups'])) {
-                        if (!is_array($data['groups'])) {
-                            throw new MappingException('The "groups" key must be an array of strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName());
-                        }
+        $yaml = $this->classes[$classMetadata->getName()];
 
-                        foreach ($data['groups'] as $group) {
-                            if (!is_string($group)) {
-                                throw new MappingException('Group names must be strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName());
-                            }
+        if (isset($yaml['attributes']) && is_array($yaml['attributes'])) {
+            $attributesMetadata = $classMetadata->getAttributesMetadata();
+
+            foreach ($yaml['attributes'] as $attribute => $data) {
+                if (isset($attributesMetadata[$attribute])) {
+                    $attributeMetadata = $attributesMetadata[$attribute];
+                } else {
+                    $attributeMetadata = new AttributeMetadata($attribute);
+                    $classMetadata->addAttributeMetadata($attributeMetadata);
+                }
 
-                            $attributeMetadata->addGroup($group);
+                if (isset($data['groups'])) {
+                    if (!is_array($data['groups'])) {
+                        throw new MappingException(sprintf('The "groups" key must be an array of strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
+                    }
+
+                    foreach ($data['groups'] as $group) {
+                        if (!is_string($group)) {
+                            throw new MappingException(sprintf('Group names must be strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
                         }
+
+                        $attributeMetadata->addGroup($group);
                     }
                 }
             }
-
-            return true;
         }
 
-        return false;
+        return true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function supports($name)`
`112`	`112`	`* @param string\|TemplateReferenceInterface\|\Twig_Template $name A template name or an instance of`
`113`	`113`	`* TemplateReferenceInterface or \Twig_Template`
`114`	`114`	`*`
`115`		`- * @return \Twig_TemplateInterface A \Twig_TemplateInterface instance`
	`115`	`+ * @return \Twig_Template A \Twig_Template instance`
`116`	`116`	`*`
`117`	`117`	`* @throws \InvalidArgumentException if the template does not exist`
`118`	`118`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function getName(Profile $profile, $panel)`
`67`	`67`	`*`
`68`	`68`	`* @param Profile $profile`
`69`	`69`	`*`
`70`		`- * @return Twig_Template[]`
	`70`	`+ * @return \Twig_Template[]`
`71`	`71`	`*`
`72`	`72`	`* @deprecated not used anymore internally`
`73`	`73`	`*/`