Revert "Merge branch 'master' into master-yoda"

This reverts commit 0474e58, reversing
changes made to 537814b.

Author: schtr4jh

composer.json

@@ -20,8 +20,7 @@
     "fzaninotto/faker": "1.*",
     "filp/whoops": "2.*",
     "tgalopin/html-sanitizer": "dev-master",
-    "ezyang/htmlpurifier": "dev-master",
-    "ext-json": "*"
+    "ezyang/htmlpurifier": "dev-master"
   },
   "require-dev": {
     "maximebf/debugbar": "1.*",
@@ -53,14 +52,11 @@
       "vendor/bin/phpcs --extensions=php --warning-severity=8 --error-severity=1 --standard=PSR12 --parallel=2 -p src/",
       "vendor/bin/codecept run"
     ],
-    "applycsandpatch": [
-      "composer autofix && composer autopatch"
-    ],
     "autofix": [
       "vendor/bin/phpcs --extensions=php --report-diff=phpcs.diff --warning-severity=8 --error-severity=1 --standard=PSR12 --parallel=2 -p src/"
     ],
     "autopatch": [
-      "patch -p0 -ui phpcs.diff ; rm phpcs.diff"
+      "patch -p0 -ui phpcs.diff && rm phpcs.diff"
     ]
   },
   "scripts-descriptions": {

composer.lock

@@ -34,7 +34,7 @@ public function get($key = null, $default = null)
         if (strpos($key, '.')) {
             $keys = explode('.', $key);
 
-            return getDotted($this->data, $keys, 0, $default);
+            return getDotted($this->data, $keys);
         }
 
         return $default;

src/Pckg/Framework/Config.php

@@ -75,15 +75,15 @@ function app()
 }
 
 if (!function_exists('getDotted')) {
-    function getDotted($data, $keys, $i = 0, $default = null)
+    function getDotted($data, $keys, $i = 0)
     {
         if (!isset($keys[$i])) {
             return $data;
         } elseif (isset($data[$keys[$i]])) {
-            return getDotted($data[$keys[$i]], $keys, $i + 1, $default);
+            return getDotted($data[$keys[$i]], $keys, $i + 1);
         }
 
-        return $default;
+        return null;
     }
 }
 
