Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 2dbff5ba6cb6 · 2017-11-07T13:10:25.000+01:00
* 3.3:
  Random fixes
  Docblock fixes
  [HttpKernel] Enhance deprecation message
  [SecurityBundle] Fix the datacollector to properly support decision.object being null
diff --git a/CacheWarmer/SerializerCacheWarmer.php b/CacheWarmer/SerializerCacheWarmer.php
@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
                 $supportedLoaders[] = $loader;
             } elseif ($loader instanceof LoaderChain) {
-                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
+                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
             }
         }
 
diff --git a/CacheWarmer/ValidatorCacheWarmer.php b/CacheWarmer/ValidatorCacheWarmer.php
@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)
             if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
                 $supportedLoaders[] = $loader;
             } elseif ($loader instanceof LoaderChain) {
-                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
+                $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
             }
         }
 
diff --git a/Client.php b/Client.php
@@ -62,7 +62,7 @@ public function getKernel()
     /**
      * Gets the profile associated with the current Response.
      *
-     * @return HttpProfile A Profile instance
+     * @return HttpProfile|false A Profile instance
      */
     public function getProfile()
     {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)`
`80`	`80`	`if ($loader instanceof XmlFileLoader \|\| $loader instanceof YamlFileLoader) {`
`81`	`81`	`$supportedLoaders[] = $loader;`
`82`	`82`	`} elseif ($loader instanceof LoaderChain) {`
`83`		`- $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));`
	`83`	`+ $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)`
`91`	`91`	`if ($loader instanceof XmlFileLoader \|\| $loader instanceof YamlFileLoader) {`
`92`	`92`	`$supportedLoaders[] = $loader;`
`93`	`93`	`} elseif ($loader instanceof LoaderChain) {`
`94`		`- $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));`
	`94`	`+ $supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function getKernel()`
`62`	`62`	`/**`
`63`	`63`	`* Gets the profile associated with the current Response.`
`64`	`64`	`*`
`65`		`- * @return HttpProfile A Profile instance`
	`65`	`+ * @return HttpProfile\|false A Profile instance`
`66`	`66`	`*/`
`67`	`67`	`public function getProfile()`
`68`	`68`	`{`