Skip to content
This repository was archived by the owner on Jan 13, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Facebook/GraphNodes/GraphAchievement.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class GraphAchievement extends GraphNode
* @var array Maps object key names to Graph object types.
*/
protected static $graphObjectMap = [
'from' => '\Facebook\GraphNodes\GraphUser',
'application' => '\Facebook\GraphNodes\GraphApplication',
'from' => GraphUser::class,
'application' => GraphApplication::class,
];

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Facebook/GraphNodes/GraphAlbum.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class GraphAlbum extends GraphNode
* @var array Maps object key names to Graph object types.
*/
protected static $graphObjectMap = [
'from' => '\Facebook\GraphNodes\GraphUser',
'place' => '\Facebook\GraphNodes\GraphPage',
'from' => GraphUser::class,
'place' => GraphPage::class,
];

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Facebook/GraphNodes/GraphEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class GraphEvent extends GraphNode
* @var array Maps object key names to GraphNode types.
*/
protected static $graphObjectMap = [
'cover' => '\Facebook\GraphNodes\GraphCoverPhoto',
'place' => '\Facebook\GraphNodes\GraphPage',
'picture' => '\Facebook\GraphNodes\GraphPicture',
'parent_group' => '\Facebook\GraphNodes\GraphGroup',
'cover' => GraphCoverPhoto::class,
'place' => GraphPage::class,
'picture' => GraphPicture::class,
'parent_group' => GraphGroup::class,
];

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Facebook/GraphNodes/GraphGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class GraphGroup extends GraphNode
* @var array Maps object key names to GraphNode types.
*/
protected static $graphObjectMap = [
'cover' => '\Facebook\GraphNodes\GraphCoverPhoto',
'venue' => '\Facebook\GraphNodes\GraphLocation',
'cover' => GraphCoverPhoto::class,
'venue' => GraphLocation::class,
];

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Facebook/GraphNodes/GraphNodeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ class GraphNodeFactory
/**
* @const string The base graph object class.
*/
const BASE_GRAPH_NODE_CLASS = '\Facebook\GraphNodes\GraphNode';
const BASE_GRAPH_NODE_CLASS = GraphNode::class;

/**
* @const string The base graph edge class.
*/
const BASE_GRAPH_EDGE_CLASS = '\Facebook\GraphNodes\GraphEdge';
const BASE_GRAPH_EDGE_CLASS = GraphEdge::class;

/**
* @const string The graph object prefix.
Expand Down
4 changes: 2 additions & 2 deletions src/Facebook/GraphNodes/GraphObjectFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ class GraphObjectFactory extends GraphNodeFactory
/**
* @const string The base graph object class.
*/
const BASE_GRAPH_NODE_CLASS = '\Facebook\GraphNodes\GraphObject';
const BASE_GRAPH_NODE_CLASS = GraphObject::class;

/**
* @const string The base graph edge class.
*/
const BASE_GRAPH_EDGE_CLASS = '\Facebook\GraphNodes\GraphList';
const BASE_GRAPH_EDGE_CLASS = GraphList::class;

/**
* Tries to convert a FacebookResponse entity into a GraphNode.
Expand Down
10 changes: 5 additions & 5 deletions src/Facebook/GraphNodes/GraphPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class GraphPage extends GraphNode
* @var array Maps object key names to Graph object types.
*/
protected static $graphObjectMap = [
'best_page' => '\Facebook\GraphNodes\GraphPage',
'global_brand_parent_page' => '\Facebook\GraphNodes\GraphPage',
'location' => '\Facebook\GraphNodes\GraphLocation',
'cover' => '\Facebook\GraphNodes\GraphCoverPhoto',
'picture' => '\Facebook\GraphNodes\GraphPicture',
'best_page' => GraphPage::class,
'global_brand_parent_page' => GraphPage::class,
'location' => GraphLocation::class,
'cover' => GraphCoverPhoto::class,
'picture' => GraphPicture::class,
];

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Facebook/GraphNodes/GraphUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class GraphUser extends GraphNode
* @var array Maps object key names to Graph object types.
*/
protected static $graphObjectMap = [
'hometown' => '\Facebook\GraphNodes\GraphPage',
'location' => '\Facebook\GraphNodes\GraphPage',
'significant_other' => '\Facebook\GraphNodes\GraphUser',
'picture' => '\Facebook\GraphNodes\GraphPicture',
'hometown' => GraphPage::class,
'location' => GraphPage::class,
'significant_other' => GraphUser::class,
'picture' => GraphPicture::class,
];

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/Authentication/AccessTokenMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public function testDatesGetCastToDateTime()
$expires = $metadata->getExpiresAt();
$issuedAt = $metadata->getIssuedAt();

