Merge pull request #11 from exodus4d/develop

v1.2.4
exodus4d · Jun 8, 2018 · a9b7706 · a9b7706
2 parents dd066bc + e3879b5
commit a9b7706
Show file tree

Hide file tree

Showing 17 changed files with 640 additions and 130 deletions.
diff --git a/app/ApiInterface.php b/app/ApiInterface.php
@@ -26,144 +26,203 @@ public function getUserAgent();
     /**
      * @return array
      */
-    public function getServerStatus(): array;
+    public function getServerStatus() : array;
 
     /**
      * get corporation/alliance ids by characterIds
      * @param array $characterIds
      * @return array
      */
-    public function getCharacterAffiliationData(array $characterIds): array;
+    public function getCharacterAffiliationData(array $characterIds) : array;
 
     /**
      * @param int $characterId
      * @return array
      */
-    public function getCharacterData(int $characterId): array;
+    public function getCharacterData(int $characterId) : array;
 
     /**
      * @param int $characterId
      * @param string $accessToken
      * @param array $additionalOptions
      * @return array
      */
-    public function getCharacterLocationData(int $characterId, string $accessToken, array $additionalOptions = []): array;
+    public function getCharacterLocationData(int $characterId, string $accessToken, array $additionalOptions = []) : array;
 
     /**
      * @param int $characterId
      * @param string $accessToken
      * @param array $additionalOptions
      * @return array
      */
-    public function getCharacterShipData(int $characterId, string $accessToken, array $additionalOptions = []): array;
+    public function getCharacterShipData(int $characterId, string $accessToken, array $additionalOptions = []) : array;
 
     /**
      * @param int $characterId
      * @param string $accessToken
      * @param array $additionalOptions
      * @return array
      */
-    public function getCharacterOnlineData(int $characterId, string $accessToken, array $additionalOptions = []): array;
+    public function getCharacterOnlineData(int $characterId, string $accessToken, array $additionalOptions = []) : array;
 
     /**
      * @param int $corporationId
      * @return array
      */
-    public function getCorporationData(int $corporationId): array;
+    public function getCorporationData(int $corporationId) : array;
 
     /**
      * @param int $allianceId
      * @return array
      */
-    public function getAllianceData(int $allianceId): array;
+    public function getAllianceData(int $allianceId) : array;
 
     /**
-     * @param int $systemId
+     * @param int $corporationId
      * @param string $accessToken
-     * @param array $options
      * @return array
      */
-    public function setWaypoint(int $systemId, string $accessToken, array $options = []): array;
+    public function getCorporationRoles(int $corporationId, string $accessToken) : array;
 
     /**
-     * @param int $corporationId
-     * @param string $accessToken
      * @return array
      */
-    public function getCorporationRoles(int $corporationId, string $accessToken): array;
+    public function getUniverseRegions() : array;
 
     /**
+     * @param int $regionId
      * @return array
      */
-    public function getRegions(): array;
+    public function getUniverseRegionData(int $regionId) : array;
 
     /**
-     * @param int $regionId
      * @return array
      */
-    public function getRegionData(int $regionId): array;
+    public function getUniverseConstellations() : array;
 
     /**
+     * @param int $constellationId
      * @return array
      */
-    public function getConstellations(): array;
+    public function getUniverseConstellationData(int $constellationId) : array;
 
     /**
-     * @param int $constellationId
      * @return array
      */
-    public function getConstellationData(int $constellationId): array;
+    public function getUniverseSystems() : array;
+
+    /**
+     * @param int $systemId
+     * @return array
+     */
+    public function getUniverseSystemData(int $systemId) : array;
+
+    /**
+     * @param int $starId
+     * @return array
+     */
+    public function getUniverseStarData(int $starId) : array;
+
+    /**
+     * @param int $planetId
+     * @return array
+     */
+    public function getUniversePlanetData(int $planetId) : array;
+
+    /**
+     * @param int $stargateId
+     * @return array
+     */
+    public function getUniverseStargateData(int $stargateId) : array;
 
     /**
      * @param array $universeIds
      * @param array $additionalOptions
      * @return array
      */
