main

.gitignore

@@ -2,8 +2,4 @@
 /.idea
 
 /vendor
-composer.lock
-
-/.data
-/.new
-/.old
+composer.lock

composer.json

@@ -34,5 +34,8 @@
     "optimize-autoloader": true,
 
     "sort-packages": false
+  },
+  "require-dev": {
+    "symfony/var-dumper": "^5.4"
   }
-}
+}

helpers/di.php

@@ -7,15 +7,15 @@
 
 
 /**
- * @return Di
+ * @return DiInterface
  */
 function _di(DiInterface $di = null)
 {
     static $instance;
 
     $before = $instance;
 
-    $instance = $di ?? $instance ?? new Di();
+    $instance = $di ?? $instance ?? (new DiFactory())->newDi();
 
     if ($before !== $instance) {
         $instance::setInstance($instance);

src/Container/Container.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Gzhegow\Di\Container;
+
+
+class Container extends ContainerPsr
+{
+}

src/Container/ContainerInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Gzhegow\Di\Container;
+
+
+interface ContainerInterface extends ContainerPsrInterface
+{
+}

src/Container.php → src/Container/ContainerPsr.php

@@ -1,13 +1,12 @@
 <?php
 
-namespace Gzhegow\Di;
+namespace Gzhegow\Di\Container;
 
-
-class Container implements ContainerInterface
-{
-    /** > gzhegow, это адаптер для Psr\Container\ContainerInterface */
+use Gzhegow\Di\DiInterface;
 
 
+class ContainerPsr implements ContainerPsrInterface
+{
     /**
      * @var DiInterface
      */

src/Container/ContainerPsr10000.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Gzhegow\Di\Container;
+
+use Gzhegow\Di\DiInterface;
+
+
+class ContainerPsr10000 implements ContainerPsr10000Interface
+{
+    /**
+     * @var DiInterface
+     */
+    protected $di;
+
+
+    public function __construct(DiInterface $di)
+    {
+        $this->di = $di;
+    }
+
+
+    public function getDi() : DiInterface
+    {
+        return $this->di;
+    }
+
+
+    public function has($id) : bool
+    {
+        return $this->di->has($id);
+    }
+
+    public function get($id) // : mixed
+    {
+        return $this->di->get($id);
+    }
+}

src/Container/ContainerPsr10000Interface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Gzhegow\Di\Container;
+
+use Gzhegow\Di\DiInterface;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+
+
+interface ContainerPsr10000Interface extends PsrContainerInterface
+{
+    public function getDi() : DiInterface;
+}

src/Container/ContainerPsrInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Gzhegow\Di\Container;
+
+use Gzhegow\Di\DiInterface;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+
+
+interface ContainerPsrInterface extends PsrContainerInterface
+{
+    public function getDi() : DiInterface;
+}