Cleanup

Message/Http/Request.php

@@ -106,6 +106,32 @@ class Request extends RequestAbstract
     public function init($uri = null)
     {
         if ($uri === null) {
+            $this->initCurrentRequest();
+        } else {
+            $this->initPseudoRequest($uri);
+        }
+
+        $this->data = array_change_key_case($this->data, CASE_LOWER);
+
+        $this->cleanupGlobals();
+
+        $this->path = explode('/', $this->uri->getPath());
+        $this->l11n->setLanguage($this->path[0]);
+        
+        $this->setupUriBuilder();
+        $this->createRequestHashs();
+    }
+
+    /**
+     * Init current request
+     *
+     * @return void
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private function initCurrentRequest() 
+    {
         $this->data = $_GET ?? [];
 
             if (isset($_SERVER['CONTENT_TYPE'])) {
@@ -124,26 +150,50 @@ class Request extends RequestAbstract
             }
 
             $this->uri->set(Http::getCurrent());
-        } else {
+    }
+
+    /**
+     * Init pseudo request
+     *
+     * @param mixed $uri Uri to handle as request
+     *
+     * @return void
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private function initPseudoRequest($uri)
+    {
         $this->setMethod($uri['type']);
         $this->uri->set($uri['uri']);
     }
 
-        $this->data = array_change_key_case($this->data, CASE_LOWER);
+    /**
-
+     * Setup uri builder based on current request
-        unset($_FILES);
+     *
-        unset($_GET);
+     * @return void
-        unset($_POST);
+     *
-        unset($_REQUEST);
+     * @since  1.0.0
-
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-        $this->path = explode('/', $this->uri->getPath());
+     */
-        $this->l11n->setLanguage($this->path[0]);
+    private function setupUriBuilder()
-        $this->hash = [];
+    {
-
         UriFactory::setQuery('/scheme', $this->uri->getScheme());
         UriFactory::setQuery('/host', $this->uri->getHost());
         UriFactory::setQuery('/lang', $this->l11n->getLanguage());
+    }
 
