Skip to content

Mogboard #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2019
Merged

Mogboard #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
265a2f3
Add support for new market endpoints
vekien Mar 4, 2019
f665890
Update composer
vekien Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,10 @@ $option = isset($argv[1]) ? trim($argv[1]) : false;
$arg1 = isset($argv[2]) ? trim($argv[2]) : false;

// setup xivapi
$api = new \XIVAPI\XIVAPI();
$api = new \XIVAPI\XIVAPI(\XIVAPI\XIVAPI::STAGING);
$api->environment->key('');

// using concurrent
use GuzzleHttp\Promise;
$results = $api->market->getDataCenter('chaos', 3);

$promises = [
'item1' => $api->async()->content->Item()->one(1675),
'item2' => $api->async()->content->Item()->one(5),
'item3' => $api->async()->content->Item()->one(2546),
];

$results = Promise\settle($promises)->wait();
$items = $api->unwrap($results);

print_r( $items->item1->Name . PHP_EOL);
print_r( $items->item2->Name . PHP_EOL);
print_r( $items->item3->Name . PHP_EOL);
print_r($results);
die;
27 changes: 27 additions & 0 deletions cli_async
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env php
<?php
// composer auto loader
require __DIR__ . '/vendor/autoload.php';

$option = isset($argv[1]) ? trim($argv[1]) : false;
$arg1 = isset($argv[2]) ? trim($argv[2]) : false;

// setup xivapi
$api = new \XIVAPI\XIVAPI();
$api->environment->key('');

// using concurrent
use GuzzleHttp\Promise;

$promises = [
'item1' => $api->async()->content->Item()->one(1675),
'item2' => $api->async()->content->Item()->one(5),
'item3' => $api->async()->content->Item()->one(2546),
];

$results = Promise\settle($promises)->wait();
$items = $api->unwrap($results);

print_r( $items->item1->Name . PHP_EOL);
print_r( $items->item2->Name . PHP_EOL);
print_r( $items->item3->Name . PHP_EOL);
4 changes: 2 additions & 2 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 13 additions & 25 deletions src/XIVAPI/Api/Market.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,31 @@

class Market
{
public function get(string $server, int $itemId)
public function getServer(string $server, int $itemId)
{
return Guzzle::get("/market/{$server}/item/{$itemId}");
}

/**
* @deprecated - use "get"
*/
public function price(string $server, int $itemId)
public function getServers(array $servers, int $itemId)
{
return Guzzle::get("/market/{$server}/items/{$itemId}");
return Guzzle::get("/market/item/{$itemId}", [
RequestOptions::QUERY => [
'servers' => implode(',', $servers)
]
]);
}

/**
* @deprecated - use "get"
*/
public function history(string $server, int $itemId)
{
return Guzzle::get("/market/{$server}/items/{$itemId}/history");
}

public function stock(string $server, int $categoryId)
public function getDataCenter(string $dc, int $itemId)
{
return Guzzle::get("/market/{$server}/category/{$categoryId}");
return Guzzle::get("/market/item/{$itemId}", [
RequestOptions::QUERY => [
'dc' => $dc
]
]);
}

public function categories()
{
return Guzzle::get("/market/categories");
}

public function tokens($password)
{
return Guzzle::get("/companion/tokens", [
RequestOptions::QUERY => [
'password' => $password
]
]);
}
}