Address container inconsistency across various illuminate/container versions

Author: arrilot

src/Misc/LaravelApplicationWrapper.php

@@ -88,6 +88,8 @@ public function getNamespace()
      */
     public function make($abstract, array $parameters = [])
     {
-        return $this->app->make($abstract, $parameters);
+        return method_exists($app, 'makeWith')
+            ? $app->makeWith($abstract, $parameters)
+            : $app->make($abstract, $parameters);
     }
 }

tests/Support/TestApplicationWrapper.php

@@ -6,6 +6,7 @@
 use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
 use Arrilot\Widgets\Factories\AsyncWidgetFactory;
 use Arrilot\Widgets\Factories\WidgetFactory;
+use Illuminate\Container\Container;
 use Closure;
 use Doctrine\Instantiator\Exception\InvalidArgumentException;
 
@@ -99,9 +100,14 @@ public function make($abstract, array $parameters = [])
         }
 
         if (is_subclass_of($abstract, AbstractWidget::class)) {
-            $app = \Illuminate\Container\Container::getInstance();
+            $app = Container::getInstance();
+            if (!$app) {
+                $app = Container::setInstance(new Container());
+            }
 
-            return $app->makeWith($abstract, $parameters);
+            return method_exists($app, 'makeWith')
+                ? $app->makeWith($abstract, $parameters)
+                : $app->make($abstract, $parameters);
         }
 
         throw new InvalidArgumentException("Binding {$abstract} cannot be resolved while testing");