+    /**
+     * Create request hashs of current request
+     *
+     * @return void
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private function createRequestHashs()
+    {
+        $this->hash = [];
         foreach ($this->path as $key => $path) {
             $paths = [];
             for ($i = 1; $i < $key + 1; $i++) {
@@ -154,6 +204,22 @@ class Request extends RequestAbstract
         }
     }
 
+    /**
+     * Clean up globals that musn't be used any longer
+     *
+     * @return void
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private function cleanupGlobals() 
+    {
+        unset($_FILES);
+        unset($_GET);
+        unset($_POST);
+        unset($_REQUEST);
+    }
+
     /**
      * Is Mobile
      *

Message/RequestAbstract.php

@@ -32,7 +32,7 @@ use phpOMS\Uri\UriInterface;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-abstract class RequestAbstract implements RequestInterface
+abstract class RequestAbstract implements MessageInterface
 {
 
     /**
@@ -126,7 +126,12 @@ abstract class RequestAbstract implements RequestInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Get request uri.
+     *
+     * @return UriInterface
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function getUri() : UriInterface
     {
@@ -134,7 +139,12 @@ abstract class RequestAbstract implements RequestInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Set request uri.
+     *
+     * @param UriInterface $uri
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function setUri(UriInterface $uri)
     {
@@ -142,7 +152,12 @@ abstract class RequestAbstract implements RequestInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Get request hash.
+     *
+     * @return array
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function getHash() : array
     {
@@ -170,12 +185,22 @@ abstract class RequestAbstract implements RequestInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Get request method.
+     *
+     * @return string
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     abstract public function getMethod() : string;
 
     /**
-     * {@inheritdoc}
+     * Set request method.
+     *
+     * @param string $method
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function setMethod(string $method) {
         $this->method = $method;
@@ -273,4 +298,14 @@ abstract class RequestAbstract implements RequestInterface
     {
         return $this->uri->__toString();
     }
+
+    /**
+     * Get request target.
+     *
+     * @return string
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    abstract public function getRequestTarget() : string;
 }

Message/RequestInterface.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.0
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace phpOMS\Message;
-
-use phpOMS\Uri\UriInterface;
-
-/**
- * Http request interface.
- *
- * @category   Framework
- * @package    phpOMS\Response
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-interface RequestInterface extends MessageInterface
-{
-
-    /**
-     * Get request target.
-     *
-     * @return string
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function getRequestTarget() : string;
-
-    /**
-     * Get request method.
-     *
-     * @return string
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function getMethod() : string;
-
-    /**
-     * Set request method.
-     *
-     * @param string $method
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function setMethod(string $method);
-
-    /**
-     * Get request uri.
-     *
-     * @return UriInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function getUri() : UriInterface;
-
-    /**
-     * Set request uri.
-     *
-     * @param UriInterface $uri
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function setUri(UriInterface $uri);
-
-    /**
-     * Get request hash.
-     *
-     * @return array
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function getHash() : array;
-}

Message/ResponseAbstract.php

@@ -31,7 +31,7 @@ use phpOMS\Utils\ArrayUtils;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-abstract class ResponseAbstract implements ResponseInterface, ArrayableInterface, JsonableInterface
+abstract class ResponseAbstract implements MessageInterface, ArrayableInterface, JsonableInterface
 {
 
     /**
@@ -159,4 +159,16 @@ abstract class ResponseAbstract implements ResponseInterface, ArrayableInterface
     {
         return json_encode($this->toArray());
     }
+
+    /**
+     * Generate header automatically based on code.
+     *
+     * @param int $code HTTP status code
+     *
+     * @return void
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    abstract public function generateHeader(int $code);
 }

Message/ResponseInterface.php

@@ -1,43 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.0
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace phpOMS\Message;
-
-
-/**
- * Response interface.
- *
- * @category   Framework
- * @package    phpOMS\Response
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-interface ResponseInterface extends MessageInterface
-{
-    /**
-     * Generate header automatically based on code.
-     *
-     * @param int $code HTTP status code
-     *
-     * @return void
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public function generateHeader(int $code);
-}

Module/ModuleFactory.php

@@ -77,29 +77,10 @@ class ModuleFactory
         if (!isset(self::$loaded[$module])) {
             try {
                 $class = '\\Modules\\' . $module . '\\Controller';
-
-                /**
-                 * @var ModuleAbstract $obj
-                 */
                 $obj                   = new $class($app);
                 self::$loaded[$module] = $obj;
-
+                self::registerRequesting($obj);
-                /** Install providing for */
+                self::registerProvided($obj);
-                foreach ($obj->getProviding() as $providing) {
-                    if (isset(self::$loaded[$providing])) {
-                        self::$loaded[$providing]->addReceiving($obj->getName());
-                    } else {
-                        self::$providing[$providing][] = $obj->getName();
-                    }
-                }
-
-                /** Check if I get provided with */
-                $name = $obj->getName();
-                if (isset(self::$providing[$name])) {
-                    foreach (self::$providing[$name] as $providing) {
-                        self::$loaded[$name]->addReceiving($providing);
-                    }
-                }
             } catch(\Exception $e) {
                 self::$loaded[$module] = new NullModule($app);
             }
@@ -107,4 +88,41 @@ class ModuleFactory
 
         return self::$loaded[$module];
     }
