Skip to content

Исключения #12

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

Open
edim24 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Исключения #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac0c094
Update webmasterApi.php
edim24 Jan 18, 2017
94d79da
Add files via upload
edim24 Jan 18, 2017
a3d7677
Update webmasterApi.php
edim24 Feb 16, 2018
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
131 changes: 36 additions & 95 deletions src/webmasterApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,7 @@ class webmasterApi
*
* @var int
*/
public $userID = null;


/**
* Last error message
*
* @var string
*/
public $lastError = '';


/**
*
* User trigger errors
*
* Передавать ли возникающие ошибки в стандартный поток ошибок/
*
* @var boolean
*/
public $triggerError = true;
protected $userID = null;


/**
Expand All @@ -95,15 +76,17 @@ class webmasterApi
*
* @param $accessToken string access token from Yandex ouath serverh
*/
function __construct($accessToken)
function __construct($accessToken, $userId = null)
{
$this->accessToken = $accessToken;
$this->userID = $this->getUserID();
if (isset($this->userID->error_message)) {
$this->errorCritical($this->userID->error_message);
$this->userID = null;
}

if (is_null($userId)) {
$this->userID = $this->getUserID();
if (isset($this->userID->error_message)) {
throw new webmasterException($this->userID->error_message);
}
} else {
$this->userID = $userId;
}
}


Expand All @@ -119,9 +102,6 @@ function __construct($accessToken)
static function initApi($accessToken)
{
$wmApi = new self($accessToken);
if (!empty($wmApi->lastError)) {
return (object)array('error_message' => $wmApi->lastError);
}
return $wmApi;
}

Expand All @@ -139,7 +119,6 @@ public function getApiUrl($resource)
{
$apiurl = $this->apiUrl;
if ($resource !== '/user/') {
if (!$this->userID) return $this->errorCritical("Can't get hand " . $resource . " without userID");
$apiurl .= "/user/" . $this->userID;
}
return $apiurl . $resource;
Expand Down Expand Up @@ -192,15 +171,15 @@ protected function get($resource, $data = array())
$response = @file_get_contents($url, 0, $context);

} else {
return $this->errorCritical('CURL not installed & file_get_contents disabled');
throw new webmasterException('CURL not installed & file_get_contents disabled');
}


if (!$response) return $this->errorCritical('Error in curl when get [' . $url . '] ' . $curl_error);
if (!$response) throw new webmasterException('Error in curl when get [' . $url . '] ' . $curl_error);
$response = json_decode($response, false, 512, JSON_BIGINT_AS_STRING);


if (!is_object($response)) return $this->errorCritical('Unknown error in response: Not object given');
if (!is_object($response)) throw new webmasterException('Unknown error in response: Not object given');
return $response;
}

Expand Down Expand Up @@ -250,13 +229,13 @@ protected function post($resource, $data)
$response = @file_get_contents($url, 0, $context);

} else {
return $this->errorCritical('CURL not installed & file_get_contents disabled');
throw new webmasterException('CURL not installed & file_get_contents disabled');
}

if (!$response) return $this->errorCritical('Unknown error in curl');
if (!$response) throw new webmasterException('Unknown error in curl');
$response = json_decode($response);

if (!is_object($response)) return $this->errorCritical('Unknown error in curl');
if (!is_object($response)) throw new webmasterException('Unknown error in curl');
return $response;
}

Expand Down Expand Up @@ -312,13 +291,13 @@ protected function delete($resource, $data = array())

if (in_array('HTTP/1.1 204 No Content', $http_response_header)) return (object)array(true);
} else {
return $this->errorCritical('CURL not installed & file_get_contents disabled');
throw new webmasterException('CURL not installed & file_get_contents disabled');
}

if (!$response) return $this->errorCritical('Unknown error in curl');
if (!$response) throw new webmasterException('Unknown error in curl');
$response = json_decode($response);

if (!is_object($response)) return $this->errorCritical('Unknown error in curl');
if (!is_object($response)) throw new webmasterException('Unknown error in curl');
return $response;
}

Expand Down Expand Up @@ -362,52 +341,12 @@ private function dataToString($data)
$new_data[] = urlencode($param) . "=" . urlencode($value_item);
}
} else {
$this->errorWarning("Bad type of key " . $param . ". Value must be string or array");
continue;
throw new webmasterException("Bad type of key " . $param . ". Value must be string or array");
}
}
return implode("&", $new_data);
}


/**
* Save error message and return false
*
* @param $message string Text of message
* @param $json boolean return false as json error
*
* @return false|object
*/
private function errorCritical($message, $json = true)
{
$this->lastError = $message;
if ($json) {
if ($this->triggerError) trigger_error($message, E_USER_ERROR);
return (object)array('error_code' => 'CRITICAL_ERROR', 'error_message' => $message);
}
return false;
}


/**
* Save and log notice message and return false
*
* @param $message string Text of message
* @param $json boolean return false as json error
*
* @return false|object
*/
private function errorWarning($message, $json = true)
{
$this->lastError = $message;
if ($json) {
if ($this->triggerError) trigger_error($message, E_USER_NOTICE);
return (object)array('error_code' => 'CRITICAL_ERROR', 'error_message' => $message);
}
return false;
}


/**
* Get User ID for current access token
*
Expand All @@ -416,15 +355,21 @@ private function errorWarning($message, $json = true)
*
* @return int|false
*/
private function getUserID()
public function getUserID()
{
$ret = $this->get('/user/');
if (!isset($ret->user_id) || !intval($ret->user_id)) {
$mes = "Can't resolve USER ID";
if (isset($ret->error_message)) $mes .= ". " . $ret->error_message;
return $this->errorCritical($mes);
if (is_null($this->userID)) {
$ret = $this->get('/user/');
if (!isset($ret->user_id) || !intval($ret->user_id)) {
$mes = "Can't resolve USER ID";
if (isset($ret->error_message)) {
$mes .= ". " . $ret->error_message;
}
throw new webmasterException($mes);
}
return $ret->user_id;
} else {
return $this->userID;
}
return $ret->user_id;
}


Expand Down Expand Up @@ -667,9 +612,9 @@ public function getIndexingHistory($hostID, $indexing_indicators = array('DOWNLO
{
if (!$date_from) $date_from = time() - 1209600;
if (!$date_to) $date_to = time();
if (!intval($date_to) || !$date_to) return $this->errorCritical("Bad timestamp to \$date_to");
if (!intval($date_from) || !$date_from) return $this->errorCritical("Bad timestamp to \$date_from");
if ($date_to < $date_from) return $this->errorCritical("Date to can't be smaller then Date from");
if (!intval($date_to) || !$date_to) throw new webmasterException("Bad timestamp to \$date_to");
if (!intval($date_from) || !$date_from) throw new webmasterException("Bad timestamp to \$date_from");
if ($date_to < $date_from) throw new webmasterException("Date to can't be smaller then Date from");
$ret = $this->get('/hosts/' . $hostID . "/indexing-history/", array("indexing_indicator" => $indexing_indicators, 'date_from' => date(DATE_ISO8601, $date_from), 'date_to' => date(DATE_ISO8601, $date_to)));

return $ret;
Expand Down Expand Up @@ -849,7 +794,3 @@ static function getAccessToken($code, $client_id, $client_secret)
return $response;
}
}




6 changes: 6 additions & 0 deletions src/webmasterException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?php

namespace yandex\webmaster\api;

class webmasterException extends \Exception {
}