Data types

Author: Wazabii

Container.php

@@ -26,13 +26,13 @@ public function __call($method, $args)
 
     /**
      * Set a container OR factory
-     * @param string       $identifier        Uniq identifier
-     * @param mixed        $value     Example:
-     *                                TestClasses\Test::class,
-     *                                TestClasses\Test::class."::__construct",
-     *                                TestClasses\Test::class."::getStaticMethod",
-     * @param array|null   $args      Pass argumnets to constructor staticMethod if you choose.
-     * @param bool|boolean $overwrite Will throw exception if already been defined if not arg is set to TRUE.
+     * @param string       $identifier  Uniq identifier
+     * @param mixed        $value       Example:
+     *                                  TestClasses\Test::class,
+     *                                  TestClasses\Test::class."::__construct",
+     *                                  TestClasses\Test::class."::getStaticMethod",
+     * @param array|null   $args        Pass argumnets to constructor staticMethod if you choose.
+     * @param bool|boolean $overwrite   Will throw exception if already been defined if not arg is set to TRUE.
      */
     public function set(string $identifier, $value, ?array $args = null, bool $overwrite = false): ContainerInterface
     {
@@ -55,9 +55,9 @@ public function set(string $identifier, $value, ?array $args = null, bool $overw
      * @param  string       $identifier Uniq identifier
      * @param  callable     $factory
      * @param  bool|boolean $overwrite Will throw exception if already been defined if not arg is set to TRUE.
-     * @return void
+     * @return self
      */
-    public function factory(string $identifier, callable $factory, bool $overwrite = false): ContainerInterface
+    public function factory(string $identifier, callable $factory, bool $overwrite = false): self
     {
         if (!$overwrite && $this->has($identifier)) {
             if (!$this->isFactory($identifier)) {
@@ -94,7 +94,7 @@ public function has(string $identifier): bool
      */
     public function isFactory(string $identifier)
     {
-        return (bool)($this->getService($identifier) instanceof \Closure);
+        return ($this->getService($identifier) instanceof \Closure);
     }
 
     /**
@@ -104,7 +104,7 @@ public function isFactory(string $identifier)
      */
     public function isContainer($identifier)
     {
-        return (bool)(!$this->isFactory($identifier));
+        return (!$this->isFactory($identifier));
     }
 
     /**
@@ -113,21 +113,20 @@ public function isContainer($identifier)
      * @param  array $args Is possible to overwrite/add __construct or method argumnets
      * @return mixed
      */
-    public function get(string $identifier, array $args = [])
+    public function get(string $identifier, array $args = []): mixed
     {
         if ($service = $this->getService($identifier)) {
-            if (is_null($args)) {
+            if (count($args) === 0) {
                 $args = $this->getArgs($identifier);
             }
-
-            if (($service instanceof \Closure)) {
+            if ($this->isFactory($identifier)) {
                 $this->getter[$identifier] = $service(...$args);
             } else {
                 if (empty($this->getter[$identifier])) {
+                    /** @var string $service */
                     if (is_string($service)) {
-                        /** @var string $service */
                         $reflect = new Reflection($service);
-                        if (!is_null($args)) {
+                        if (count($args) > 0) {
                             $reflect->setArgs($args);
                         }
                         $this->getter[$identifier] = $reflect->get();
@@ -179,10 +178,10 @@ private function getService(string $identifier)
     /**
      * Get arguments
      * @param  string $identifier
-     * @return array|null
+     * @return array
      */
-    private function getArgs(string $identifier)
+    private function getArgs(string $identifier): array
     {
-        return ($this->args[$identifier] ?? null);
+        return ($this->args[$identifier] ?? []);
     }
 }

Interfaces/ContainerInterface.php

@@ -19,7 +19,7 @@ interface ContainerInterface
      *
      * @return mixed Entry.
      */
-    public function get(string $identifier);
+    public function get(string $identifier, array $args = []): mixed;
 
     /**
      * Returns true if the container can return an entry for the given identifier.
@@ -33,4 +33,17 @@ public function get(string $identifier);
      * @return bool
      */
     public function has(string $identifier): bool;
+
+
+    /**
+     * Set a container OR factory
+     * @param string       $identifier  Uniq identifier
+     * @param mixed        $value       Example:
+     *                                  TestClasses\Test::class,
+     *                                  TestClasses\Test::class."::__construct",
+     *                                  TestClasses\Test::class."::getStaticMethod",
+     * @param array|null   $args        Pass argumnets to constructor staticMethod if you choose.
+     * @param bool|boolean $overwrite   Will throw exception if already been defined if not arg is set to TRUE.
+     */
+    public function set(string $identifier, $value, ?array $args = null, bool $overwrite = false): ContainerInterface;
 }

Interfaces/FactoryInterface.php

@@ -10,13 +10,11 @@
 interface FactoryInterface
 {
     /**
-     * Add a single factory.
-     *
-     * @param string $identifier The id
-     * @param callable $factory The callable
-     * @param bool $factory The callable
-     * @param bool|boolean $overwrite Will throw exception if already been defined if not arg is set to TRUE.
-     * @return void
+     * Same as @set, BUT will only accept a factory
+     * @param  string       $identifier Uniq identifier
+     * @param  callable     $factory
+     * @param  bool|boolean $overwrite Will throw exception if already been defined if not arg is set to TRUE.
+     * @return self
      */
-    public function factory(string $identifier, callable $factory, bool $overwrite = false): ContainerInterface;
+    public function factory(string $identifier, callable $factory, bool $overwrite = false);
 }