Skip to content

Commit 05a7c25

Browse files
author
CI bot
committed
Merge remote-tracking branch 'remotes/dev/6.1' into 6.1
2 parents d3d9e57 + cdfda0b commit 05a7c25

File tree

4 files changed

+233
-159
lines changed

4 files changed

+233
-159
lines changed

‎dev.lock‎

Lines changed: 104 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,75 @@
425425
],
426426
"time": "2023-01-15T23:15:59+00:00"
427427
},
428+
{
429+
"name": "carbonphp/carbon-doctrine-types",
430+
"version": "1.0.0",
431+
"source": {
432+
"type": "git",
433+
"url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
434+
"reference": "3c430083d0b41ceed84ecccf9dac613241d7305d"
435+
},
436+
"dist": {
437+
"type": "zip",
438+
"url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/3c430083d0b41ceed84ecccf9dac613241d7305d",
439+
"reference": "3c430083d0b41ceed84ecccf9dac613241d7305d",
440+
"shasum": ""
441+
},
442+
"require": {
443+
"php": "^7.1.8 || ^8.0"
444+
},
445+
"conflict": {
446+
"doctrine/dbal": ">=3.7.0"
447+
},
448+
"require-dev": {
449+
"doctrine/dbal": ">=2.0.0",
450+
"nesbot/carbon": "^2.71.0 || ^3.0.0",
451+
"phpunit/phpunit": "^10.3"
452+
},
453+
"type": "library",
454+
"autoload": {
455+
"psr-4": {
456+
"Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
457+
}
458+
},
459+
"notification-url": "https://packagist.org/downloads/",
460+
"license": [
461+
"MIT"
462+
],
463+
"authors": [
464+
{
465+
"name": "KyleKatarn",
466+
"email": "[email protected]"
467+
}
468+
],
469+
"description": "Types to use Carbon in Doctrine",
470+
"keywords": [
471+
"carbon",
472+
"date",
473+
"datetime",
474+
"doctrine",
475+
"time"
476+
],
477+
"support": {
478+
"issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
479+
"source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/1.0.0"
480+
},
481+
"funding": [
482+
{
483+
"url": "https://github.com/kylekatarnls",
484+
"type": "github"
485+
},
486+
{
487+
"url": "https://opencollective.com/Carbon",
488+
"type": "open_collective"
489+
},
490+
{
491+
"url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
492+
"type": "tidelift"
493+
}
494+
],
495+
"time": "2023-10-01T12:35:29+00:00"
496+
},
428497
{
429498
"name": "cboden/ratchet",
430499
"version": "v0.4.4",
@@ -2910,16 +2979,16 @@
29102979
},
29112980
{
29122981
"name": "google/apiclient-services",
2913-
"version": "v0.397.0",
2982+
"version": "v0.399.0",
29142983
"source": {
29152984
"type": "git",
29162985
"url": "https://github.com/googleapis/google-api-php-client-services.git",
2917-
"reference": "a69d060a405f347e1c25f1a7c3528d8d2a29132c"
2986+
"reference": "8366037e450b62ffc1c5489459f207640acca2b4"
29182987
},
29192988
"dist": {
29202989
"type": "zip",
2921-
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/a69d060a405f347e1c25f1a7c3528d8d2a29132c",
2922-
"reference": "a69d060a405f347e1c25f1a7c3528d8d2a29132c",
2990+
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/8366037e450b62ffc1c5489459f207640acca2b4",
2991+
"reference": "8366037e450b62ffc1c5489459f207640acca2b4",
29232992
"shasum": ""
29242993
},
29252994
"require": {
@@ -2948,9 +3017,9 @@
29483017
],
29493018
"support": {
29503019
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
2951-
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.397.0"
3020+
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.399.0"
29523021
},
2953-
"time": "2025-05-30T02:03:56+00:00"
3022+
"time": "2025-06-04T17:28:44+00:00"
29543023
},
29553024
{
29563025
"name": "google/auth",
@@ -4712,16 +4781,16 @@
47124781
},
47134782
{
47144783
"name": "laminas/laminas-validator",
4715-
"version": "2.64.2",
4784+
"version": "2.64.4",
47164785
"source": {
47174786
"type": "git",
47184787
"url": "https://github.com/laminas/laminas-validator.git",
4719-
"reference": "771e504760448ac7af660710237ceb93be602e08"
4788+
"reference": "e2e6631f599a9b0db1e23adb633c09a2f0c68bed"
47204789
},
47214790
"dist": {
47224791
"type": "zip",
4723-
"url": "https://api.github.com/repos/laminas/laminas-validator/zipball/771e504760448ac7af660710237ceb93be602e08",
4724-
"reference": "771e504760448ac7af660710237ceb93be602e08",
4792+
"url": "https://api.github.com/repos/laminas/laminas-validator/zipball/e2e6631f599a9b0db1e23adb633c09a2f0c68bed",
4793+
"reference": "e2e6631f599a9b0db1e23adb633c09a2f0c68bed",
47254794
"shasum": ""
47264795
},
47274796
"require": {
@@ -4792,7 +4861,7 @@
47924861
"type": "community_bridge"
47934862
}
47944863
],
4795-
"time": "2024-11-26T21:29:17+00:00"
4864+
"time": "2025-06-16T14:38:00+00:00"
47964865
},
47974866
{
47984867
"name": "lcobucci/clock",
@@ -5834,31 +5903,36 @@
58345903
},
58355904
{
58365905
"name": "nesbot/carbon",
5837-
"version": "2.65.0",
5906+
"version": "2.73.0",
58385907
"source": {
58395908
"type": "git",
58405909
"url": "https://github.com/CarbonPHP/carbon.git",
5841-
"reference": "09acf64155c16dc6f580f36569ae89344e9734a3"
5910+
"reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075"
58425911
},
58435912
"dist": {
58445913
"type": "zip",
5845-
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3",
5846-
"reference": "09acf64155c16dc6f580f36569ae89344e9734a3",
5914+
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/9228ce90e1035ff2f0db84b40ec2e023ed802075",
5915+
"reference": "9228ce90e1035ff2f0db84b40ec2e023ed802075",
58475916
"shasum": ""
58485917
},
58495918
"require": {
5919+
"carbonphp/carbon-doctrine-types": "*",
58505920
"ext-json": "*",
58515921
"php": "^7.1.8 || ^8.0",
5922+
"psr/clock": "^1.0",
58525923
"symfony/polyfill-mbstring": "^1.0",
58535924
"symfony/polyfill-php80": "^1.16",
58545925
"symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
58555926
},
5927+
"provide": {
5928+
"psr/clock-implementation": "1.0"
5929+
},
58565930
"require-dev": {
5857-
"doctrine/dbal": "^2.0 || ^3.1.4",
5858-
"doctrine/orm": "^2.7",
5931+
"doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
5932+
"doctrine/orm": "^2.7 || ^3.0",
58595933
"friendsofphp/php-cs-fixer": "^3.0",
58605934
"kylekatarnls/multi-tester": "^2.0",
5861-
"ondrejmirtes/better-reflection": "*",
5935+
"ondrejmirtes/better-reflection": "<6",
58625936
"phpmd/phpmd": "^2.9",
58635937
"phpstan/extension-installer": "^1.0",
58645938
"phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -5882,8 +5956,8 @@
58825956
]
58835957
},
58845958
"branch-alias": {
5885-
"dev-3.x": "3.x-dev",
5886-
"dev-master": "2.x-dev"
5959+
"dev-2.x": "2.x-dev",
5960+
"dev-master": "3.x-dev"
58875961
}
58885962
},
58895963
"autoload": {
@@ -5932,7 +6006,7 @@
59326006
"type": "tidelift"
59336007
}
59346008
],
5935-
"time": "2023-01-06T15:55:01+00:00"
6009+
"time": "2025-01-08T20:10:23+00:00"
59366010
},
59376011
{
59386012
"name": "nette/php-generator",
@@ -7453,7 +7527,7 @@
74537527
"dist": {
74547528
"type": "path",
74557529
"url": "../../package/platform",
7456-
"reference": "88cd7fc8c0426d572af68136f0d0cd867dc0d033"
7530+
"reference": "47ab2f4781b1256d86327111965fe1c3167eb921"
74577531
},
74587532
"require": {
74597533
"ass/xmlsecurity": "1.1.1",
@@ -7502,7 +7576,7 @@
75027576
"monolog/monolog": "~2.10.0",
75037577
"myclabs/deep-copy": "1.12.*",
75047578
"nelmio/security-bundle": "~3.4.0",
7505-
"nesbot/carbon": "~2.65.0",
7579+
"nesbot/carbon": "~2.73.0",
75067580
"nette/php-generator": "~4.1.3",
75077581
"ocramius/proxy-manager": "~2.11.1",
75087582
"oro/api-doc-bundle": "2.1.*",
@@ -7623,7 +7697,7 @@
76237697
"when": "3.7.8",
76247698
"crypto-js": "4.2.0",
76257699
"jquery-mousewheel": "3.1.13",
7626-
"tinymce": "6.8.5",
7700+
"tinymce": "6.8.6",
76277701
"timepicker": "1.14.0",
76287702
"datepair.js": "0.4.*",
76297703
"jquery-ui-multiselect-widget": "2.0.1",
@@ -8945,16 +9019,16 @@
89459019
},
89469020
{
89479021
"name": "phpseclib/phpseclib",
8948-
"version": "3.0.43",
9022+
"version": "3.0.44",
89499023
"source": {
89509024
"type": "git",
89519025
"url": "https://github.com/phpseclib/phpseclib.git",
8952-
"reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
9026+
"reference": "1d0b5e7e1434678411787c5a0535e68907cf82d9"
89539027
},
89549028
"dist": {
89559029
"type": "zip",
8956-
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
8957-
"reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
9030+
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1d0b5e7e1434678411787c5a0535e68907cf82d9",
9031+
"reference": "1d0b5e7e1434678411787c5a0535e68907cf82d9",
89589032
"shasum": ""
89599033
},
89609034
"require": {
@@ -9035,7 +9109,7 @@
90359109
],
90369110
"support": {
90379111
"issues": "https://github.com/phpseclib/phpseclib/issues",
9038-
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
9112+
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.44"
90399113
},
90409114
"funding": [
90419115
{
@@ -9051,7 +9125,7 @@
90519125
"type": "tidelift"
90529126
}
90539127
],
9054-
"time": "2024-12-14T21:12:59+00:00"
9128+
"time": "2025-06-15T09:59:26+00:00"
90559129
},
90569130
{
90579131
"name": "phpstan/phpdoc-parser",

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.5'
22
services:
33
pgsql:
4-
image: oroinc/pgsql:13.7-1-alpine
4+
image: oroinc/pgsql:17.4-alpine
55
ports: ['5432']
66
labels:
77
com.symfony.server.service-prefix: ORO_DB
@@ -19,7 +19,7 @@ services:
1919
start_period: 40s
2020
restart: on-failure
2121
redis:
22-
image: redis:6-alpine
22+
image: redis:7.4.2-alpine
2323
ports: ["6379"]
2424
labels:
2525
com.symfony.server.service-prefix: ORO_REDIS

0 commit comments

Comments
 (0)