changed namespace

michel-pi · michel-pi · commit a441c00e4ac5 · 2019-11-11T16:51:08.000+01:00
diff --git a/src/Components/Endpoints/CosmeticsEndpoint.php b/src/Components/Endpoints/CosmeticsEndpoint.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Endpoints;
-
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Objects\Cosmetic;
-use MichelPi\FortniteApi\Components\Tasks\CosmeticArrayTask;
-use MichelPi\FortniteApi\Components\Tasks\CosmeticTask;
-use MichelPi\FortniteApi\FortniteApi;
-use MichelPi\FortniteApi\FortniteApiError;
+namespace FortniteApi\Components\Endpoints;
+
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Objects\Cosmetic;
+use FortniteApi\Components\Tasks\CosmeticArrayTask;
+use FortniteApi\Components\Tasks\CosmeticTask;
+use FortniteApi\FortniteApi;
+use FortniteApi\FortniteApiError;
 
 /**
  * Provides access to the /cosmetics/ endpoint
diff --git a/src/Components/Endpoints/NewsEndpoint.php b/src/Components/Endpoints/NewsEndpoint.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Endpoints;
+namespace FortniteApi\Components\Endpoints;
 
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Tasks\NewsEntryTask;
-use MichelPi\FortniteApi\Components\Tasks\NewsTask;
-use MichelPi\FortniteApi\FortniteApi;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Tasks\NewsEntryTask;
+use FortniteApi\Components\Tasks\NewsTask;
+use FortniteApi\FortniteApi;
+use FortniteApi\FortniteApiError;
 
 /**
  * Provides access to the /news/ endpoint.
diff --git a/src/Components/Endpoints/ShopEndpoint.php b/src/Components/Endpoints/ShopEndpoint.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Endpoints;
+namespace FortniteApi\Components\Endpoints;
 
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Tasks\ShopTask;
-use MichelPi\FortniteApi\FortniteApi;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Tasks\ShopTask;
+use FortniteApi\FortniteApi;
+use FortniteApi\FortniteApiError;
 
 /**
  * Provides access to the /shop/ endpoint.
diff --git a/src/Components/HttpClient.php b/src/Components/HttpClient.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components;
+namespace FortniteApi\Components;
 
 use GuzzleHttp\Client;
-use MichelPi\FortniteApi\Config\Config;
+use FortniteApi\Config\Config;
 
 class HttpClient
 {
diff --git a/src/Components/JsonSerializer.php b/src/Components/JsonSerializer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components;
+namespace FortniteApi\Components;
 
 class JsonSerializer
 {
diff --git a/src/Components/Objects/Cosmetic.php b/src/Components/Objects/Cosmetic.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class Cosmetic
 {
diff --git a/src/Components/Objects/Image.php b/src/Components/Objects/Image.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class Image
 {
diff --git a/src/Components/Objects/News.php b/src/Components/Objects/News.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class News
 {
diff --git a/src/Components/Objects/NewsEntry.php b/src/Components/Objects/NewsEntry.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class NewsEntry
 {
diff --git a/src/Components/Objects/NewsMessage.php b/src/Components/Objects/NewsMessage.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class NewsMessage
 {
diff --git a/src/Components/Objects/Option.php b/src/Components/Objects/Option.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class Option
 {
diff --git a/src/Components/Objects/Reflection/Activator.php b/src/Components/Objects/Reflection/Activator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects\Reflection;
+namespace FortniteApi\Components\Objects\Reflection;
 
-use MichelPi\FortniteApi\Components\JsonSerializer;
+use FortniteApi\Components\JsonSerializer;
 
 class Activator
 {
diff --git a/src/Components/Objects/Shop.php b/src/Components/Objects/Shop.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class Shop
 {
diff --git a/src/Components/Objects/ShopEntry.php b/src/Components/Objects/ShopEntry.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects;
 
 use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\Objects\Reflection\Activator;
 
 class ShopEntry
 {
diff --git a/src/Components/Objects/Variant.php b/src/Components/Objects/Variant.php
@@ -1,76 +1,79 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Objects;
+namespace FortniteApi\Components\Objects\Reflection;
 
-use Exception;
-use MichelPi\FortniteApi\Components\Objects\Reflection\Activator;
+use FortniteApi\Components\JsonSerializer;
 
-class Variant
+class Activator
 {
-    /**
-     * Undocumented variable
-     *
-     * @var Activator
-     */
-    private static $_activator;
-
-    /**
-     * Undocumented variable
-     *
-     * @var null|string
-     */
-    public $type;
-    /**
-     * Undocumented variable
-     *
-     * @var null|Option[]|array
-     */
-    public $options;
-
-    public static function createObject($body)
-    {
-        return self::getActivator()->createObjectFromBody($body);
-    }
+    private $activator;
+    private $initializer;
 
-    public static function createObjectArray($body)
+    public function __construct($activator, $initializer)
     {
-        return self::getActivator()->createArrayFromBody($body);
+        $this->activator = $activator;
+        $this->initializer = $initializer;
     }
 
