Skip to content

Commit 19f0baf

Browse files
authored
Merge pull request #1094 from Sephster/3.x
Remove ext-json
2 parents 08a852f + cc29a0f commit 19f0baf

2 files changed

Lines changed: 79 additions & 84 deletions

File tree

composer.json

Lines changed: 79 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,83 @@
11
{
2-
"name": "league/oauth2-client",
3-
"description": "OAuth 2.0 Client Library",
4-
"license": "MIT",
5-
"keywords": [
6-
"oauth",
7-
"oauth2",
8-
"authorization",
9-
"authentication",
10-
"idp",
11-
"identity",
12-
"sso",
13-
"single sign on"
14-
],
15-
"authors": [
16-
{
17-
"name": "Alex Bilbie",
18-
"email": "hello@alexbilbie.com",
19-
"homepage": "http://www.alexbilbie.com",
20-
"role": "Developer"
21-
},
22-
{
23-
"name": "Woody Gilk",
24-
"homepage": "https://github.com/shadowhand",
25-
"role": "Contributor"
26-
}
27-
],
28-
"require": {
29-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
30-
"ext-json": "*",
31-
"psr/http-client": "^1.0",
32-
"psr/http-factory": "^1.1",
33-
"psr/http-message": "^2.0"
2+
"name": "league/oauth2-client",
3+
"description": "OAuth 2.0 Client Library",
4+
"license": "MIT",
5+
"keywords": [
6+
"oauth",
7+
"oauth2",
8+
"authorization",
9+
"authentication",
10+
"idp",
11+
"identity",
12+
"sso",
13+
"single sign on"
14+
],
15+
"authors": [
16+
{
17+
"name": "Alex Bilbie",
18+
"email": "hello@alexbilbie.com",
19+
"homepage": "http://www.alexbilbie.com",
20+
"role": "Developer"
3421
},
35-
"require-dev": {
36-
"ergebnis/composer-normalize": "^2.45",
37-
"guzzlehttp/guzzle": "^7.4.5",
38-
"mockery/mockery": "^1.6",
39-
"php-parallel-lint/php-parallel-lint": "^1.4",
40-
"phpstan/extension-installer": "^1.4",
41-
"phpstan/phpstan": "^2.0",
42-
"phpstan/phpstan-mockery": "^2.0",
43-
"phpstan/phpstan-phpunit": "^2.0",
44-
"phpunit/phpunit": "^10.5 || ^11.5",
45-
"ramsey/coding-standard": "^2.2",
46-
"squizlabs/php_codesniffer": "^3.11"
47-
},
48-
"autoload": {
49-
"psr-4": {
50-
"League\\OAuth2\\Client\\": "src/"
51-
}
52-
},
53-
"autoload-dev": {
54-
"psr-4": {
55-
"League\\OAuth2\\Client\\Test\\": "test/src/"
56-
}
57-
},
58-
"config": {
59-
"allow-plugins": {
60-
"dealerdirect/phpcodesniffer-composer-installer": true,
61-
"ergebnis/composer-normalize": true,
62-
"phpstan/extension-installer": true
63-
},
64-
"sort-packages": true
65-
},
66-
"scripts": {
67-
"analyze": "phpstan analyze --memory-limit=1G",
68-
"cs": "phpcs",
69-
"cs-fix": "phpcbf",
70-
"lint": "parallel-lint src test",
71-
"test": [
72-
"@lint",
73-
"@cs",
74-
"@analyze",
75-
"phpunit --no-coverage"
76-
]
77-
},
78-
"scripts-descriptions": {
79-
"cs": "Check for coding style errors.",
80-
"cs-fix": "Check and automatically fix any fixable coding style errors.",
81-
"lint": "Check source code for syntax errors.",
82-
"test": "Run the full test suite."
22+
{
23+
"name": "Woody Gilk",
24+
"homepage": "https://github.com/shadowhand",
25+
"role": "Contributor"
26+
}
27+
],
28+
"require": {
29+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
30+
"psr/http-client": "^1.0",
31+
"psr/http-factory": "^1.1",
32+
"psr/http-message": "^2.0"
33+
},
34+
"require-dev": {
35+
"ergebnis/composer-normalize": "^2.45",
36+
"guzzlehttp/guzzle": "^7.4.5",
37+
"mockery/mockery": "^1.6",
38+
"php-parallel-lint/php-parallel-lint": "^1.4",
39+
"phpstan/extension-installer": "^1.4",
40+
"phpstan/phpstan": "^2.0",
41+
"phpstan/phpstan-mockery": "^2.0",
42+
"phpstan/phpstan-phpunit": "^2.0",
43+
"phpunit/phpunit": "^10.5 || ^11.5",
44+
"ramsey/coding-standard": "^2.2",
45+
"squizlabs/php_codesniffer": "^3.11"
46+
},
47+
"autoload": {
48+
"psr-4": {
49+
"League\\OAuth2\\Client\\": "src/"
8350
}
51+
},
52+
"autoload-dev": {
53+
"psr-4": {
54+
"League\\OAuth2\\Client\\Test\\": "test/src/"
55+
}
56+
},
57+
"config": {
58+
"allow-plugins": {
59+
"dealerdirect/phpcodesniffer-composer-installer": true,
60+
"ergebnis/composer-normalize": true,
61+
"phpstan/extension-installer": true
62+
},
63+
"sort-packages": true
64+
},
65+
"scripts": {
66+
"analyze": "phpstan analyze --memory-limit=1G",
67+
"cs": "phpcs",
68+
"cs-fix": "phpcbf",
69+
"lint": "parallel-lint src test",
70+
"test": [
71+
"@lint",
72+
"@cs",
73+
"@analyze",
74+
"phpunit --no-coverage"
75+
]
76+
},
77+
"scripts-descriptions": {
78+
"cs": "Check for coding style errors.",
79+
"cs-fix": "Check and automatically fix any fixable coding style errors.",
80+
"lint": "Check source code for syntax errors.",
81+
"test": "Run the full test suite."
82+
}
8483
}

src/Provider/GenericProvider.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class GenericProvider extends AbstractProvider
5555

5656
/**
5757
* @var list<string> | null
58-
* @phpstan-ignore property.unusedType
5958
*/
6059
private ?array $scopes = null;
6160

@@ -64,9 +63,6 @@ class GenericProvider extends AbstractProvider
6463
private string $responseCode;
6564
private string $responseResourceOwnerId = 'id';
6665

67-
/**
68-
* @phpstan-ignore property.unusedType
69-
*/
7066
private ?string $pkceMethod = null;
7167

7268
/**

0 commit comments

Comments
 (0)