refactor middleware registration and increase $instance visibility to…

… protected
praswicaksono · Aug 13, 2015 · bc1b9ab · bc1b9ab
1 parent 2c651eb
commit bc1b9ab
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -39,7 +39,7 @@ class Application implements ContainerInterface
     /**
      * @var Application;
      */
-    private static $instance;
+    protected static $instance;
 
     /**
      * @param ConfigurationInterface $config
@@ -148,16 +148,7 @@ public function register(ServiceProviderInterface $service, array $config = [])
      */
     public function middleware($middleware)
     {
-        if ($middleware instanceof \Closure) {
-            $this->middlewares[] = $middleware;
-            return $this;
-        }
-
-        if (is_callable($middleware)) {
-            if (! $middleware instanceof MiddlewareInterface) {
-                throw new \RuntimeException(sprintf('middleware should implement %s', MiddlewareInterface::class));
-            }
-            $this->container->singleton($middleware);
+        if ($middleware instanceof \Closure || $middleware instanceof MiddlewareInterface) {
             $this->middlewares[] = $middleware;
             return $this;
         }