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/routing/Loader/DirectoryLoader.php
+++ b/vendor/symfony/routing/Loader/DirectoryLoader.php
@@ -20,7 +20,7 @@ class DirectoryLoader extends FileLoader
    /**
     * {@inheritdoc}
     */
-    public function load($file, $type = null)
+    public function load($file, string $type = null)
    {
        $path = $this->locator->locate($file);

@@ -49,7 +49,7 @@ class DirectoryLoader extends FileLoader
    /**
     * {@inheritdoc}
     */
-    public function supports($resource, $type = null)
+    public function supports($resource, string $type = null)
    {
        // only when type is forced to directory, not to conflict with AnnotationLoader