-    public function getUniverseNamesData(array $universeIds, array $additionalOptions = []): array;
+    public function getUniverseNamesData(array $universeIds, array $additionalOptions = []) : array;
+
+    /**
+     * @return array
+     */
+    public function getUniverseJumps() : array;
+
+    /**
+     * @return array
+     */
+    public function getUniverseKills() : array;
+
+    /**
+     * @return array
+     */
+    public function getUniverseCategories() : array;
+
+    /**
+     * @param int $categoryId
+     * @return array
+     */
+    public function getUniverseCategoryData(int $categoryId) : array;
 
     /**
      * @return array
      */
-    public function getUniverseJumps(): array;
+    public function getUniverseGroups() : array;
 
     /**
+     * @param int $groupId
      * @return array
      */
-    public function getUniverseKills(): array;
+    public function getUniverseGroupData(int $groupId) : array;
 
     /**
      * @param int $structureId
      * @param string $accessToken
      * @param array $additionalOptions
      * @return array
      */
-    public function getUniverseStructureData(int $structureId, string $accessToken, array $additionalOptions = []): array;
+    public function getUniverseStructureData(int $structureId, string $accessToken, array $additionalOptions = []) : array;
 
     /**
      * @param int $typeId
      * @param array $additionalOptions
      * @return array
      */
-    public function getUniverseTypesData(int $typeId, array $additionalOptions = []): array;
+    public function getUniverseTypesData(int $typeId, array $additionalOptions = []) : array;
 
     /**
+     * @param int $sourceId
      * @param int $targetId
+     * @param array $options
+     * @return array
+     */
+    public function getRouteData(int $sourceId, int $targetId, array $options = []) : array;
+
+    /**
+     * @param int $systemId
      * @param string $accessToken
+     * @param array $options
      * @return array
      */
-    public function openWindow(int $targetId, string $accessToken): array;
-
+    public function setWaypoint(int $systemId, string $accessToken, array $options = []) : array;
+    
     /**
-     * @param int $sourceId
      * @param int $targetId
-     * @param array $options
+     * @param string $accessToken
      * @return array
      */
-    public function getRouteData(int $sourceId, int $targetId, array $options = []): array;
+    public function openWindow(int $targetId, string $accessToken) : array;
 
     /**
+     * @param array $categories
+     * @param string $search
+     * @param bool $strict
+     * @return array
+     */
+    public function search(array $categories, string $search, bool $strict = false) : array;
+
+        /**
      * @param int $corporationId
      * @return bool
      */
-    public function isNpcCorporation(int $corporationId): bool;
+    public function isNpcCorporation(int $corporationId) : bool;
 }
diff --git a/app/Config/ESIConf.php b/app/Config/ESIConf.php
@@ -64,8 +64,35 @@ class ESIConf extends \Prefab {
                     'GET' => '/v1/universe/constellations/'
                 ]
             ],
+            'systems' => [
+                'GET' => '/v4/universe/systems/{x}/',
+                'list' => [
+                    'GET' => '/v1/universe/systems/'
+                ]
+            ],
+            'stars' => [
+                'GET' => '/v1/universe/stars/{x}/'
+            ],
+            'planets' => [
+                'GET' => '/v1/universe/planets/{x}/'
+            ],
+            'stargates' => [
+                'GET' => '/v1/universe/stargates/{x}/'
+            ],
             'structures' => [
-                'GET' => '/v1/universe/structures/{x}/',
+                'GET' => '/v2/universe/structures/{x}/'
+            ],
+            'categories' => [
+                'GET' => '/v1/universe/categories/{x}/',
+                'list' => [
+                    'GET' => '/v1/universe/categories/'
+                ]
+            ],
+            'groups' => [
+                'GET' => '/v1/universe/groups/{x}/',
+                'list' => [
+                    'GET' => '/v1/universe/groups/'
+                ]
             ],
             'types' => [
                 'GET' => '/v3/universe/types/{x}/'
@@ -85,6 +112,9 @@ class ESIConf extends \Prefab {
                     'POST' => '/v1/ui/openwindow/information/'
                 ]
             ]
+        ],
+        'search' => [
+            'GET' => '/v2/search/'
         ]
     ];