Library Rewrite

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.gitignore

@@ -2,3 +2,4 @@
 composer.phar
 composer.lock
 .DS_Store
+.php_cs.cache

.php_cs

@@ -0,0 +1,77 @@
+<?php
+
+use Symfony\CS\Config\Config;
+use Symfony\CS\FixerInterface;
+use Symfony\CS\Finder\DefaultFinder;
+
+$fixers = [
+    'blankline_after_open_tag',
+    'braces',
+    'concat_without_spaces',
+    'double_arrow_multiline_whitespaces',
+    'duplicate_semicolon',
+    'elseif',
+    'empty_return',
+    'encoding',
+    'eof_ending',
+    'extra_empty_lines',
+    'function_call_space',
+    'function_declaration',
+    'include',
+    'indentation',
+    'join_function',
+    'line_after_namespace',
+    'linefeed',
+    'list_commas',
+    'logical_not_operators_with_successor_space',
+    'lowercase_constants',
+    'lowercase_keywords',
+    'method_argument_space',
+    'multiline_array_trailing_comma',
+    'multiline_spaces_before_semicolon',
+    'multiple_use',
+    'namespace_no_leading_whitespace',
+    'no_blank_lines_after_class_opening',
+    'no_empty_lines_after_phpdocs',
+    'object_operator',
+    'operators_spaces',
+    'parenthesis',
+    'phpdoc_indent',
+    'phpdoc_inline_tag',
+    'phpdoc_no_access',
+    'phpdoc_no_package',
+    'phpdoc_scalar',
+    'phpdoc_short_description',
+    'phpdoc_to_comment',
+    'phpdoc_trim',
+    'phpdoc_type_to_var',
+    'phpdoc_var_without_name',
+    'remove_leading_slash_use',
+    'remove_lines_between_uses',
+    'return',
+    'self_accessor',
+    'short_array_syntax',
+    'short_echo_tag',
+    'short_tag',
+    'single_array_no_trailing_comma',
+    'single_blank_line_before_namespace',
+    'single_line_after_imports',
+    'single_quote',
+    'spaces_before_semicolon',
+    'spaces_cast',
+    'standardize_not_equal',
+    'ternary_spaces',
+    'trailing_spaces',
+    'trim_array_spaces',
+    'unalign_equals',
+    'unary_operators_spaces',
+    'unused_use',
+    'visibility',
+    'whitespacy_lines',
+];
+
+return Config::create()
+    ->finder(DefaultFinder::create()->in(__DIR__))
+    ->fixers($fixers)
+    ->level(FixerInterface::NONE_LEVEL)
+    ->setUsingCache(true);

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+- repo: [email protected]:hootsuite/pre-commit-php.git
+  sha: 1.2.0
+  hooks:
+  - id: php-lint
+  - id: php-unit
+  - id: php-cs-fixer
+    args: ['--config-file=.php_cs']

.travis.yml

@@ -1,15 +1,9 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
-  - hhvm
-
-matrix:
-  allow_failures:
-  - php: hhvm
-
+  - 7.0
+  - 7.1
 
 before_script:
   - composer self-update
@@ -26,4 +20,4 @@ after_script:
   - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
 
   #Coveralls
-  - php bin/coveralls -p
+  - php bin/coveralls -p

README.md

@@ -6,41 +6,17 @@
 Require this package in composer.json and update
 
     "poniverse/api": "dev-master"
-
-### Normal Setup
-
-Example Code:
-
-    $config = [
-        'client_id' => 'YOUR_CLIENT_ID'
-        'client_secret' => 'YOUR_CLIENT_SECRET'
-        'host_url' => 'https://api.poniverse.net'
-    ];
 
-    $poniverse = new Poniverse(
-        $config['client_id'],
-        $config['client_secret'],
-        new Client([
-            'base_url' => [$config['host_url'], ['version' => 'v' . Poniverse::VERSION]]
-        ])
-    );
-
-    $poniverse->setAccessToken('GRANTED_ACCESS_TOKEN');
-
-    $user = $poniverse->user->get();
-    // $user['display_name'];
-    // $user['email'];
-
-### Laravel 4 Setup
+### Normal Setup
 
-Open up `app/config/app.php` and add this line in your `providers` section
+See `demo\index.php` for an example.
 
-    'Poniverse\Api\ApiServiceProvider',
+### Laravel 5 Setup
 
-In the same file add this line to the ```aliases``` section
+Add the service provider to your `providers` section, usually located in `config/app.php`.
 
-    'Poniverse' => 'Poniverse\Api\Facades\Poniverse',
+    Poniverse\Api\ApiServiceProvider::class,
 
 Publish the configuration and then edit it
 
-    php artisan config:publish poniverse/api
+    php artisan vendor:publish

composer.json

@@ -11,18 +11,19 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "4.1.*",
-        "guzzlehttp/guzzle": "4.*"
+        "php": ">=7.4.0",
+        "illuminate/support": "^8.0",
+        "guzzlehttp/guzzle": "^7.0",
+        "league/oauth2-client": "^2.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
-        "mockery/mockery": "dev-master",
-        "satooshi/php-coveralls": "dev-master"
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "0.9.*",
+        "satooshi/php-coveralls": "~1.0"
     },
     "autoload": {
-        "psr-0": {
-            "Poniverse\\Api": "src/"
+        "psr-4": {
+            "Poniverse\\Lib\\": "src/"
         }
     },
     "minimum-stability": "stable"

demo/index.php

@@ -0,0 +1,48 @@
+<?php
+
+require '../vendor/autoload.php';
+
+$poniverseClient = new \Poniverse\Lib\Client(
+    'demo',
+    'demo',
+    new GuzzleHttp\Client()
+);
+
+// OAUTH DANCE
+
+$oauthProvider = $poniverseClient->getOAuthProvider([
+    'redirectUri' => 'http://lib.pv/index.php',
+]);
+
+try {
+    // FYI, This is for development use only, you will never be able to
+    // use the password grant on our production servers.
+    $accessToken = $oauthProvider->getAccessToken('password', [
+        'username' => 'test',
+        'password' => 'test',
+    ]);
+
+    $poniverseClient->setAccessToken($accessToken);
+} catch (\League\OAuth2\Client\Provider\Exception\IdentityProviderException $e) {
+    dd($e->getMessage());
+}
+
+$resourceOwner = $oauthProvider->getResourceOwner($accessToken);
+
+// API TEST
+
+try {
+    $anotherUser = $poniverseClient->poniverse()->users()->get('5582ba3b-46ab-46f8-95e1-00bb1b8748c7');
+} catch (\Poniverse\Lib\Errors\ApiException $e) {
+    dd($e->getMessage(), $e->getStatusCode());
+}
+
+$anotherUser->display_name = 'Test Dummy';
+
+try {
+    $userService->update($anotherUser);
+} catch (\Poniverse\Lib\Errors\ApiException $e) {
+    // TODO: Handle Error
+}
+
+dd($resourceOwner, $anotherUser);