ggoffy / wggithub

class/Github/OAuth/Token.php

Indentation +92 added lines, -92 removed lines

@@ -12,97 +12,97 @@
  */
 class Token extends Github\Sanity
 {
-	/** @var string */
-	private $value;
-
-	/** @var string */
-	private $type;
-
-	/** @var string[] */
-	private $scopes;
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @param  string[]
-	 */
-	public function __construct($value, $type = '', array $scopes = [])
-	{
-		$this->value = $value;
-		$this->type = $type;
-		$this->scopes = $scopes;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-
-	/**
-	 * @return string[]
-	 */
-	public function getScopes()
-	{
-		return $this->scopes;
-	}
-
-
-	/**
-	 * @see https://developer.github.com/v3/oauth/#scopes
-	 *
-	 * @param  string
-	 * @return bool
-	 */
-	public function hasScope($scope)
-	{
-		if (in_array($scope, $this->scopes, TRUE)) {
-			return TRUE;
-		}
-
-		static $superiors = [
-			'user:email' => 'user',
-			'user:follow' => 'user',
-			'notifications' => 'repo',
-		];
-
-		if (array_key_exists($scope, $superiors) && in_array($superiors[$scope], $this->scopes, TRUE)) {
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-
-	/** @internal */
-	public function toArray()
-	{
-		return [
-			'value' => $this->value,
-			'type' => $this->type,
-			'scopes' => $this->scopes,
-		];
-	}
-
-
-	/** @internal */
-	public static function createFromArray(array $data)
-	{
-		return new static($data['value'], $data['type'], $data['scopes']);
-	}
+    /** @var string */
+    private $value;
+
+    /** @var string */
+    private $type;
+
+    /** @var string[] */
+    private $scopes;
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @param  string[]
+     */
+    public function __construct($value, $type = '', array $scopes = [])
+    {
+        $this->value = $value;
+        $this->type = $type;
+        $this->scopes = $scopes;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+
+    /**
+     * @return string[]
+     */
+    public function getScopes()
+    {
+        return $this->scopes;
+    }
+
+
+    /**
+     * @see https://developer.github.com/v3/oauth/#scopes
+     *
+     * @param  string
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        if (in_array($scope, $this->scopes, TRUE)) {
+            return TRUE;
+        }
+
+        static $superiors = [
+            'user:email' => 'user',
+            'user:follow' => 'user',
+            'notifications' => 'repo',
+        ];
+
+        if (array_key_exists($scope, $superiors) && in_array($superiors[$scope], $this->scopes, TRUE)) {
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
+
+    /** @internal */
+    public function toArray()
+    {
+        return [
+            'value' => $this->value,
+            'type' => $this->type,
+            'scopes' => $this->scopes,
+        ];
+    }
+
+
+    /** @internal */
+    public static function createFromArray(array $data)
+    {
+        return new static($data['value'], $data['type'], $data['scopes']);
+    }
 
 }

class/Github/OAuth/Configuration.php

Indentation +27 added lines, -27 removed lines

@@ -12,35 +12,35 @@
  */
 class Configuration extends Github\Sanity
 {
-	/** @var string */
-	public $clientId;
-
-	/** @var string */
-	public $clientSecret;
-
-	/** @var string[] */
-	public $scopes;
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @param  string[]
-	 */
-	public function __construct($clientId, $clientSecret, array $scopes = [])
-	{
-		$this->clientId = $clientId;
-		$this->clientSecret = $clientSecret;
-		$this->scopes = $scopes;
+    /** @var string */
+    public $clientId;
+
+    /** @var string */
+    public $clientSecret;
+
+    /** @var string[] */
+    public $scopes;
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @param  string[]
+     */
+    public function __construct($clientId, $clientSecret, array $scopes = [])
+    {
+        $this->clientId = $clientId;
+        $this->clientSecret = $clientSecret;
+        $this->scopes = $scopes;
     }
 
 
-	/**
-	 * @return Configuration
-	 */
-	public static function fromArray(array $conf)
-	{
-		return new static($conf['clientId'], $conf['clientSecret'], isset($conf['scopes']) ? $conf['scopes'] : []);
-	}
+    /**
+     * @return Configuration
+     */
+    public static function fromArray(array $conf)
+    {
+        return new static($conf['clientId'], $conf['clientSecret'], isset($conf['scopes']) ? $conf['scopes'] : []);
+    }
 
 }

class/Github/OAuth/Login.php

Indentation +153 added lines, -153 removed lines

@@ -14,158 +14,158 @@
  */
 class Login extends Github\Sanity
 {
-	/** @var string */
-	private $authUrl = 'https://github.com/login/oauth/authorize';
-
-	/** @var string */
-	private $tokenUrl = 'https://github.com/login/oauth/access_token';
-
-	/** @var Configuration */
-	private $conf;
-
-	/** @var Storages\ISessionStorage */
-	private $storage;
-
-	/** @var Http\IClient */
-	private $client;
-
-
-	public function __construct(Configuration $conf, Storages\ISessionStorage $storage = NULL, Http\IClient $client = NULL)
-	{
-		$this->conf = $conf;
-		$this->storage = $storage ?: new Storages\SessionStorage;
-		$this->client = $client ?: Github\Helpers::createDefaultClient();
-	}
-
-
-	/**
-	 * @return Http\IClient
-	 */
-	public function getClient()
-	{
-		return $this->client;
-	}
-
-
-	/**
-	 * @param  string  URL to redirect back from Github when user approves the permissions request
-	 * @param  callable function($githubUrl)  makes HTTP redirect to Github
-	 */
-	public function askPermissions($backUrl, $redirectCb = NULL)
-	{
-		/** @todo Something more safe? */
-		$state = sha1(uniqid(microtime(TRUE), TRUE));
-		$params = [
-			'client_id' => $this->conf->clientId,
-			'redirect_uri' => $backUrl,
-			'scope' => implode(',', $this->conf->scopes),
-			'state' => $state,
-		];
-
-		$this->storage->set('auth.state', $state);
-
-		$url = $this->authUrl . '?' . http_build_query($params);
-		if ($redirectCb === NULL) {
-			header("Location: $url");
-			die();
-		} else {
-			call_user_func($redirectCb, $url);
-		}
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @return Token
-	 *
-	 * @throws LoginException
-	 */
-	public function obtainToken($code, $state)
-	{
-		if ($state !== $this->storage->get('auth.state')) {
-			throw new LoginException('OAuth security state does not match.');
-		}
-
-		$params = [
-			'client_id' => $this->conf->clientId,
-			'client_secret' => $this->conf->clientSecret,
-			'code' => $code,
-		];
-
-		$headers = [
-			'Accept' => 'application/json',
-			'Content-Type' => 'application/x-www-form-urlencoded',
-		];
-
-		$request = new Http\Request(Http\Request::POST, $this->tokenUrl, $headers, http_build_query($params));
-		try {
-			$response = $this->client->request($request);
-		} catch (Http\BadResponseException $e) {
-			throw new LoginException('HTTP request failed.', 0, $e);
-		}
-
-		try {
-			/** @var $json \stdClass */
-			if ($response->isCode(Http\Response::S404_NOT_FOUND)) {
-				$json = Github\Helpers::jsonDecode($response->getContent());
-				throw new LoginException($json->error, $response->getCode());
-
-			} elseif (!$response->isCode(Http\Response::S200_OK)) {
-				throw new LoginException('Unexpected response.', $response->getCode());
-			}
-
-			$json = Github\Helpers::jsonDecode($response->getContent());
-
-		} catch (Github\JsonException $e) {
-			throw new LoginException('Bad JSON in response.', 0, $e);
-		}
-
-		$token = new Token($json->access_token, $json->token_type, strlen($json->scope) ? explode(',', $json->scope) : []);
-		$this->storage->set('auth.token', $token->toArray());
-		$this->storage->remove('auth.state');
-
-		return $token;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function hasToken()
-	{
-		return $this->storage->get('auth.token') !== NULL;
-	}
-
-
-	/**
-	 * @return Token
-	 *
-	 * @throws Github\LogicException  when token has not been obtained yet
-	 */
-	public function getToken()
-	{
-		$token = $this->storage->get('auth.token');
-		if ($token === NULL) {
-			throw new Github\LogicException('Token has not been obtained yet.');
-
-		} elseif ($token instanceof Token) {
-			/** @deprecated */
-			$token = $token->toArray();
-			$this->storage->set('auth.token', $token);
-		}
-
-		return Token::createFromArray($token);
-	}
-
-
-	/**
-	 * @return self
-	 */
-	public function dropToken()
-	{
-		$this->storage->remove('auth.token');
-		return $this;
-	}
+    /** @var string */
+    private $authUrl = 'https://github.com/login/oauth/authorize';
+
+    /** @var string */
+    private $tokenUrl = 'https://github.com/login/oauth/access_token';
+
+    /** @var Configuration */
+    private $conf;
+
+    /** @var Storages\ISessionStorage */
+    private $storage;
+
+    /** @var Http\IClient */
+    private $client;
+
+
+    public function __construct(Configuration $conf, Storages\ISessionStorage $storage = NULL, Http\IClient $client = NULL)
+    {
+        $this->conf = $conf;
+        $this->storage = $storage ?: new Storages\SessionStorage;
+        $this->client = $client ?: Github\Helpers::createDefaultClient();
+    }
+
+
+    /**
+     * @return Http\IClient
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+
+    /**
+     * @param  string  URL to redirect back from Github when user approves the permissions request
+     * @param  callable function($githubUrl)  makes HTTP redirect to Github
+     */
+    public function askPermissions($backUrl, $redirectCb = NULL)
+    {
+        /** @todo Something more safe? */
+        $state = sha1(uniqid(microtime(TRUE), TRUE));
+        $params = [
+            'client_id' => $this->conf->clientId,
+            'redirect_uri' => $backUrl,
+            'scope' => implode(',', $this->conf->scopes),
+            'state' => $state,
+        ];
+
+        $this->storage->set('auth.state', $state);
+
+        $url = $this->authUrl . '?' . http_build_query($params);
+        if ($redirectCb === NULL) {
+            header("Location: $url");
+            die();
+        } else {
+            call_user_func($redirectCb, $url);
+        }
+    }
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @return Token
+     *
+     * @throws LoginException
+     */
+    public function obtainToken($code, $state)
+    {
+        if ($state !== $this->storage->get('auth.state')) {
+            throw new LoginException('OAuth security state does not match.');
+        }
+
+        $params = [
+            'client_id' => $this->conf->clientId,
+            'client_secret' => $this->conf->clientSecret,
+            'code' => $code,
+        ];
+
+        $headers = [
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/x-www-form-urlencoded',
+        ];
+
+        $request = new Http\Request(Http\Request::POST, $this->tokenUrl, $headers, http_build_query($params));
+        try {
+            $response = $this->client->request($request);
+        } catch (Http\BadResponseException $e) {
+            throw new LoginException('HTTP request failed.', 0, $e);
+        }
+
+        try {
+            /** @var $json \stdClass */
+            if ($response->isCode(Http\Response::S404_NOT_FOUND)) {
+                $json = Github\Helpers::jsonDecode($response->getContent());
+                throw new LoginException($json->error, $response->getCode());
+
+            } elseif (!$response->isCode(Http\Response::S200_OK)) {
+                throw new LoginException('Unexpected response.', $response->getCode());
+            }
+
+            $json = Github\Helpers::jsonDecode($response->getContent());
+
+        } catch (Github\JsonException $e) {
+            throw new LoginException('Bad JSON in response.', 0, $e);
+        }
+
+        $token = new Token($json->access_token, $json->token_type, strlen($json->scope) ? explode(',', $json->scope) : []);
+        $this->storage->set('auth.token', $token->toArray());
+        $this->storage->remove('auth.state');
+
+        return $token;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function hasToken()
+    {
+        return $this->storage->get('auth.token') !== NULL;
+    }
+
+
+    /**
+     * @return Token
+     *
+     * @throws Github\LogicException  when token has not been obtained yet
+     */
+    public function getToken()
+    {
+        $token = $this->storage->get('auth.token');
+        if ($token === NULL) {
+            throw new Github\LogicException('Token has not been obtained yet.');
+
+        } elseif ($token instanceof Token) {
+            /** @deprecated */
+            $token = $token->toArray();
+            $this->storage->set('auth.token', $token);
+        }
+
+        return Token::createFromArray($token);
+    }
+
+
+    /**
+     * @return self
+     */
+    public function dropToken()
+    {
+        $this->storage->remove('auth.token');
+        return $this;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 		$this->storage->set('auth.state', $state);
 
-		$url = $this->authUrl . '?' . http_build_query($params);
+		$url = $this->authUrl.'?'.http_build_query($params);
 		if ($redirectCb === NULL) {
 			header("Location: $url");
 			die();

class/Github/Storages/FileCache.php

Indentation +81 added lines, -81 removed lines

@@ -12,86 +12,86 @@
  */
 class FileCache extends Github\Sanity implements ICache
 {
-	/** @var string */
-	private $dir;
-
-
-	/**
-	 * @param  string  temporary directory
-	 *
-	 * @throws MissingDirectoryException
-	 */
-	public function __construct($tempDir)
-	{
-		if (!is_dir($tempDir)) {
-			throw new MissingDirectoryException("Directory '$tempDir' is missing.");
-		}
-
-		$dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
-
-		if (!is_dir($dir)) {
-			set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
-				restore_error_handler();
-				if (!is_dir($dir)) {
-					throw new MissingDirectoryException("Cannot create '$dir' directory.", 0, new \ErrorException($message, 0, $severity, $file, $line));
-				}
-			});
-			mkdir($dir);
-			restore_error_handler();
-		}
-
-		$this->dir = $dir;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return mixed  stored value
-	 */
-	public function save($key, $value)
-	{
-		file_put_contents(
-			$this->filePath($key),
-			serialize($value),
-			LOCK_EX
-		);
-
-		return $value;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return mixed|NULL
-	 */
-	public function load($key)
-	{
-		$path = $this->filePath($key);
-		if (is_file($path) && ($fd = fopen($path, 'rb')) && flock($fd, LOCK_SH)) {
-			$cached = stream_get_contents($fd);
-			flock($fd, LOCK_UN);
-			fclose($fd);
-
-			$success = TRUE;
-			set_error_handler(function() use (& $success) { return $success = FALSE; }, E_NOTICE);
-			$cached = unserialize($cached);
-			restore_error_handler();
-
-			if ($success) {
-				return $cached;
-			}
-		}
-	}
-
-
-	/**
-	 * @param  string
-	 * @return string
-	 */
-	private function filePath($key)
-	{
-		return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
-	}
+    /** @var string */
+    private $dir;
+
+
+    /**
+     * @param  string  temporary directory
+     *
+     * @throws MissingDirectoryException
+     */
+    public function __construct($tempDir)
+    {
+        if (!is_dir($tempDir)) {
+            throw new MissingDirectoryException("Directory '$tempDir' is missing.");
+        }
+
+        $dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
+
+        if (!is_dir($dir)) {
+            set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
+                restore_error_handler();
+                if (!is_dir($dir)) {
+                    throw new MissingDirectoryException("Cannot create '$dir' directory.", 0, new \ErrorException($message, 0, $severity, $file, $line));
+                }
+            });
+            mkdir($dir);
+            restore_error_handler();
+        }
+
+        $this->dir = $dir;
+    }
+
+
+    /**
+     * @param  string
+     * @param  mixed
+     * @return mixed  stored value
+     */
+    public function save($key, $value)
+    {
+        file_put_contents(
+            $this->filePath($key),
+            serialize($value),
+            LOCK_EX
+        );
+
+        return $value;
+    }
+
+
+    /**
+     * @param  string
+     * @return mixed|NULL
+     */
+    public function load($key)
+    {
+        $path = $this->filePath($key);
+        if (is_file($path) && ($fd = fopen($path, 'rb')) && flock($fd, LOCK_SH)) {
+            $cached = stream_get_contents($fd);
+            flock($fd, LOCK_UN);
+            fclose($fd);
+
+            $success = TRUE;
+            set_error_handler(function() use (& $success) { return $success = FALSE; }, E_NOTICE);
+            $cached = unserialize($cached);
+            restore_error_handler();
+
+            if ($success) {
+                return $cached;
+            }
+        }
+    }
+
+
+    /**
+     * @param  string
+     * @return string
+     */
+    private function filePath($key)
+    {
+        return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 			throw new MissingDirectoryException("Directory '$tempDir' is missing.");
 		}
 
-		$dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
+		$dir = $tempDir.DIRECTORY_SEPARATOR.'milo.github-api';
 
 		if (!is_dir($dir)) {
 			set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
@@ -91,7 +91,7 @@ 
 	 */
 	private function filePath($key)
 	{
-		return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
+		return $this->dir.DIRECTORY_SEPARATOR.sha1($key).'.php';
 	}
 
 }

class/Github/Storages/ICache.php

Indentation +11 added lines, -11 removed lines

@@ -5,18 +5,18 @@
 
 interface ICache
 {
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return mixed  stored value
-	 */
-	function save($key, $value);
+    /**
+     * @param  string
+     * @param  mixed
+     * @return mixed  stored value
+     */
+    function save($key, $value);
 
 
-	/**
-	 * @param  string
-	 * @return mixed|NULL
-	 */
-	function load($key);
+    /**
+     * @param  string
+     * @return mixed|NULL
+     */
+    function load($key);
 
 }

class/Github/Storages/ISessionStorage.php

Indentation +20 added lines, -20 removed lines

@@ -8,25 +8,25 @@
  */
 interface ISessionStorage
 {
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return self
-	 */
-	function set($name, $value);
-
-
-	/**
-	 * @param  string
-	 * @return mixed
-	 */
-	function get($name);
-
-
-	/**
-	 * @param  string
-	 * @return self
-	 */
-	function remove($name);
+    /**
+     * @param  string
+     * @param  mixed
+     * @return self
+     */
+    function set($name, $value);
+
+
+    /**
+     * @param  string
+     * @return mixed
+     */
+    function get($name);
+
+
+    /**
+     * @param  string
+     * @return self
+     */
+    function remove($name);
 
 }

class/Github/Storages/SessionStorage.php

Indentation +70 added lines, -70 removed lines

@@ -12,75 +12,75 @@
  */
 class SessionStorage extends Github\Sanity implements ISessionStorage
 {
-	const SESSION_KEY = 'milo.github-api';
-
-	/** @var string */
-	private $sessionKey;
-
-
-	/**
-	 * @param  string
-	 */
-	public function __construct($sessionKey = self::SESSION_KEY)
-	{
-		$this->sessionKey = $sessionKey;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return self
-	 */
-	public function set($name, $value)
-	{
-		if ($value === NULL) {
-			return $this->remove($name);
-		}
-
-		$this->check(__METHOD__);
-		$_SESSION[$this->sessionKey][$name] = $value;
-
-		return $this;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return mixed
-	 */
-	public function get($name)
-	{
-		$this->check(__METHOD__);
-
-		return isset($_SESSION[$this->sessionKey][$name])
-			? $_SESSION[$this->sessionKey][$name]
-			: NULL;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return self
-	 */
-	public function remove($name)
-	{
-		$this->check(__METHOD__);
-
-		unset($_SESSION[$this->sessionKey][$name]);
-
-		return $this;
-	}
-
-
-	/**
-	 * @param  string
-	 */
-	private function check($method)
-	{
-		if (!isset($_SESSION)) {
-			trigger_error("Start session before using $method().", E_USER_WARNING);
-		}
-	}
+    const SESSION_KEY = 'milo.github-api';
+
+    /** @var string */
+    private $sessionKey;
+
+
+    /**
+     * @param  string
+     */
+    public function __construct($sessionKey = self::SESSION_KEY)
+    {
+        $this->sessionKey = $sessionKey;
+    }
+
+
+    /**
+     * @param  string
+     * @param  mixed
+     * @return self
+     */
+    public function set($name, $value)
+    {
+        if ($value === NULL) {
+            return $this->remove($name);
+        }
+
+        $this->check(__METHOD__);
+        $_SESSION[$this->sessionKey][$name] = $value;
+
+        return $this;
+    }
+
+
+    /**
+     * @param  string
+     * @return mixed
+     */
+    public function get($name)
+    {
+        $this->check(__METHOD__);
+
+        return isset($_SESSION[$this->sessionKey][$name])
+            ? $_SESSION[$this->sessionKey][$name]
+            : NULL;
+    }
+
+
+    /**
+     * @param  string
+     * @return self
+     */
+    public function remove($name)
+    {
+        $this->check(__METHOD__);
+
+        unset($_SESSION[$this->sessionKey][$name]);
+
+        return $this;
+    }
+
+
+    /**
+     * @param  string
+     */
+    private function check($method)
+    {
+        if (!isset($_SESSION)) {
+            trigger_error("Start session before using $method().", E_USER_WARNING);
+        }
+    }
 
 }

class/Github/Helpers.php

Indentation +84 added lines, -84 removed lines

@@ -13,89 +13,89 @@
  */
 class Helpers
 {
-	private static $jsonMessages = [
-		JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded',
-		JSON_ERROR_STATE_MISMATCH => 'Syntax error, malformed JSON',
-		JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-		JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-		JSON_ERROR_UTF8 => 'Invalid UTF-8 sequence',
-	];
-
-
-	/** @var Http\IClient */
-	private static $client;
-
-
-	/**
-	 * @param  mixed
-	 * @return string
-	 *
-	 * @throws JsonException
-	 */
-	public static function jsonEncode($value)
-	{
-		if (PHP_VERSION_ID < 50500) {
-			set_error_handler(function($severity, $message) { // needed to receive 'recursion detected' error
-				restore_error_handler();
-				throw new JsonException($message);
-			});
-		}
-
-		$json = json_encode($value, JSON_UNESCAPED_UNICODE);
-
-		if (PHP_VERSION_ID < 50500) {
-			restore_error_handler();
-		}
-
-		if ($error = json_last_error()) {
-			$message = isset(static::$jsonMessages[$error])
-				? static::$jsonMessages[$error]
-				: (PHP_VERSION_ID >= 50500 ? json_last_error_msg() : 'Unknown error');
-
-			throw new JsonException($message, $error);
-		}
-
-		$json = str_replace(array("\xe2\x80\xa8", "\xe2\x80\xa9"), array('\u2028', '\u2029'), $json);
-		return $json;
-	}
-
-
-	/**
-	 * @param  mixed
-	 * @return string
-	 *
-	 * @throws JsonException
-	 */
-	public static function jsonDecode($json, $assoc = false)
-	{
-		$json = (string) $json;
-		if (!preg_match('##u', $json)) {
-			throw new JsonException('Invalid UTF-8 sequence', 5); // PECL JSON-C
-		}
-
-		$value = json_decode($json, $assoc, 512, (defined('JSON_C_VERSION') && PHP_INT_SIZE > 4) ? 0 : JSON_BIGINT_AS_STRING);
-
-		if ($value === NULL && $json !== '' && strcasecmp($json, 'null')) { // '' does not clear json_last_error()
-			$error = json_last_error();
-			throw new JsonException(isset(static::$jsonMessages[$error]) ? static::$jsonMessages[$error] : 'Unknown error', $error);
-		}
-		return $value;
-	}
-
-
-	/**
-	 * @param  bool
-	 * @return Http\IClient
-	 */
-	public static function createDefaultClient($newInstance = FALSE)
-	{
-		if (self::$client === NULL || $newInstance) {
-			self::$client = extension_loaded('curl')
-				? new Http\CurlClient
-				: new Http\StreamClient;
-		}
-
-		return self::$client;
-	}
+    private static $jsonMessages = [
+        JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded',
+        JSON_ERROR_STATE_MISMATCH => 'Syntax error, malformed JSON',
+        JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
+        JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
+        JSON_ERROR_UTF8 => 'Invalid UTF-8 sequence',
+    ];
+
+
+    /** @var Http\IClient */
+    private static $client;
+
+
+    /**
+     * @param  mixed
+     * @return string
+     *
+     * @throws JsonException
+     */
+    public static function jsonEncode($value)
+    {
+        if (PHP_VERSION_ID < 50500) {
+            set_error_handler(function($severity, $message) { // needed to receive 'recursion detected' error
+                restore_error_handler();
+                throw new JsonException($message);
+            });
+        }
+
+        $json = json_encode($value, JSON_UNESCAPED_UNICODE);
+
+        if (PHP_VERSION_ID < 50500) {
+            restore_error_handler();
+        }
+
+        if ($error = json_last_error()) {
+            $message = isset(static::$jsonMessages[$error])
+                ? static::$jsonMessages[$error]
+                : (PHP_VERSION_ID >= 50500 ? json_last_error_msg() : 'Unknown error');
+
+            throw new JsonException($message, $error);
+        }
+
+        $json = str_replace(array("\xe2\x80\xa8", "\xe2\x80\xa9"), array('\u2028', '\u2029'), $json);
+        return $json;
+    }
+
+
+    /**
+     * @param  mixed
+     * @return string
+     *
+     * @throws JsonException
+     */
+    public static function jsonDecode($json, $assoc = false)
+    {
+        $json = (string) $json;
+        if (!preg_match('##u', $json)) {
+            throw new JsonException('Invalid UTF-8 sequence', 5); // PECL JSON-C
+        }
+
+        $value = json_decode($json, $assoc, 512, (defined('JSON_C_VERSION') && PHP_INT_SIZE > 4) ? 0 : JSON_BIGINT_AS_STRING);
+
+        if ($value === NULL && $json !== '' && strcasecmp($json, 'null')) { // '' does not clear json_last_error()
+            $error = json_last_error();
+            throw new JsonException(isset(static::$jsonMessages[$error]) ? static::$jsonMessages[$error] : 'Unknown error', $error);
+        }
+        return $value;
+    }
+
+
+    /**
+     * @param  bool
+     * @return Http\IClient
+     */
+    public static function createDefaultClient($newInstance = FALSE)
+    {
+        if (self::$client === NULL || $newInstance) {
+            self::$client = extension_loaded('curl')
+                ? new Http\CurlClient
+                : new Http\StreamClient;
+        }
+
+        return self::$client;
+    }
 
 }

class/RepositoriesHandler.php

Indentation +90 added lines, -90 removed lines

@@ -31,96 +31,96 @@
  */
 class RepositoriesHandler extends \XoopsPersistableObjectHandler
 {
-	/**
-	 * Constructor
-	 *
-	 * @param \XoopsDatabase $db
-	 */
-	public function __construct(\XoopsDatabase $db)
-	{
-		parent::__construct($db, 'wggithub_repositories', Repositories::class, 'repo_id', 'repo_name');
-	}
-
-	/**
-	 * @param bool $isNew
-	 *
-	 * @return object
-	 */
-	public function create($isNew = true)
-	{
-		return parent::create($isNew);
-	}
-
-	/**
-	 * retrieve a field
-	 *
-	 * @param int $i field id
-	 * @param null fields
-	 * @return mixed reference to the {@link Get} object
-	 */
-	public function get($i = null, $fields = null)
-	{
-		return parent::get($i, $fields);
-	}
-
-	/**
-	 * get inserted id
-	 *
-	 * @param null
-	 * @return int reference to the {@link Get} object
-	 */
-	public function getInsertId()
-	{
-		return $this->db->getInsertId();
-	}
-
-	/**
-	 * Get Count Repositories in the database
-	 * @param int    $start
-	 * @param int    $limit
-	 * @param string $sort
-	 * @param string $order
-	 * @return int
-	 */
-	public function getCountRepositories($start = 0, $limit = 0, $sort = 'repo_id ASC, repo_name', $order = 'ASC')
-	{
-		$crCountRepositories = new \CriteriaCompo();
-		$crCountRepositories = $this->getRepositoriesCriteria($crCountRepositories, $start, $limit, $sort, $order);
-		return $this->getCount($crCountRepositories);
-	}
-
-	/**
-	 * Get All Repositories in the database
-	 * @param int    $start
-	 * @param int    $limit
-	 * @param string $sort
-	 * @param string $order
-	 * @return array
-	 */
-	public function getAllRepositories($start = 0, $limit = 0, $sort = 'repo_id ASC, repo_name', $order = 'ASC')
-	{
-		$crAllRepositories = new \CriteriaCompo();
-		$crAllRepositories = $this->getRepositoriesCriteria($crAllRepositories, $start, $limit, $sort, $order);
-		return $this->getAll($crAllRepositories);
-	}
-
-	/**
-	 * Get Criteria Repositories
-	 * @param        $crRepositories
-	 * @param int    $start
-	 * @param int    $limit
-	 * @param string $sort
-	 * @param string $order
-	 * @return int
-	 */
-	private function getRepositoriesCriteria($crRepositories, $start, $limit, $sort, $order)
-	{
-		$crRepositories->setStart($start);
-		$crRepositories->setLimit($limit);
-		$crRepositories->setSort($sort);
-		$crRepositories->setOrder($order);
-		return $crRepositories;
-	}
+    /**
+     * Constructor
+     *
+     * @param \XoopsDatabase $db
+     */
+    public function __construct(\XoopsDatabase $db)
+    {
+        parent::__construct($db, 'wggithub_repositories', Repositories::class, 'repo_id', 'repo_name');
+    }
+
+    /**
+     * @param bool $isNew
+     *
+     * @return object
+     */
+    public function create($isNew = true)
+    {
+        return parent::create($isNew);
+    }
+
+    /**
+     * retrieve a field
+     *
+     * @param int $i field id
+     * @param null fields
+     * @return mixed reference to the {@link Get} object
+     */
+    public function get($i = null, $fields = null)
+    {
+        return parent::get($i, $fields);
+    }
+
+    /**
+     * get inserted id
+     *
+     * @param null
+     * @return int reference to the {@link Get} object
+     */
+    public function getInsertId()
+    {
+        return $this->db->getInsertId();
+    }
+
+    /**
+     * Get Count Repositories in the database
+     * @param int    $start
+     * @param int    $limit
+     * @param string $sort
+     * @param string $order
+     * @return int
+     */
+    public function getCountRepositories($start = 0, $limit = 0, $sort = 'repo_id ASC, repo_name', $order = 'ASC')
+    {
+        $crCountRepositories = new \CriteriaCompo();
+        $crCountRepositories = $this->getRepositoriesCriteria($crCountRepositories, $start, $limit, $sort, $order);
+        return $this->getCount($crCountRepositories);
+    }
+
+    /**
+     * Get All Repositories in the database
+     * @param int    $start
+     * @param int    $limit
+     * @param string $sort
+     * @param string $order
+     * @return array
+     */
+    public function getAllRepositories($start = 0, $limit = 0, $sort = 'repo_id ASC, repo_name', $order = 'ASC')
+    {
+        $crAllRepositories = new \CriteriaCompo();
+        $crAllRepositories = $this->getRepositoriesCriteria($crAllRepositories, $start, $limit, $sort, $order);
+        return $this->getAll($crAllRepositories);
+    }
+
+    /**
+     * Get Criteria Repositories
+     * @param        $crRepositories
+     * @param int    $start
+     * @param int    $limit
+     * @param string $sort
+     * @param string $order
+     * @return int
+     */
+    private function getRepositoriesCriteria($crRepositories, $start, $limit, $sort, $order)
+    {
+        $crRepositories->setStart($start);
+        $crRepositories->setLimit($limit);
+        $crRepositories->setSort($sort);
+        $crRepositories->setOrder($order);
+        return $crRepositories;
+    }
 
     /**
      * Update table repositories