@@ -455,7 +455,7 @@ function flash($key, $val)
      */
     function config($key = null, $default = null)
     {
-        $config = context()->getOrCreate(Config::class);
+        $config = context()->get(Config::class);
 
         if ($key) {
             return $config->get($key) ?? $default;

src/Pckg/Framework/Helper/functions.php

@@ -80,8 +80,7 @@ public function resolve($class)
 
         if (class_exists($class)) {
             if (in_array($class, static::$singletones)) {
-                $mockedClass = config('pckg.reflect.singletones.' . $class, $class);
-                $newInstance = Reflect::create($mockedClass);
+                $newInstance = Reflect::create($class);
 
                 context()->bind($class, $newInstance);
 

src/Pckg/Framework/Reflect/FrameworkResolver.php

@@ -5,11 +5,8 @@
 use Pckg\Concept\Reflect;
 use Pckg\Framework\Helper\Lazy;
 use Pckg\Framework\Request\Data\Cookie;
-use Pckg\Framework\Request\Data\Get;
 use Pckg\Framework\Request\Data\Post;
 use Pckg\Framework\Request\Data\Server;
-use Pckg\Framework\Request\Data\Session;
-use Pckg\Framework\Request\Data\Request as DataRequest;
 use Pckg\Framework\Request\Message;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -56,21 +53,55 @@ class Request extends Message implements RequestInterface, ServerRequestInterfac
      */
     protected $uri;
 
-    public function __construct()
+    public function __construct($input = [])
     {
         Reflect::method($this, 'initDependencies');
 
-        $this->server = (new Server())->setFromGlobals();
-        $this->request = (new DataRequest())->setFromGlobals();
-        $this->post = (new Post())->setFromGlobals();
-        $this->get = (new Get())->setFromGlobals();
-        $this->cookie = (new Cookie())->setFromGlobals();
-        $this->files = (new Lazy());
+        if (!$input) {
+            $input = file_get_contents('php://input');
+            if ($input && (strpos($input, '{') === 0 && strrpos($input, '}') === strlen($input) - 1)) {
+                $input = json_decode($input, true);
+            } elseif ($input) {
+                parse_str($input, $input);
+            } else {
+                $input = [];
+            }
+        }
+
+        if (!$input && $_POST) {
+            /**
+             * Why is php input sometimes empty?
+             */
+            $input = $_POST;
+        }
+
+        $this->setPost($input);
+        $this->get = new Lazy($_GET);
+        $this->server = new Server($_SERVER);
+        $this->files = new Lazy($_FILES);
+        $this->cookie = new Cookie($_COOKIE);
+        $this->request = new Lazy($_REQUEST);
+
+        $this->fetchUrl();
+
         $this->headers = collect(getallheaders())->groupBy(function ($value, $key) {
             return $key;
         })->all();
+    }
+
+    public function setConstructs($post, $get, $server, $files, $cookie, $request, $headers = [])
+    {
+        $this->setPost($post);
+        $this->get = new Lazy($get);
+        $this->server = new Lazy($server);
+        $this->files = new Lazy($files);
+        $this->cookie = new Cookie($cookie);
+        $this->request = new Lazy($request);
+        $this->headers = $headers;
 
         $this->fetchUrl();
+
+        return $this;
     }
 
     /**
@@ -155,77 +186,46 @@ public function post($key = null, $default = [])
         return $this->post->get($key, $default);
     }
 
-    /**
-     * @param $object
-     * @param null $key
-     * @param array $default
-     * @return Lazy|mixed
-     */
-    private function getOrFull($object, $key = null, $default = [])
-    {
-        return is_null($key)
-            ? $object
-            : $object->get($key, $default);
-    }
-
-    /**
-     * @param null $key
-     * @param array $default
-     * @return Get|mixed
-     */
     public function get($key = null, $default = [])
     {
-        return $this->getOrFull($this->get, $key, $default);
+        return is_null($key)
+            ? $this->get
+            : $this->get->get($key, $default);
     }
 
-    /**
-     * @param null $key
-     * @param array $default
-     * @return Server|mixed
-     */
     public function server($key = null, $default = [])
     {
-        return $this->getOrFull($this->server, $key, $default);
+        return is_null($key)
+            ? $this->server
+            : $this->server->get($key, $default);
     }
 
-    /**
-     * @param null $key
-     * @param array $default
-     * @return Cookie|mixed
-     */
     public function cookie($key = null, $default = [])
     {
-        return $this->getOrFull($this->cookie, $key, $default);
+        return is_null($key)
+            ? $this->cookie
+            : $this->cookie->get($key, $default);
     }
 
-    /**
-     * @param null $key
-     * @param array $default
-     * @return Session|mixed
-     */
     public function session($key = null, $default = [])
     {
-        return $this->getOrFull($this->session, $key, $default);
+        return is_null($key)
+            ? $this->session
+            : $this->session->get($key, $default);
     }
 
-    /**
-     * @param null $key
-     * @param array $default
-     * @return \Pckg\Htmlbuilder\Datasource\Method\Request|mixed
-     */
     public function request($key = null, $default = [])
     {
-        return $this->getOrFull($this->request, $key, $default);
+        return is_null($key)
+            ? $this->request
+            : $this->request->get($key, $default);
     }
 
-    /**
-     * @param null $key
-     * @param array $default
-     * @return Lazy|mixed
-     */
-    public function files($key = null, $default = [])
+    public function files($key = null)
     {
-        return $this->getOrFull($this->files, $key, $default);
+        return is_null($key)
+            ? $this->files
+            : $this->files->get($key);
     }
 
     public function isMethod($method)
@@ -530,7 +530,7 @@ public function withParsedBody($data)
      */
     public function getAttributes()
     {
-        return $this->post()->all();
+        return [];
     }
 
     /**
@@ -540,7 +540,6 @@ public function getAttributes()
      */
     public function getAttribute($name, $default = null)
     {
-        return $this->post()->get($name, $default);
         return $this->attributes[$name] ?? $default;
     }
 
@@ -551,8 +550,7 @@ public function getAttribute($name, $default = null)
      */
     public function withAttribute($name, $value)
     {
-        $this->post()->set($name, $value);
-        // $this->attributes[$name] = $value;
+        $this->attributes[$name] = $value;
 
         return $this;
     }
@@ -563,8 +561,7 @@ public function withAttribute($name, $value)
      */
     public function withoutAttribute($name)
     {
-        unset($this->post()[$name]);
-        //unset($this->attributes[$name]);
+        unset($this->attributes[$name]);
 
         return $this;
     }

src/Pckg/Framework/Request.php

@@ -13,11 +13,9 @@ class Cookie extends Lazy
     const DURATION_MONTH = 2592000;
 // 30 days
 
-    public function setFromGlobals()
+    public function __construct(array $arr = [])
     {
-        $this->setData($_COOKIE);
-
-        return $this;
+        parent::__construct($_COOKIE ?? $arr);
     }
 
     public function set($name, $value = '', $expiration = self::DURATION_MONTH, $path = '/', $domain = '')

src/Pckg/Framework/Request/Data/Cookie.php

@@ -7,10 +7,13 @@
 class Get extends Lazy
 {
 
-    public function setFromGlobals()
+    public function __construct($arr = [])
     {
-        $this->setData($_GET);
+        parent::__construct($_GET ?? $arr);
+    }
 
-        return $this;
+    public function __destruct()
+    {
+        $_GET = $this->data;
     }
 }

src/Pckg/Framework/Request/Data/Get.php

@@ -3,34 +3,17 @@
 namespace Pckg\Framework\Request\Data;
 
 use Pckg\Framework\Helper\Lazy;
-use Pckg\Framework\Request\Data\PostResolver\Globals;
-use Pckg\Framework\Request\Data\PostResolver\PostSource;
 
 class Post extends Lazy
 {
 
-    protected $source = Globals::class;
-
-    public function setSource(PostSource $postSource)
+    public function __construct($arr = [])
     {
-        $this->source = $postSource;
-
-        return $this;
+        parent::__construct($arr ?? $_POST);
     }
 
-    public function getSource()
+    public function __destruct()
     {
-        if (is_string($this->source)) {
-            $this->source = resolve($this->source);
-        }
-
-        return $this->source;
-    }
-
-    public function setFromGlobals()
-    {
-        $this->setData($this->getSource()->readFromSource());
-
-        return $this;
+        //$_POST = $this->data;
     }
 }