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/AjaxDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/AjaxDataCollector.php
@@ -19,16 +19,11 @@ use Symfony\Component\HttpFoundation\Response;
 *
 * @author Bart van den Burg <bart@burgov.nl>
 *
- * @final since Symfony 4.4
+ * @final
 */
 class AjaxDataCollector extends DataCollector
 {
-    /**
-     * {@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)
    {
        // all collecting is done client side
    }