Skip to content

Commit 6adf91f

Browse files
committed
refractor: change name class
1 parent fcf0b33 commit 6adf91f

2 files changed

Lines changed: 22 additions & 20 deletions

File tree

src/ApiClient.php renamed to src/OpenLRW.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
use OpenLRW\Exception\GenericException;
1616
use OpenLRW\Http\Client;
1717

18-
class ApiClient
18+
class OpenLRW
1919
{
20-
const VERSION = "1.0";
2120

2221
private static $url;
2322
private static $key;
@@ -83,7 +82,7 @@ public static function generateJwt()
8382
self::$token = self::$http->post($route, $credentials)->token;
8483
return self::$token;
8584
} catch(Exception $e) {
86-
throw new GenericException($e);
85+
throw new GenericException("Server is down or credentials are invalid.");
8786
}
8887
}
8988

@@ -117,18 +116,21 @@ public static function getKey() : string
117116
return self::$key;
118117
}
119118

120-
121119
public static function httpGet($route, $header)
122120
{
123121
return self::$http->get($route, $header);
124122
}
125123

124+
public static function httpDelete($route, $header)
125+
{
126+
return self::$http->delete($route, $header);
127+
}
128+
126129
public static function httpPost($route, $data, $header)
127130
{
128131
return self::$http->post($route, $data, $header);
129132
}
130133

131-
132134
public static function httpPatch($route, $data, $header)
133135
{
134136
return self::$http->patch($route, $data, $header);
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
namespace Tests;
1616

17-
use OpenLRW\ApiClient;
17+
use OpenLRW\OpenLRW;
1818
use OpenLRW\Entity\OneRoster;
1919
use OpenLRW\Entity\User;
2020
use PHPUnit\Framework\TestCase;
2121

22-
class ApiClientTest extends TestCase
22+
class OpenLRWTest extends TestCase
2323
{
2424

2525
const URL = 'localhost:9966';
@@ -28,28 +28,28 @@ class ApiClientTest extends TestCase
2828

2929
public function testClientShouldNotBeNull()
3030
{
31-
$client = new ApiClient(self::URL, self::KEY, self::PASSWORD);
31+
$client = new OpenLRW(self::URL, self::KEY, self::PASSWORD);
3232
$this->assertNotNull($client);
3333
}
3434

3535

3636
public function testServerShouldBeUp()
3737
{
38-
$client = new ApiClient(self::URL, self::KEY, self::PASSWORD);
38+
$client = new OpenLRW(self::URL, self::KEY, self::PASSWORD);
3939
$response = $client::isUp();
4040
$this->assertTrue($response);
4141
}
4242

4343
public function testServerShouldBeDown()
4444
{
45-
$client = new ApiClient('http://fake_openlrw.apero.org', self::KEY, self::PASSWORD);
45+
$client = new OpenLRW('http://fake_openlrw.apero.org', self::KEY, self::PASSWORD);
4646
$response = $client::isUp();
4747
$this->assertFalse($response);
4848
}
4949

5050
public function testJwtShouldNotBeNull()
5151
{
52-
$client = new ApiClient(self::URL, self::KEY, self::PASSWORD);
52+
$client = new OpenLRW(self::URL, self::KEY, self::PASSWORD);
5353
$client::generateJwt();
5454
$jwt = $client::getJwt();
5555
$this->assertNotNull($jwt);
@@ -58,40 +58,40 @@ public function testJwtShouldNotBeNull()
5858

5959
public function testStaticJwtShouldNotBeNull()
6060
{
61-
$client = new ApiClient(self::URL, self::KEY, self::PASSWORD);
61+
$client = new OpenLRW(self::URL, self::KEY, self::PASSWORD);
6262
$client::generateJwt();
63-
$jwt = ApiClient::getJwt();
63+
$jwt = OpenLRW::getJwt();
6464
$this->assertNotNull($jwt);
6565
}
6666

6767

6868
public function testUserShouldNotBeNull()
6969
{
70-
new ApiClient(self::URL, self::KEY, self::PASSWORD);
71-
ApiClient::generateJwt();
70+
new OpenLRW(self::URL, self::KEY, self::PASSWORD);
71+
OpenLRW::generateJwt();
7272
$user = User::find('test2u');
7373
$this->assertNotNull($user);
7474
}
7575

7676

7777
public function testOneRosterGetShouldReturnOk()
7878
{
79-
new ApiClient(self::URL, self::KEY, self::PASSWORD);
80-
ApiClient::generateJwt();
79+
new OpenLRW(self::URL, self::KEY, self::PASSWORD);
80+
OpenLRW::generateJwt();
8181
$user = OneRoster::get('users/test2u');
8282
$this->assertNotNull($user);
8383
}
8484

8585

8686
public function testGetShouldReturnOk()
8787
{
88-
new ApiClient(self::URL, self::KEY, self::PASSWORD);
88+
new OpenLRW(self::URL, self::KEY, self::PASSWORD);
8989

90-
$jwt = ApiClient::generateJwt();
90+
$jwt = OpenLRW::generateJwt();
9191

9292
$header = ['X-Requested-With' => 'XMLHttpRequest', 'Authorization' => "Bearer $jwt"];
9393

94-
$user = ApiClient::httpGet('/api/users/test2u', $header);
94+
$user = OpenLRW::httpGet('/api/users/test2u', $header);
9595
$this->assertNotNull($user);
9696
}
9797

0 commit comments

Comments
 (0)