$this->assertInstanceOf('DateTime', $expires);
$this->assertInstanceOf('DateTime', $issuedAt);
$this->assertInstanceOf(\DateTime::class, $expires);
$this->assertInstanceOf(\DateTime::class, $issuedAt);
}

public function testAllTheGettersReturnTheProperValue()
Expand Down
6 changes: 4 additions & 2 deletions tests/Authentication/OAuth2ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
use Facebook\Facebook;
use Facebook\FacebookApp;
use Facebook\Authentication\OAuth2Client;
use Facebook\Authentication\AccessTokenMetadata;
use Facebook\Authentication\AccessToken;

class OAuth2ClientTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -58,7 +60,7 @@ public function testCanGetMetadataFromAnAccessToken()

$metadata = $this->oauth->debugToken('baz_token');

$this->assertInstanceOf('Facebook\Authentication\AccessTokenMetadata', $metadata);
$this->assertInstanceOf(AccessTokenMetadata::class, $metadata);
$this->assertEquals('444', $metadata->getUserId());

$expectedParams = [
Expand Down Expand Up @@ -103,7 +105,7 @@ public function testCanGetAccessTokenFromCode()

$accessToken = $this->oauth->getAccessTokenFromCode('bar_code', 'foo_uri');

$this->assertInstanceOf('Facebook\Authentication\AccessToken', $accessToken);
$this->assertInstanceOf(AccessToken::class, $accessToken);
$this->assertEquals('my_access_token', $accessToken->getValue());

$expectedParams = [
Expand Down
48 changes: 27 additions & 21 deletions tests/Exceptions/FacebookResponseExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
use Facebook\FacebookRequest;
use Facebook\FacebookResponse;
use Facebook\Exceptions\FacebookResponseException;
use Facebook\Exceptions\FacebookAuthenticationException;
use Facebook\Exceptions\FacebookServerException;
use Facebook\Exceptions\FacebookThrottleException;
use Facebook\Exceptions\FacebookAuthorizationException;
use Facebook\Exceptions\FacebookClientException;
use Facebook\Exceptions\FacebookOtherException;

class FacebookResponseExceptionTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -54,7 +60,7 @@ public function testAuthenticationExceptions()

$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(100, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -65,45 +71,45 @@ public function testAuthenticationExceptions()
$params['error']['code'] = 102;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(102, $exception->getCode());

$params['error']['code'] = 190;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(190, $exception->getCode());

$params['error']['type'] = 'OAuthException';
$params['error']['code'] = 0;
$params['error']['error_subcode'] = 458;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(458, $exception->getSubErrorCode());

$params['error']['error_subcode'] = 460;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(460, $exception->getSubErrorCode());

$params['error']['error_subcode'] = 463;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(463, $exception->getSubErrorCode());

$params['error']['error_subcode'] = 467;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(467, $exception->getSubErrorCode());

$params['error']['error_subcode'] = 0;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(0, $exception->getSubErrorCode());
}

Expand All @@ -120,7 +126,7 @@ public function testServerExceptions()

$response = new FacebookResponse($this->request, json_encode($params), 500);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookServerException', $exception->getPrevious());
$this->assertInstanceOf(FacebookServerException::class, $exception->getPrevious());
$this->assertEquals(1, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -131,7 +137,7 @@ public function testServerExceptions()
$params['error']['code'] = 2;
$response = new FacebookResponse($this->request, json_encode($params), 500);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookServerException', $exception->getPrevious());
$this->assertInstanceOf(FacebookServerException::class, $exception->getPrevious());
$this->assertEquals(2, $exception->getCode());
}

Expand All @@ -147,7 +153,7 @@ public function testThrottleExceptions()
];
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookThrottleException', $exception->getPrevious());
$this->assertInstanceOf(FacebookThrottleException::class, $exception->getPrevious());
$this->assertEquals(4, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -158,13 +164,13 @@ public function testThrottleExceptions()
$params['error']['code'] = 17;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookThrottleException', $exception->getPrevious());
$this->assertInstanceOf(FacebookThrottleException::class, $exception->getPrevious());
$this->assertEquals(17, $exception->getCode());

$params['error']['code'] = 341;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookThrottleException', $exception->getPrevious());
$this->assertInstanceOf(FacebookThrottleException::class, $exception->getPrevious());
$this->assertEquals(341, $exception->getCode());
}

Expand All @@ -180,7 +186,7 @@ public function testUserIssueExceptions()
];
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(230, $exception->getCode());
$this->assertEquals(459, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -191,7 +197,7 @@ public function testUserIssueExceptions()
$params['error']['error_subcode'] = 464;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthenticationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthenticationException::class, $exception->getPrevious());
$this->assertEquals(464, $exception->getSubErrorCode());
}