+
+    /**
+     * Load modules this module is requesting from
+     *
+     * @param ModuleAbstract $obj Current module
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private static function registerRequesting(ModuleAbstract $obj)
+    {
+        foreach ($obj->getProviding() as $providing) {
+            if (isset(self::$loaded[$providing])) {
+                self::$loaded[$providing]->addReceiving($obj->getName());
+            } else {
+                self::$providing[$providing][] = $obj->getName();
+            }
+        }
+    }
+
+    /**
+     * Register modules this module is receiving from
+     *
+     * @param ModuleAbstract $obj Current module
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    private static function registerProvided(ModuleAbstract $obj)
+    {
+       $name = $obj->getName();
+       if (isset(self::$providing[$name])) {
+        foreach (self::$providing[$name] as $providing) {
+            self::$loaded[$name]->addReceiving($providing);
+        }
+    }
+}
 }

Module/ModuleManager.php

@@ -298,9 +298,8 @@ class ModuleManager
 
         $path = realpath($oldPath = self::MODULE_PATH . '/' . $module . '/' . 'info.json');
 
-        if ($path !== false) {
+        if($path === false || strpos($path, self::MODULE_PATH) === false) {
-            if (strpos($path, self::MODULE_PATH) === false) {
+            throw new PathException($module);
-                throw new PathException($oldPath);
         }
 
         $info = json_decode(file_get_contents($path), true);
@@ -368,7 +367,6 @@ class ModuleManager
             $this->installProviding($key, $module);
         }
     }
-    }
 
     /**
      * Get all installed modules.

Module/NullModule.php

@@ -15,7 +15,6 @@
  */
 namespace phpOMS\Module;
 
