Skip to content
This repository was archived by the owner on Jan 13, 2022. It is now read-only.

Commit 4d77bb0

Browse files
brainexebrainexe
committed
added support for PHP8
manay PHPunit BCs...
1 parent 2d82506 commit 4d77bb0

File tree

54 files changed

+275
-269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+275
-269
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ php:
88
- 7.1
99
- 7.2
1010
- 7.3
11+
- 7.4
12+
- 8.0
1113

1214
sudo: false
1315

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^5.4|^7.0"
15+
"php": "^7.1|^8.0"
1616
},
1717
"require-dev": {
18-
"phpunit/phpunit": "~4.0",
19-
"mockery/mockery": "~0.8",
18+
"phpunit/phpunit": "~9.2",
19+
"mockery/mockery": "~1.4",
2020
"guzzlehttp/guzzle": "~5.0"
2121
},
2222
"suggest": {

‎tests/Authentication/AccessTokenMetadataTest.php

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
namespace Facebook\Tests\Authentication;
2525

2626
use Facebook\Authentication\AccessTokenMetadata;
27+
use Facebook\Exceptions\FacebookSDKException;
28+
use Facebook\Tests\BaseTestCase;
2729

28-
class AccessTokenMetadataTest extends \PHPUnit_Framework_TestCase
30+
class AccessTokenMetadataTest extends BaseTestCase
2931
{
3032

3133
protected $graphResponseData = [
@@ -51,7 +53,7 @@ class AccessTokenMetadataTest extends \PHPUnit_Framework_TestCase
5153
],
5254
];
5355

54-
public function testDatesGetCastToDateTime()
56+
public function testDatesGetCastToDateTime(): void
5557
{
5658
$metadata = new AccessTokenMetadata($this->graphResponseData);
5759

@@ -62,7 +64,7 @@ public function testDatesGetCastToDateTime()
6264
$this->assertInstanceOf('DateTime', $issuedAt);
6365
}
6466

65-
public function testAllTheGettersReturnTheProperValue()
67+
public function testAllTheGettersReturnTheProperValue(): void
6668
{
6769
$metadata = new AccessTokenMetadata($this->graphResponseData);
6870

@@ -81,56 +83,51 @@ public function testAllTheGettersReturnTheProperValue()
8183
$this->assertEquals('1337', $metadata->getUserId());
8284
}
8385

84-
/**
85-
* @expectedException \Facebook\Exceptions\FacebookSDKException
86-
*/
87-
public function testInvalidMetadataWillThrow()
86+
public function testInvalidMetadataWillThrow(): void
8887
{
88+
$this->expectException(FacebookSDKException::class);
8989
new AccessTokenMetadata(['foo' => 'bar']);
9090
}
9191

92-
public function testAnExpectedAppIdWillNotThrow()
92+
public function testAnExpectedAppIdWillNotThrow(): void
9393
{
9494
$metadata = new AccessTokenMetadata($this->graphResponseData);
9595
$metadata->validateAppId('123');
9696
}
9797

98-
/**
99-
* @expectedException \Facebook\Exceptions\FacebookSDKException
100-
*/
101-
public function testAnUnexpectedAppIdWillThrow()
98+
public function testAnUnexpectedAppIdWillThrow(): void
10299
{
100+
$this->expectException(FacebookSDKException::class);
101+
103102
$metadata = new AccessTokenMetadata($this->graphResponseData);
104103
$metadata->validateAppId('foo');
105104
}
106105

107-
public function testAnExpectedUserIdWillNotThrow()
106+
public function testAnExpectedUserIdWillNotThrow(): void
108107
{
109108
$metadata = new AccessTokenMetadata($this->graphResponseData);
110109
$metadata->validateUserId('1337');
111110
}
112111

113-
/**
114-
* @expectedException \Facebook\Exceptions\FacebookSDKException
115-
*/
116-
public function testAnUnexpectedUserIdWillThrow()
112+
public function testAnUnexpectedUserIdWillThrow(): void
117113
{
114+
$this->expectException(FacebookSDKException::class);
115+
118116
$metadata = new AccessTokenMetadata($this->graphResponseData);
119117
$metadata->validateUserId('foo');
120118
}
121119

122-
public function testAnActiveAccessTokenWillNotThrow()
120+
public function testAnActiveAccessTokenWillNotThrow(): void
123121
{
124122
$this->graphResponseData['data']['expires_at'] = time() + 1000;
125123
$metadata = new AccessTokenMetadata($this->graphResponseData);
126124
$metadata->validateExpiration();
127125
}
128126

129-
/**
130-
* @expectedException \Facebook\Exceptions\FacebookSDKException
131-
*/
132-
public function testAnExpiredAccessTokenWillThrow()
127+
public function testAnExpiredAccessTokenWillThrow(): void
133128
{
129+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
130+
134131
$this->graphResponseData['data']['expires_at'] = time() - 1000;
135132
$metadata = new AccessTokenMetadata($this->graphResponseData);
136133
$metadata->validateExpiration();

‎tests/Authentication/AccessTokenTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
namespace Facebook\Tests\Authentication;
2525

2626
use Facebook\Authentication\AccessToken;
27+
use Facebook\Tests\BaseTestCase;
2728

28-
class AccessTokenTest extends \PHPUnit_Framework_TestCase
29+
class AccessTokenTest extends BaseTestCase
2930
{
3031

3132
public function testAnAccessTokenCanBeReturnedAsAString()

‎tests/Authentication/OAuth2ClientTest.php

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
use Facebook\Facebook;
2727
use Facebook\FacebookApp;
2828
use Facebook\Authentication\OAuth2Client;
29+
use Facebook\Tests\BaseTestCase;
2930

30-
class OAuth2ClientTest extends \PHPUnit_Framework_TestCase
31+
class OAuth2ClientTest extends BaseTestCase
3132
{
3233

3334
/**
@@ -45,14 +46,14 @@ class OAuth2ClientTest extends \PHPUnit_Framework_TestCase
4546
*/
4647
protected $oauth;
4748

48-
protected function setUp()
49+
protected function setUp(): void
4950
{
5051
$app = new FacebookApp('123', 'foo_secret');
5152
$this->client = new FooFacebookClientForOAuth2Test();
5253
$this->oauth = new OAuth2Client($app, $this->client, static::TESTING_GRAPH_VERSION);
5354
}
5455

55-
public function testCanGetMetadataFromAnAccessToken()
56+
public function testCanGetMetadataFromAnAccessToken(): void
5657
{
5758
$this->client->setMetadataResponse();
5859

@@ -74,15 +75,19 @@ public function testCanGetMetadataFromAnAccessToken()
7475
$this->assertEquals(static::TESTING_GRAPH_VERSION, $request->getGraphVersion());
7576
}
7677

77-
public function testCanBuildAuthorizationUrl()
78+
public function testCanBuildAuthorizationUrl(): void
7879
{
7980
$scope = ['email', 'base_foo'];
8081
$authUrl = $this->oauth->getAuthorizationUrl('https://foo.bar', 'foo_state', $scope, ['foo' => 'bar'], '*');
8182

82-
$this->assertContains('*', $authUrl);
83+
$this->assertStringContainsString('*', $authUrl);
8384

8485
$expectedUrl = 'https://www.facebook.com/' . static::TESTING_GRAPH_VERSION . '/dialog/oauth?';
85-
$this->assertTrue(strpos($authUrl, $expectedUrl) === 0, 'Unexpected base authorization URL returned from getAuthorizationUrl().');
86+
$this->assertSame(
87+
strpos($authUrl, $expectedUrl),
88+
0,
89+
'Unexpected base authorization URL returned from getAuthorizationUrl().'
90+
);
8691

8792
$params = [
8893
'client_id' => '123',
@@ -93,11 +98,11 @@ public function testCanBuildAuthorizationUrl()
9398
'foo' => 'bar',
9499
];
95100
foreach ($params as $key => $value) {
96-
$this->assertContains($key . '=' . urlencode($value), $authUrl);
101+
$this->assertStringContainsString($key . '=' . urlencode($value), $authUrl);
97102
}
98103
}
99104

100-
public function testCanGetAccessTokenFromCode()
105+
public function testCanGetAccessTokenFromCode(): void
101106
{
102107
$this->client->setAccessTokenResponse();
103108

@@ -122,7 +127,7 @@ public function testCanGetAccessTokenFromCode()
122127
$this->assertEquals(static::TESTING_GRAPH_VERSION, $request->getGraphVersion());
123128
}
124129

125-
public function testCanGetLongLivedAccessToken()
130+
public function testCanGetLongLivedAccessToken(): void
126131
{
127132
$this->client->setAccessTokenResponse();
128133

@@ -143,7 +148,7 @@ public function testCanGetLongLivedAccessToken()
143148
$this->assertEquals($expectedParams, $request->getParams());
144149
}
145150

146-
public function testCanGetCodeFromLongLivedAccessToken()
151+
public function testCanGetCodeFromLongLivedAccessToken(): void
147152
{
148153
$this->client->setCodeResponse();
149154

‎tests/BaseTestCase.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Facebook\Tests;
6+
7+
use Mockery\Adapter\Phpunit\MockeryTestCase;
8+
9+
class BaseTestCase extends MockeryTestCase
10+
{
11+
12+
}

‎tests/Exceptions/FacebookResponseExceptionTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@
2727
use Facebook\FacebookRequest;
2828
use Facebook\FacebookResponse;
2929
use Facebook\Exceptions\FacebookResponseException;
30+
use Facebook\Tests\BaseTestCase;
3031

31-
class FacebookResponseExceptionTest extends \PHPUnit_Framework_TestCase
32+
class FacebookResponseExceptionTest extends BaseTestCase
3233
{
3334

3435
/**
3536
* @var FacebookRequest
3637
*/
3738
protected $request;
3839

39-
protected function setUp()
40+
protected function setUp(): void
4041
{
4142
$this->request = new FacebookRequest(new FacebookApp('123', 'foo'));
4243
}

‎tests/FacebookAppTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525

2626
use Facebook\FacebookApp;
2727

28-
class FacebookAppTest extends \PHPUnit_Framework_TestCase
28+
class FacebookAppTest extends BaseTestCase
2929
{
3030
/**
3131
* @var FacebookApp
3232
*/
3333
private $app;
3434

35-
protected function setUp()
35+
protected function setUp(): void
3636
{
3737
$this->app = new FacebookApp('id', 'secret');
3838
}
@@ -64,11 +64,9 @@ public function testSerialization()
6464
$this->assertEquals('secret', $newApp->getSecret());
6565
}
6666

67-
/**
68-
* @expectedException \Facebook\Exceptions\FacebookSDKException
69-
*/
7067
public function testOverflowIntegersWillThrow()
7168
{
69+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
7270
new FacebookApp(PHP_INT_MAX + 1, "foo");
7371
}
7472

‎tests/FacebookBatchRequestTest.php

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
use Facebook\FacebookBatchRequest;
3030
use Facebook\FileUpload\FacebookFile;
3131

32-
class FacebookBatchRequestTest extends \PHPUnit_Framework_TestCase
32+
class FacebookBatchRequestTest extends BaseTestCase
3333
{
3434
/**
3535
* @var FacebookApp
3636
*/
3737
private $app;
3838

39-
protected function setUp()
39+
protected function setUp(): void
4040
{
4141
$this->app = new FacebookApp('123', 'foo_secret');
4242
}
@@ -80,31 +80,25 @@ public function testRequestWithAppOnlyWillFallbackToBatchDefaults()
8080
$this->assertRequestContainsAppAndToken($request, $customApp, 'foo_token');
8181
}
8282

83-
/**
84-
* @expectedException \Facebook\Exceptions\FacebookSDKException
85-
*/
8683
public function testWillThrowWhenNoThereIsNoAppFallback()
8784
{
85+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
8886
$batchRequest = new FacebookBatchRequest();
8987

9088
$batchRequest->addFallbackDefaults(new FacebookRequest(null, 'foo_token'));
9189
}
9290

93-
/**
94-
* @expectedException \Facebook\Exceptions\FacebookSDKException
95-
*/
9691
public function testWillThrowWhenNoThereIsNoAccessTokenFallback()
9792
{
93+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
9894
$request = new FacebookBatchRequest();
9995

10096
$request->addFallbackDefaults(new FacebookRequest($this->app));
10197
}
10298

103-
/**
104-
* @expectedException \InvalidArgumentException
105-
*/
10699
public function testAnInvalidTypeGivenToAddWillThrow()
107100
{
101+
$this->expectException(\InvalidArgumentException::class);
108102
$request = new FacebookBatchRequest();
109103

110104
$request->add('foo');
@@ -168,21 +162,17 @@ public function testRequestsCanBeInjectedIntoConstructor()
168162
$this->assertRequestsMatch($requests, $formattedRequests);
169163
}
170164

171-
/**
172-
* @expectedException \Facebook\Exceptions\FacebookSDKException
173-
*/
174165
public function testAZeroRequestCountWithThrow()
175166
{
167+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
176168
$batchRequest = new FacebookBatchRequest($this->app, [], 'foo_token');
177169

178170
$batchRequest->validateBatchRequestCount();
179171
}
180172

181-
/**
182-
* @expectedException \Facebook\Exceptions\FacebookSDKException
183-
*/
184173
public function testMoreThanFiftyRequestsWillThrow()
185174
{
175+
$this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
186176
$batchRequest = $this->createBatchRequest();
187177

188178
$this->createAndAppendRequestsTo($batchRequest, 51);

‎tests/FacebookBatchResponseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
use Facebook\FacebookBatchRequest;
3030
use Facebook\FacebookBatchResponse;
3131

32-
class FacebookBatchResponseTest extends \PHPUnit_Framework_TestCase
32+
class FacebookBatchResponseTest extends BaseTestCase
3333
{
3434
/**
3535
* @var \Facebook\FacebookApp
@@ -41,7 +41,7 @@ class FacebookBatchResponseTest extends \PHPUnit_Framework_TestCase
4141
*/
4242
protected $request;
4343

44-
protected function setUp()
44+
protected function setUp(): void
4545
{
4646
$this->app = new FacebookApp('123', 'foo_secret');
4747
$this->request = new FacebookRequest(

0 commit comments

Comments
 (0)