Skip to content

Commit aee7580

Browse files
author
Bohan Yang
committed
Update dependency versions & tests
1 parent 203edcb commit aee7580

File tree

13 files changed

+66
-64
lines changed

13 files changed

+66
-64
lines changed

‎.env.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
APP_DEBUG=1
22
APP_SECRET=40c039b156184808bc6c8734d7eabe8e
3-
DATABASE_URL="mysql://localhost?unix_socket=/run/mysqld/mysqld.sock&dbname=test_mango&user=test_mango&password=123456&serverVersion=10.9.3-MariaDB"
3+
DATABASE_URL="mysql://localhost?dbname=phpunit&user=debian"

‎composer.json

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,38 @@
1010
],
1111
"require": {
1212
"chubbyphp/chubbyphp-workerman-request-handler": "^2.0",
13-
"doctrine/dbal": "^3.5.1",
13+
"doctrine/dbal": "^3.5.1|^4.0",
1414
"doctrine/doctrine-bundle": "^2.7",
1515
"doctrine/doctrine-migrations-bundle": "^3.2",
1616
"doctrine/migrations": "^3.2",
1717
"ext-intl": "*",
18-
"guzzlehttp/promises": "^1.4",
18+
"guzzlehttp/promises": "^1.4|^2.0",
1919
"nyholm/psr7": "^1.6.1",
2020
"php": ">=8.1",
2121
"psr/container": "^1.1|^2.0",
2222
"psr/http-factory": "^1.0",
2323
"psr/http-message": "^1.0|^2.0",
2424
"psr/http-server-handler": "^1.0",
2525
"psr/log": "^2.0|^3.0",
26-
"symfony/config": "^6.3 || ^7.0",
27-
"symfony/dependency-injection": "^6.3 || ^7.0",
28-
"symfony/event-dispatcher": "^6.3 || ^7.0",
29-
"symfony/framework-bundle": "^6.3 || ^7.0",
30-
"symfony/http-client": "^6.3 || ^7.0",
26+
"symfony/config": "^6.4|^7.0",
27+
"symfony/dependency-injection": "^6.4|^7.0",
28+
"symfony/event-dispatcher": "^6.4|^7.0",
29+
"symfony/framework-bundle": "^6.4|^7.0",
30+
"symfony/http-client": "^6.4|^7.0",
3131
"symfony/http-client-contracts": "^3.0",
3232
"symfony/http-client-implementation": "^3.0",
33-
"symfony/http-foundation": "^6.3 || ^7.0",
34-
"symfony/http-kernel": "^6.3 || ^7.0",
33+
"symfony/http-foundation": "^6.4|^7.0",
34+
"symfony/http-kernel": "^6.4|^7.0",
3535
"symfony/monolog-bundle": "^3.8",
3636
"symfony/psr-http-message-bridge": "^2.3|^6.4",
37-
"symfony/runtime": "^6.3 || ^7.0",
38-
"symfony/security-http": "^6.3 || ^7.0",
39-
"symfony/serializer": "^6.3 || ^7.0",
40-
"symfony/uid": "^6.3 || ^7.0",
37+
"symfony/runtime": "^6.4|^7.0",
38+
"symfony/security-http": "^6.4|^7.0",
39+
"symfony/serializer": "^6.4|^7.0",
40+
"symfony/uid": "^6.4|^7.0",
4141
"symplify/monorepo-builder": "^11.2",
4242
"thecodingmachine/safe": "^2.4",
43-
"web-token/jwt-bundle": "^3.2",
44-
"web-token/jwt-checker": "^3.2",
45-
"web-token/jwt-core": "^3.2",
46-
"web-token/jwt-key-mgmt": "^3.2",
47-
"web-token/jwt-signature": "^3.2",
48-
"web-token/jwt-signature-algorithm-rsa": "^3.2",
43+
"web-token/jwt-bundle": "^3.3",
44+
"web-token/jwt-library": "^3.3",
4945
"workerman/workerman": "^4.0"
5046
},
5147
"autoload": {
@@ -66,15 +62,16 @@
6662
}
6763
},
6864
"require-dev": {
69-
"lcobucci/jwt": "^4.0",
65+
"lcobucci/jwt": "^4.0|^5.0",
7066
"moneyphp/money": "^4.1",
7167
"monolog/monolog": "^3.0",
72-
"symfony/dotenv": "^6.3",
73-
"symfony/phpunit-bridge": "^6.3",
74-
"symfony/process": "^6.3 || ^7.0",
75-
"symfony/validator": "^6.3 || ^7.0",
76-
"symfony/yaml": "^6.3 || ^7.0",
77-
"twig/twig": "^3.0"
68+
"symfony/dotenv": "^6.4|^7.0",
69+
"symfony/phpunit-bridge": "^6.4|^7.0",
70+
"symfony/process": "^6.4|^7.0",
71+
"symfony/validator": "^6.4|^7.0",
72+
"symfony/yaml": "^6.4|^7.0",
73+
"twig/twig": "^3.0",
74+
"doctrine/coding-standard": "^12.0"
7875
},
7976
"replace": {
8077
"manyou/aria2": "self.version",

‎packages/aria2/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": ">=8.1",
14-
"symfony/http-client": "^6.3 || ^7.0",
14+
"symfony/http-client": "^6.4|^7.0",
1515
"symfony/http-client-contracts": "^3.0"
1616
},
1717
"autoload": {

‎packages/bing-homepage/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"php": ">=8.1",
77
"symfony/http-client-contracts": "^3.0",
88
"symfony/http-client-implementation": "^3.0",
9-
"guzzlehttp/promises": "^1.4",
9+
"guzzlehttp/promises": "^1.4|^2.0",
1010
"psr/log": "^2.0|^3.0",
1111
"manyou/promise-http-client": "^0.1"
1212
},
1313
"require-dev": {
14-
"symfony/http-client": "^6.3 || ^7.0"
14+
"symfony/http-client": "^6.4|^7.0"
1515
},
1616
"license": "Apache-2.0",
1717
"autoload": {

‎packages/clear-service-tags-bundle/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"type": "symfony-bundle",
55
"require": {
66
"php": ">=8.1",
7-
"symfony/dependency-injection": "^6.3 || ^7.0",
8-
"symfony/http-kernel": "^6.3 || ^7.0",
9-
"symfony/config": "^6.3 || ^7.0"
7+
"symfony/dependency-injection": "^6.4|^7.0",
8+
"symfony/http-kernel": "^6.4|^7.0",
9+
"symfony/config": "^6.4|^7.0"
1010
},
1111
"license": "Apache-2.0",
1212
"autoload": {

‎packages/leanstorage/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"php": ">=8.1",
77
"symfony/http-client-contracts": "^3.0",
88
"symfony/http-client-implementation": "^3.0",
9-
"guzzlehttp/promises": "^1.4",
9+
"guzzlehttp/promises": "^1.4|^2.0",
1010
"manyou/promise-http-client": "^0.1"
1111
},
1212
"require-dev": {
13-
"symfony/http-client": "^6.3 || ^7.0"
13+
"symfony/http-client": "^6.4|^7.0"
1414
},
1515
"license": "Apache-2.0",
1616
"autoload": {

‎packages/mango/Doctrine/Driver/Oci8InitializeSession.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,23 @@
55
namespace Mango\Doctrine\Driver;
66

77
use Doctrine\DBAL\Driver;
8-
use Doctrine\DBAL\Driver\OCI8\Driver as OCI8Driver;
8+
use Doctrine\DBAL\Driver\Middleware;
9+
use Doctrine\DBAL\Driver\OCI8;
910
use Doctrine\DBAL\Driver\OCI8\Middleware\InitializeSession;
1011

11-
class Oci8InitializeSession extends InitializeSession
12+
class Oci8InitializeSession implements Middleware
1213
{
14+
private readonly Middleware $decorated;
15+
16+
public function __construct()
17+
{
18+
$this->decorated = new InitializeSession();
19+
}
20+
1321
public function wrap(Driver $driver): Driver
1422
{
15-
if ($driver instanceof OCI8Driver) {
16-
return parent::wrap($driver);
23+
if ($driver instanceof OCI8\Driver) {
24+
return $this->decorated->wrap($driver);
1725
}
1826

1927
return $driver;

‎packages/mango/composer.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,27 @@
55
"require": {
66
"php": ">=8.1",
77
"ext-intl": "*",
8-
"doctrine/dbal": "^3.5.1",
8+
"doctrine/dbal": "^3.5.1|^4.0",
99
"doctrine/doctrine-bundle": "^2.7",
1010
"doctrine/doctrine-migrations-bundle": "^3.2",
1111
"doctrine/migrations": "^3.2",
1212
"psr/container": "^1.1|^2.0",
1313
"psr/log": "^2.0|^3.0",
14-
"symfony/dependency-injection": "^6.3 || ^7.0",
15-
"symfony/event-dispatcher": "^6.3 || ^7.0",
16-
"symfony/framework-bundle": "^6.3 || ^7.0",
17-
"symfony/http-kernel": "^6.3 || ^7.0",
14+
"symfony/dependency-injection": "^6.4|^7.0",
15+
"symfony/event-dispatcher": "^6.4|^7.0",
16+
"symfony/framework-bundle": "^6.4|^7.0",
17+
"symfony/http-kernel": "^6.4|^7.0",
1818
"symfony/monolog-bundle": "^3.8",
19-
"symfony/security-http": "^6.3 || ^7.0",
20-
"symfony/serializer": "^6.3 || ^7.0",
21-
"symfony/uid": "^6.3 || ^7.0",
22-
"web-token/jwt-bundle": "^3.2",
23-
"web-token/jwt-checker": "^3.2",
24-
"web-token/jwt-core": "^3.2",
25-
"web-token/jwt-key-mgmt": "^3.2",
26-
"web-token/jwt-signature": "^3.2",
27-
"web-token/jwt-signature-algorithm-rsa": "^3.2"
19+
"symfony/security-http": "^6.4|^7.0",
20+
"symfony/serializer": "^6.4|^7.0",
21+
"symfony/uid": "^6.4|^7.0",
22+
"web-token/jwt-bundle": "^3.3",
23+
"web-token/jwt-library": "^3.3"
2824
},
2925
"require-dev": {
30-
"symfony/yaml": "^6.3 || ^7.0",
26+
"symfony/yaml": "^6.4|^7.0",
3127
"moneyphp/money": "^4.1",
32-
"symfony/validator": "^6.3 || ^7.0",
28+
"symfony/validator": "^6.4|^7.0",
3329
"monolog/monolog": "^3.0",
3430
"twig/twig": "^3.0"
3531
},

‎packages/promise-http-client/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"php": ">=8.1",
1414
"symfony/http-client-contracts": "^3.0",
1515
"symfony/http-client-implementation": "^3.0",
16-
"guzzlehttp/promises": "^1.4",
16+
"guzzlehttp/promises": "^1.4|^2.0",
1717
"psr/log": "^2.0|^3.0"
1818
},
1919
"require-dev": {
20-
"symfony/http-client": "^6.3 || ^7.0",
21-
"symfony/process": "^6.3 || ^7.0"
20+
"symfony/http-client": "^6.4|^7.0",
21+
"symfony/process": "^6.4|^7.0"
2222
},
2323
"autoload": {
2424
"psr-4": {

‎packages/workerman-symfony-runtime/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"chubbyphp/chubbyphp-workerman-request-handler": "^2.0",
1717
"symfony/psr-http-message-bridge": "^2.3|^6.4",
1818
"psr/http-message": "^1.0|^2.0",
19-
"symfony/runtime": "^6.3 || ^7.0",
19+
"symfony/runtime": "^6.4|^7.0",
2020
"workerman/workerman": "^4.0",
21-
"symfony/http-kernel": "^6.3 || ^7.0",
22-
"symfony/http-foundation": "^6.3 || ^7.0",
23-
"symfony/dependency-injection": "^6.3 || ^7.0",
21+
"symfony/http-kernel": "^6.4|^7.0",
22+
"symfony/http-foundation": "^6.4|^7.0",
23+
"symfony/dependency-injection": "^6.4|^7.0",
2424
"psr/http-factory": "^1.0",
2525
"psr/http-server-handler": "^1.0",
2626
"nyholm/psr7": "^1.6.1"

‎packages/x509-chain-verifier/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"thecodingmachine/safe": "^2.4"
1717
},
1818
"require-dev": {
19-
"lcobucci/jwt": "^4.0"
19+
"lcobucci/jwt": "^4.0|^5.0"
2020
},
2121
"minimum-stability": "dev",
2222
"extra": {

‎phpcs.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<rule ref="Doctrine" />
1515

16-
<file>src</file>
16+
<file>packages</file>
1717
<file>tests</file>
1818

1919
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">

‎tests/allowed.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

0 commit comments

Comments
 (0)