-    /**
-     * Undocumented function
-     *
-     * @param Variant $obj
-     * @param array|mixed $body
-     * @return bool
-     */
-    private static function initializeObject(&$obj, &$body)
+    public function createObjectFromBody($body)
     {
-        try {
-            $obj->type = $body["type"];
-            $obj->options = Option::createObjectArray($body["options"]);
-            
-            return true;
-        } catch (Exception $ex) {
-            return false;
+        if (empty($body)) {
+            return null;
+        }
+
+        if (is_string($body)) {
+            $body = JsonSerializer::deserialize($body);
+
+            if ($body === false) {
+                return null;
+            }
+        }
+
+        if (array_key_exists("status", $body) && array_key_exists("data", $body)) {
+            $body = $body["data"];
+        }
+
+        $obj = call_user_func($this->activator);
+
+        if (call_user_func_array($this->initializer, array(&$obj, &$body))) {
+            return $obj;
+        } else {
+            return null;
         }
     }
 
-    /**
-     * Undocumented function
-     *
-     * @return Activator
-     */
-    private static function getActivator()
+    public function createArrayFromBody($body)
     {
-        if (empty(self::$_activator)) {
-            self::$_activator = new Activator(function () {
-                return new Variant();
-            }, function (&$obj, &$body) {
-                return self::initializeObject($obj, $body);
-            });
+        if (empty($body)) {
+            return null;
         }
 
-        return self::$_activator;
+        if (is_string($body)) {
+            $body = JsonSerializer::deserialize($body);
+
+            if ($body === false) {
+                return null;
+            }
+        }
+
+        if (array_key_exists("status", $body) && array_key_exists("data", $body)) {
+            $body = $body["data"];
+        }
+
+        $result = [];
+
+        foreach ($body as $item) {
+            $obj = call_user_func($this->activator);
+
+            if (call_user_func_array($this->initializer, array(&$obj, &$item))) {
+                $result[] = $obj;
+            }
+        }
+
+        if (count($result) == 0) {
+            return null;
+        } else {
+            return $result;
+        }
     }
 }
diff --git a/src/Components/Tasks/Awaitable.php b/src/Components/Tasks/Awaitable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Tasks;
+namespace FortniteApi\Components\Tasks;
 
 use GuzzleHttp\Promise\Promise;
 
diff --git a/src/Components/Tasks/CosmeticArrayTask.php b/src/Components/Tasks/CosmeticArrayTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Tasks;
+namespace FortniteApi\Components\Tasks;
 
 use Exception;
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Objects\Cosmetic;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Objects\Cosmetic;
+use FortniteApi\FortniteApiError;
 use Psr\Http\Message\ResponseInterface as Response;
 
 class CosmeticArrayTask extends Awaitable
diff --git a/src/Components/Tasks/CosmeticTask.php b/src/Components/Tasks/CosmeticTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Tasks;
+namespace FortniteApi\Components\Tasks;
 
 use Exception;
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Objects\Cosmetic;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Objects\Cosmetic;
+use FortniteApi\FortniteApiError;
 use Psr\Http\Message\ResponseInterface as Response;
 
 class CosmeticTask extends Awaitable
diff --git a/src/Components/Tasks/NewsEntryTask.php b/src/Components/Tasks/NewsEntryTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Tasks;
+namespace FortniteApi\Components\Tasks;
 
 use Exception;
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Objects\NewsEntry;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Objects\NewsEntry;
+use FortniteApi\FortniteApiError;
 use Psr\Http\Message\ResponseInterface as Response;
 
 class NewsEntryTask extends Awaitable
diff --git a/src/Components/Tasks/NewsTask.php b/src/Components/Tasks/NewsTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace MichelPi\FortniteApi\Components\Tasks;
+namespace FortniteApi\Components\Tasks;
 
 use Exception;
-use MichelPi\FortniteApi\Components\HttpClient;
-use MichelPi\FortniteApi\Components\Objects\News;
-use MichelPi\FortniteApi\FortniteApiError;
+use FortniteApi\Components\HttpClient;
+use FortniteApi\Components\Objects\News;
+use FortniteApi\FortniteApiError;
 use Psr\Http\Message\ResponseInterface as Response;
 
 class NewsTask extends Awaitable
diff --git a/src/Components/Tasks/ShopTask.php b/src/Components/Tasks/ShopTask.php
diff --git a/src/Config/Config.php b/src/Config/Config.php
diff --git a/src/FortniteApi.php b/src/FortniteApi.php
diff --git a/src/FortniteApiError.php b/src/FortniteApiError.php
diff --git a/test/index.php b/test/index.php

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace MichelPi\FortniteApi\Components;`
	`3`	`+namespace FortniteApi\Components;`
`4`	`4`
`5`	`5`	`use GuzzleHttp\Client;`
`6`		`-use MichelPi\FortniteApi\Config\Config;`
	`6`	`+use FortniteApi\Config\Config;`
`7`	`7`
`8`	`8`	`class HttpClient`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace MichelPi\FortniteApi\Components;`
	`3`	`+namespace FortniteApi\Components;`
`4`	`4`
`5`	`5`	`class JsonSerializer`
`6`	`6`	`{`