Improve quallity

Author: wazabii8

Container.php

@@ -4,21 +4,24 @@
 
 namespace MaplePHP\Container;
 
+use Closure;
 use MaplePHP\Container\Interfaces\ContainerInterface;
 use MaplePHP\Container\Interfaces\FactoryInterface;
 use MaplePHP\DTO\Format\Arr;
-use MaplePHP\Container\Reflection;
+//use MaplePHP\Container\Reflection;
 use MaplePHP\Container\Exceptions\NotFoundException;
 use MaplePHP\Container\Exceptions\ContainerException;
+use ReflectionException;
 
 class Container implements ContainerInterface, FactoryInterface
 {
-    private $services = array();
-    private $args;
-    //private $overwrite;
-    private $getter = array();
-
+    private array $services = [];
+    private array $args = [];
+    private array $getter = [];
 
+    /**
+     * @throws ReflectionException
+     */
     public function __call($method, $args)
     {
         return $this->get($method, $args);
@@ -32,14 +35,14 @@ public function __call($method, $args)
      *                                  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 bool $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
     {
         if (!$overwrite && $this->has($identifier)) {
             $type = ($this->isFactory($identifier)) ? "factory" : "container";
-            throw new ContainerException("The {$type} ({$identifier}) has already been defined. If you want to overwrite " .
-                "the {$type} then set overwrite argument to true.", 1);
+            throw new ContainerException("The $type ($identifier) has already been defined. If you want to overwrite " .
+                "the $type then set overwrite argument to true.", 1);
         }
 
         if (isset($this->getter[$identifier])) {
@@ -54,18 +57,18 @@ public function set(string $identifier, $value, ?array $args = null, bool $overw
      * 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.
+     * @param  bool $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): self
     {
         if (!$overwrite && $this->has($identifier)) {
             if (!$this->isFactory($identifier)) {
-                throw new ContainerException("({$identifier}) Has already been defined, but has been defined as a " .
+                throw new ContainerException("($identifier) Has already been defined, but has been defined as a " .
                     "container and not factory. If you want to overwrite the container as factory then set " .
                     "overwrite argument to true.", 1);
             } else {
-                throw new ContainerException("The factory ({$identifier}) has already been defined. If you want to " .
+                throw new ContainerException("The factory ($identifier) has already been defined. If you want to " .
                     "overwrite the factory then set overwrite argument to true.", 1);
             }
         }
@@ -92,26 +95,27 @@ public function has(string $identifier): bool
      * @param  string  $identifier Uniq identifier
      * @return boolean
      */
-    public function isFactory(string $identifier)
+    public function isFactory(string $identifier): bool
     {
-        return ($this->getService($identifier) instanceof \Closure);
+        return ($this->getService($identifier) instanceof Closure);
     }
 
     /**
      * Check if is a container
-     * @param  string  $identifier Uniq identifier
+     * @param string $identifier Uniq identifier
      * @return boolean
      */
-    public function isContainer($identifier)
+    public function isContainer(string $identifier): bool
     {
         return (!$this->isFactory($identifier));
     }
 
     /**
      * Get a container or factory
-     * @param  string     $identifier   [description]
-     * @param  array $args Is possible to overwrite/add __construct or method argumnets
+     * @param string $identifier [description]
+     * @param array $args Is possible to overwrite/add __construct or method argumnets
      * @return mixed
+     * @throws ReflectionException
      */
     public function get(string $identifier, array $args = []): mixed
     {
@@ -136,22 +140,23 @@ public function get(string $identifier, array $args = []): mixed
             }
             return $this->getter[$identifier];
         } else {
-            throw new NotFoundException("Trying to get a container ({$identifier}) that does not exists", 1);
+            throw new NotFoundException("Trying to get a container ($identifier) that does not exists", 1);
         }
     }
 
 
     /**
      * Fetch is used to load multiple container and factories at once with the help of a wildcard search
+     * @param string $identifier
+     * @return      array
+     * @throws ReflectionException
      * @example     @set("event.session", \name\space\session::class)
      *              ->set("event.traverse", \name\space\traverse::class)
      *              ->fetch("event.*");
-     * @param       string $identifier
-     * @return      mixed
      */
-    public function fetch(string $identifier)
+    public function fetch(string $identifier): array
     {
-        if (strpos($identifier, "*") !== false) {
+        if (str_contains($identifier, "*")) {
             $arr = Arr::value($this->services)->wildcardSearch($identifier)->get();
             if (count($arr) > 0) {
                 $new = array();

EventHandler.php

@@ -4,12 +4,13 @@
 
 namespace MaplePHP\Container;
 
+use Exception;
 use MaplePHP\Container\Interfaces\EventInterface;
-use MaplePHP\Container\Reflection;
-use BadMethodCallException;
+use ReflectionException;
 
 /**
- * Create an event handler that will listent to a certain method in class
+ * Create an event handler that will listen to a certain method in class.
+ * Note: This will change to a valid PSR-14 event dispatcher library in the future.
  */
 class EventHandler
 {
@@ -21,7 +22,9 @@ class EventHandler
     /**
      * Add a class handler that you want to listen to
      * @param object|string $handler
+     * @param string|array|null $method
      * @return void
+     * @throws ReflectionException
      */
     public function addHandler(object|string $handler, string|array $method = null): void
     {
@@ -39,9 +42,11 @@ public function addHandler(object|string $handler, string|array $method = null):
 
     /**
      * Attach an event to a method that exist in handler
-     * @param string   $method
-     * @param callable $event
+     * @param callable|object|string $event
+     * @param string|null $bind
      * @return void
+     * @throws ReflectionException
+     * @throws Exception
      */
     public function addEvent(callable|object|string $event, ?string $bind = null): void
     {
@@ -53,7 +58,7 @@ public function addEvent(callable|object|string $event, ?string $bind = null): v
             }
 
             if(is_object($event) && !($event instanceof EventInterface)) {
-                throw new \Exception("Event object/class needs to be instance of \"EventInterface\"!", 1);
+                throw new Exception("Event object/class needs to be instance of \"EventInterface\"!", 1);
             }
         }
 
@@ -74,12 +79,12 @@ public function stopPropagation(bool $stopPropagate): void
         $this->stopPropagate = $stopPropagate;
     }
 
-
     /**
      * Release the listener
-     * @param  string $method
-     * @param  array  $args
+     * @param string $method
+     * @param array $args
      * @return mixed
+     * @throws Exception
      */
     public function __call(string $method, array $args): mixed
     {
@@ -108,10 +113,7 @@ public function __call(string $method, array $args): mixed
      */
     final protected function triggerEvents(): void
     {
-        if (is_null($this->event)) {
-            throw new \Exception("Event has not been initiated", 1);
-        }
-        foreach ($this->event as $key => $event) {
+        if (is_array($this->event)) foreach ($this->event as $key => $event) {
             if (is_array($event)) {
                 $select = key($event);
                 $this->getEvent($event[$select]);