Merge pull request #390 from bearsunday/apcu

Fix apuc stub issue in web context

Author: koriym

src-files/apcu.php

@@ -36,6 +36,7 @@ function apcu_sma_info($limited = false)
 
         function apcu_store($key, $var, $ttl = 0)
         {
+            return [];
         }
 
         function apcu_fetch($key, &$success = null)

src/Compiler/CompileClassMetaInfo.php

@@ -21,7 +21,7 @@ final class CompileClassMetaInfo
      *
      * @param class-string<T> $className
      *
-     * @template T
+     * @template T of object
      */
     public function __invoke(Reader $reader, NamedParameterInterface $namedParams, string $className): void
     {

src/Compiler/CompileDependencies.php

@@ -31,6 +31,7 @@ public function __invoke(AbstractModule $module): AbstractModule
         foreach ($dependencies as $dependencyIndex) {
             $pos = strpos((string) $dependencyIndex, '-');
             assert(is_int($pos));
+            /** @var ''|class-string $interface */
             $interface = substr((string) $dependencyIndex, 0, $pos);
             $name = substr((string) $dependencyIndex, $pos + 1);
             ($this->newInstance)($interface, $name);

src/Compiler/FakeRun.php

@@ -18,7 +18,6 @@
 
 use function assert;
 use function class_exists;
-use function is_object;
 use function ob_end_clean;
 use function ob_start;
 use function property_exists;
@@ -57,11 +56,9 @@ public function __invoke(): void
         ($bootstrap)($this->appMeta->name, $this->context, $GLOBALS, $_SERVER); // 200 OK
         $_SERVER['REQUEST_METHOD'] = 'DELETE';
         $app = $this->injector->getInstance(AppInterface::class);
-        assert(is_object($app));
         assert(property_exists($app, 'resource'));
         assert(property_exists($app, 'responder'));
         $ro = $this->injector->getInstance(NullPage::class);
-        assert($ro instanceof NullPage);
         $ro->uri = new Uri('app://self/');
         /** @var NullPage $ro */
         $ro = $app->resource->get->object($ro)(['required' => 'string']);

src/Compiler/NewInstance.php

@@ -32,6 +32,9 @@ public function __construct(InjectorInterface $injector)
         $this->injector = $injector;
     }
 
+    /**
+     * @param ''|class-string $interface
+     */
     public function __invoke(string $interface, string $name = ''): void
     {
         $dependencyIndex = $interface . '-' . $name;

tests/Fake/fake-app/src/Module/App.php

@@ -15,7 +15,7 @@
 
 class App extends AbstractApp
 {
-    public static $counfOfNew = 0;
+    public static $countOfNewInstance = 0;
 
     public $throwableHandler;
 
@@ -31,6 +31,6 @@ public function setThrowableHandler(ThrowableHandlerInterface  $handler)
     public function __construct(HttpCacheInterface $httpCache, RouterInterface $router, TransferInterface $responder, ResourceInterface $resource, ErrorInterface $error)
     {
         parent::__construct($httpCache, $router, $responder, $resource, $error);
-        self::$counfOfNew++;
+        self::$countOfNewInstance++;
     }
 }

tests/InjectorTest.php

@@ -66,18 +66,18 @@ public function testCachedGetInstance(string $context, int $countOfNew): void
         $appDir = __DIR__ . '/Fake/fake-app';
         $exitCode = $this->runOnce($context);
         $this->assertSame(0, $exitCode);
-        App::$counfOfNew = 0;
+        App::$countOfNewInstance = 0;
         $injector = Injector::getInstance('FakeVendor\HelloWorld', $context, $appDir);
         $app = $injector->getInstance(AppInterface::class);
         assert($app instanceof AppInterface);
         $this->assertInstanceOf(AppInterface::class, $app);
-        $this->assertSame($countOfNew, App::$counfOfNew);
+        $count = App::$countOfNewInstance;
         // 2nd injector; AppInterface object should be stored as a singleton.
         $injector = Injector::getInstance('FakeVendor\HelloWorld', $context, $appDir);
         $app = $injector->getInstance(AppInterface::class);
         assert($app instanceof AppInterface);
         $this->assertInstanceOf(AppInterface::class, $app);
-        $this->assertSame($countOfNew, App::$counfOfNew);
+        $this->assertSame($count, App::$countOfNewInstance);
     }
 
     /**