Expand All @@ -207,7 +213,7 @@ public function testAuthorizationExceptions()
];
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthorizationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthorizationException::class, $exception->getPrevious());
$this->assertEquals(10, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -218,19 +224,19 @@ public function testAuthorizationExceptions()
$params['error']['code'] = 200;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthorizationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthorizationException::class, $exception->getPrevious());
$this->assertEquals(200, $exception->getCode());

$params['error']['code'] = 250;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthorizationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthorizationException::class, $exception->getPrevious());
$this->assertEquals(250, $exception->getCode());

$params['error']['code'] = 299;
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookAuthorizationException', $exception->getPrevious());
$this->assertInstanceOf(FacebookAuthorizationException::class, $exception->getPrevious());
$this->assertEquals(299, $exception->getCode());
}

Expand All @@ -246,7 +252,7 @@ public function testClientExceptions()
];
$response = new FacebookResponse($this->request, json_encode($params), 401);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookClientException', $exception->getPrevious());
$this->assertInstanceOf(FacebookClientException::class, $exception->getPrevious());
$this->assertEquals(506, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('exception', $exception->getErrorType());
Expand All @@ -267,7 +273,7 @@ public function testOtherException()
];
$response = new FacebookResponse($this->request, json_encode($params), 200);
$exception = FacebookResponseException::create($response);
$this->assertInstanceOf('Facebook\Exceptions\FacebookOtherException', $exception->getPrevious());
$this->assertInstanceOf(FacebookOtherException::class, $exception->getPrevious());
$this->assertEquals(42, $exception->getCode());
$this->assertEquals(0, $exception->getSubErrorCode());
$this->assertEquals('feature', $exception->getErrorType());
Expand Down
5 changes: 3 additions & 2 deletions tests/FacebookAppTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
namespace Facebook\Tests;

use Facebook\FacebookApp;
use Facebook\Authentication\AccessToken;

class FacebookAppTest extends \PHPUnit_Framework_TestCase
{
Expand Down Expand Up @@ -51,15 +52,15 @@ public function testAnAppAccessTokenCanBeGenerated()
{
$accessToken = $this->app->getAccessToken();

$this->assertInstanceOf('Facebook\Authentication\AccessToken', $accessToken);
$this->assertInstanceOf(AccessToken::class, $accessToken);
$this->assertEquals('id|secret', (string)$accessToken);
}

public function testSerialization()
{
$newApp = unserialize(serialize($this->app));

$this->assertInstanceOf('Facebook\FacebookApp', $newApp);
$this->assertInstanceOf(FacebookApp::class, $newApp);
$this->assertEquals('id', $newApp->getId());
$this->assertEquals('secret', $newApp->getSecret());
}
Expand Down
Loading