upgrade to laravel 7 and set branch to v2

2020-12-25 11:22:15 +00:00
parent 516105c492
commit 0ddd298350
4638 changed files with 132501 additions and 190226 deletions
--- a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
@@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\Response;
 *
 * @author Fabien Potencier <fabien@symfony.com>
 *
- * @final since Symfony 4.4
+ * @final
 */
 class MemoryDataCollector extends DataCollector implements LateDataCollectorInterface
 {
@@ -30,10 +30,8 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte

    /**
     * {@inheritdoc}
-     *
-     * @param \Throwable|null $exception
     */
-    public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
    {
        $this->updateMemoryUsage();
    }