Core and composer updates

2017-07-03 16:47:07 +01:00 · 2017-07-03 16:47:07 +01:00 · 62cac30480
commit 62cac30480
parent a82634bb98
1118 changed files with 21770 additions and 6306 deletions
--- a/web/vendor/symfony/http-kernel/Bundle/Bundle.php
+++ b/web/vendor/symfony/http-kernel/Bundle/Bundle.php
@ -141,7 +141,7 @@ abstract class Bundle implements BundleInterface
    /**
     * Returns the bundle parent name.
     *
-     * @return string The Bundle parent name it overrides or null if no parent
+     * @return string|null The Bundle parent name it overrides or null if no parent
     */
    public function getParent()
    {