-
 /**
  * Module abstraction class.
  *

Utils/MultiMap.php

@@ -121,12 +121,14 @@ class MultiMap implements \Countable
      */
     private function garbageCollect()
     {
+        /* garbage collect keys */
         foreach ($this->keys as $key => $keyValue) {
             if (!isset($this->values[$keyValue])) {
                 unset($this->keys[$key]);
             }
         }
 
+        /* garbage collect values */
         foreach ($this->values as $valueKey => $value) {
             if (!in_array($valueKey, $this->keys)) {
                 unset($this->values[$valueKey]);
@@ -146,9 +148,40 @@ class MultiMap implements \Countable
      */
     public function get($key)
     {
-        if($this->keyType === KeyType::MULTIPLE) {
+        if($this->keyType === KeyType::SINGLE) {
-            return isset($this->keys[$key]) ? $this->values[$this->keys[$key]] ?? null : null;
+            return $this->getSingle($key);
         } else {
+            return $this->getMultiple($key);
+        }
+    }
+
+    /**
+     * Get data.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return mixed
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function getSingle($key) 
+    {
+        return isset($this->keys[$key]) ? $this->values[$this->keys[$key]] ?? null : null;
+    }
+
+    /**
+     * Get data.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return mixed
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function getMultiple($key) 
+    {
         if(is_array($key)) {
             if($this->orderType === OrderType::LOOSE) {
                 $keys = Permutation::permut($key);
@@ -167,7 +200,6 @@ class MultiMap implements \Countable
 
         return isset($this->keys[$key]) ? $this->values[$this->keys[$key]] ?? null : null;
     }
-    }
 
     /**
      * Set existing key with data.
@@ -183,6 +215,49 @@ class MultiMap implements \Countable
     public function set($key, $value) : bool
     {
         if($this->keyType === KeyType::MULTIPLE && is_array($key)) {
+            return $this->setMultiple($key, $value);
+        } else {
+            return $this->setSingle($key, $value);
+        }
+
+        return false;
+    }
+
+    /**
+     * Set existing key with data.
+     *
+     * @param mixed $key   Key used to identify value
+     * @param mixed $value Value to store
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function setSingle($key, $value) : bool
+    {
+        if (isset($this->keys[$key])) {
+            $this->values[$this->keys[$key]] = $value;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set existing key with data.
+     *
+     * @param mixed $key   Key used to identify value
+     * @param mixed $value Value to store
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function setMultiple($key, $value) : bool
+    {
         if($this->orderType !== OrderType::LOOSE) {
             $permutation = Permutation::permut($key);
 
@@ -194,13 +269,6 @@ class MultiMap implements \Countable
         } else {
             return $this->set(implode($key, ':'));
         }
-        } else {
-            if (isset($this->keys[$key])) {
-                $this->values[$this->keys[$key]] = $value;
-
-                return true;
-            }
-        }
 
         return false;
     }
@@ -218,6 +286,49 @@ class MultiMap implements \Countable
     public function remove($key) : bool
     {
         if($this->keyType === KeyType::MULTIPLE && is_array($key)) {
+            return $this->removeMultiple($key);
+        } else {
+            return $this->removeSingle($key);
+        }
+    }
+
+    /**
+     * Remove value and all sibling keys based on key.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function removeSingle($key) : bool
+    {
+        if (isset($this->keys[$key])) {
+            $id = $this->keys[$key];
+
+            unset($this->values[$id]);
+
+            $this->garbageCollect();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove value and all sibling keys based on key.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function removeMultiple($key) : bool
+    {
         if($this->orderType === OrderType::LOOSE) {
             $keys = Permutation::permut($key);
 
@@ -231,19 +342,6 @@ class MultiMap implements \Countable
         } else {
             return $this->remove(implode($key, ':'));
         }
-        } else {
-            if (isset($this->keys[$key])) {
-                $id = $this->keys[$key];
-
-                unset($this->values[$id]);
-
-                $this->garbageCollect();
-
-                return true;
-            }
-        }
-
-        return false;
     }
 
     /**
@@ -291,6 +389,51 @@ class MultiMap implements \Countable
     public function removeKey($key) : bool
     {
         if($this->keyType === KeyType::MULTIPLE && is_array($key)) {
+            return $this->removeKeyMultiple($key);
+        } else {
+            return $this->removeKeySingle($key);
+        }
+    }
+
+    /**
+     * Remove key.
+     *
+     * This only removes the value if no other key exists for this value.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function removeKeySingle($key) : bool 
+    {
+        if (isset($this->keys[$key])) {
+            unset($this->keys[$key]);
+
+            $this->garbageCollect();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove key.
+     *
+     * This only removes the value if no other key exists for this value.
+     *
+     * @param mixed $key Key used to identify value
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function removeKeyMultiple($key) : bool
+    {
         if($this->orderType === OrderType::LOOSE) {
             $keys = Permutation::permut($key);
 
@@ -304,17 +447,6 @@ class MultiMap implements \Countable
         } else {
             return $this->removeKey(implode($key, ':'));
         }
-        } else {
-            if (isset($this->keys[$key])) {
-                unset($this->keys[$key]);
-
-                $this->garbageCollect();
-
-                return true;
-            }
-        }
-
-        return false;
     }
 
     /**
@@ -329,16 +461,28 @@ class MultiMap implements \Countable
      */
     public function getSiblings($key) : array
     {
-        $siblings = [];
-
         if($this->keyType === KeyType::MULTIPLE) {
-            if($this->orderType === OrderType::LOOSE) {
+            return $this->getSiblingsMultiple($key);
-                return Permutation::permut($key);
-            } else {
-                return $siblings;
         }
+
+        return $this->getSiblingsSingle($key);
+
     }
 
+    /**
+     * Get all sibling keys.
+     *
+     * @param mixed $key Key to find siblings for
+     *
+     * @return array
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    private function getSiblingsSingle($key) : array
+    {
+        $siblings = [];
+
         if (isset($this->keys[$key])) {
             $id = $this->keys[$key];
 
@@ -348,8 +492,25 @@ class MultiMap implements \Countable
                 }
             }
         }
+    }
 
-        return $siblings;
+    /**
+     * Get all sibling keys.
+     *
+     * @param mixed $key Key to find siblings for
+     *
+     * @return array
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn
+     */
+    public function getSiblingsMultiple($key) : array
+    {
+        if($this->orderType === OrderType::LOOSE) {
+            return Permutation::permut($key);
+        } else {
+            return [];
+        }
     }
 
     /**

Utils/Permutation.php

@@ -10,7 +10,7 @@ class Permutation
         $permutations = [];
 
         if(empty($toPermute)){
-            $permutations[] = implode("", $result);
+            $permutations[] = implode('', $result);
         }else{
             foreach($toPermute as $key => $val){
                 $newArr = $toPermute;