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/Profiler/Profile.php
+++ b/web/vendor/symfony/http-kernel/Profiler/Profile.php
@ -156,7 +156,7 @@ class Profile
    /**
     * Returns the time.
     *
-     * @return string The time
+     * @return int The time
     */
    public function getTime()
    {
@ -167,6 +167,9 @@ class Profile
        return $this->time;
    }

+    /**
+     * @param int The time
+     */
    public function setTime($time)
    {
        $this->time = $time;