Changed the get() static function in Core to be a shortcut for the Si…

…ngletons get function

Fixed a bug in the router when it calls the middlewares

src/.phpstorm.meta.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace PHPSTORM_META
+{
+    override(\Cervo\Singletons::get(0), map([
+        '' => '@'
+    ]));
+
+    override(\Cervo\Core::get(0), map([
+        '' => '@'
+    ]));
+}

src/Core.php

@@ -19,6 +19,7 @@
 
 use Cervo\Config\BaseConfig;
 use Cervo\Exceptions\ControllerReflection\AlreadyInitialisedException;
+use Cervo\Interfaces\SingletonInterface;
 
 
 /**
@@ -31,7 +32,7 @@ final class Core
     /** @var bool */
     private $isInit = false;
 
-    /** @var Context|null */
+    /** @var Context */
     private $context = null;
 
     /** @var Context|null */
@@ -40,14 +41,25 @@ final class Core
     public function __construct(?BaseConfig $config = null)
     {
         $this->context = new Context($config);
-        self::$global_context = $this->context;
     }
 
-    public static function get(): ?Context
+    public static function getCurrentContext(): ?Context
     {
         return self::$global_context;
     }
 
+    /**
+     * Fetch an object from the Singletons registry, or instantialise it.
+     *
+     * @param string $className The name of the class to get as Singleton
+     *
+     * @return SingletonInterface
+     */
+    public static function get(string $className): SingletonInterface
+    {
+        return self::$global_context->getSingletons()->get($className);
+    }
+
     public function start()
     {
         if ($this->isInit === true) {
@@ -56,6 +68,8 @@ public function start()
 
         $this->isInit = true;
 
+        self::$global_context = $this->context;
+
         /** @var Router $router */
         $router = $this->getContext()->getSingletons()->get(Router::class);
 
@@ -66,7 +80,7 @@ public function start()
         (new ControllerReflection($this->getContext(), $router->dispatch()))();
     }
 
-    public function getContext(): ?Context
+    public function getContext(): Context
     {
         return $this->context;
     }

src/Router.php

@@ -330,6 +330,7 @@ private function getDispatcher(): Dispatcher\GroupCountBased
 
         if ($this->cacheExists) {
 
+            /** @noinspection PhpIncludeInspection */
             if (!is_array($dispatchData = require $this->cacheFilePath)) {
                 throw new InvalidRouterCacheException;
             }
@@ -409,7 +410,6 @@ private function getBaseUri(): string
     private function handleMiddlewares(array $middlewares, Route $route): void
     {
         foreach ($middlewares as $middleware) {
-
             if (is_array($middleware)) {
 
                 $this->handleMiddlewares($middleware, $route);
@@ -420,7 +420,7 @@ private function handleMiddlewares(array $middlewares, Route $route): void
                     throw new InvalidMiddlewareException;
                 }
 
-                if (!(new $middleware)($route)()) {
+                if (!(new $middleware($route))()) {
                     throw new RouteMiddlewareFailedException;
                 }
 

src/Singletons.php

@@ -42,9 +42,9 @@ public function __construct(Context $context)
      *
      * @param string $className The name of the class to get as Singleton
      *
-     * @return SingletonInterface|Context
+     * @return SingletonInterface
      */
-    public function get(string $className)
+    public function get(string $className): SingletonInterface
     {
         if (isset($this->objects[$className]) && is_object($this->objects[$className])) {
             return $this->objects[$className];

src/Utils/ClassUtils.php

@@ -17,6 +17,10 @@
 
 namespace Cervo\Utils;
 
+use ReflectionClass;
+use ReflectionException;
+
+
 /**
  * Cervo provider interface.
  *
@@ -36,10 +40,10 @@ public static function implements(string $class, string $interface): bool
     {
         try {
 
-            $reflection = new \ReflectionClass($class);
+            $reflection = new ReflectionClass($class);
             return $reflection->implementsInterface($interface);
 
-        } catch (\ReflectionException $e) {
+        } catch (ReflectionException $e) {
             return false;
         }
     }