Skip to content

Commit 6fe2a09

Browse files
akagane99akagane99
authored
Merge pull request #2114 from opensource-workshop/2.25.0
Merge v1.25.0 into 2 #2
2 parents fe44685 + 217d557 commit 6fe2a09

File tree

10 files changed

+149
-119
lines changed

10 files changed

+149
-119
lines changed

‎composer-dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^8.0.2",
12+
"php": "^8.0.2 || ~8.1 || ~8.2",
1313
"aws/aws-sdk-php": "^3.262",
1414
"azuyalabs/yasumi": "^2.3",
1515
"doctrine/dbal": "^2.10",

‎composer-dev.lock

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
55
"This file is @generated automatically"
66
],
7-
"content-hash": "cd31c52a96ff7187b2e5c2993029d471",
7+
"content-hash": "41b91616bddca6d6b92348314b2997cc",
88
"packages": [
99
{
1010
"name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
6262
},
6363
{
6464
"name": "aws/aws-sdk-php",
65-
"version": "3.336.15",
65+
"version": "3.337.3",
6666
"source": {
6767
"type": "git",
6868
"url": "https://github.com/aws/aws-sdk-php.git",
69-
"reference": "f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b"
69+
"reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6"
7070
},
7171
"dist": {
7272
"type": "zip",
73-
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b",
74-
"reference": "f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b",
73+
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06dfc8f76423b49aaa181debd25bbdc724c346d6",
74+
"reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6",
7575
"shasum": ""
7676
},
7777
"require": {
@@ -154,9 +154,9 @@
154154
"support": {
155155
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
156156
"issues": "https://github.com/aws/aws-sdk-php/issues",
157-
"source": "https://github.com/aws/aws-sdk-php/tree/3.336.15"
157+
"source": "https://github.com/aws/aws-sdk-php/tree/3.337.3"
158158
},
159-
"time": "2025-01-14T19:03:58+00:00"
159+
"time": "2025-01-21T19:10:05+00:00"
160160
},
161161
{
162162
"name": "azuyalabs/yasumi",
@@ -1133,16 +1133,16 @@
11331133
},
11341134
{
11351135
"name": "firebase/php-jwt",
1136-
"version": "v6.10.2",
1136+
"version": "v6.11.0",
11371137
"source": {
11381138
"type": "git",
11391139
"url": "https://github.com/firebase/php-jwt.git",
1140-
"reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
1140+
"reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
11411141
},
11421142
"dist": {
11431143
"type": "zip",
1144-
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
1145-
"reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
1144+
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
1145+
"reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
11461146
"shasum": ""
11471147
},
11481148
"require": {
@@ -1190,9 +1190,9 @@
11901190
],
11911191
"support": {
11921192
"issues": "https://github.com/firebase/php-jwt/issues",
1193-
"source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
1193+
"source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
11941194
},
1195-
"time": "2024-11-24T11:22:49+00:00"
1195+
"time": "2025-01-23T05:11:06+00:00"
11961196
},
11971197
{
11981198
"name": "fruitcake/php-cors",
@@ -1654,16 +1654,16 @@
16541654
},
16551655
{
16561656
"name": "guzzlehttp/uri-template",
1657-
"version": "v1.0.3",
1657+
"version": "v1.0.4",
16581658
"source": {
16591659
"type": "git",
16601660
"url": "https://github.com/guzzle/uri-template.git",
1661-
"reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
1661+
"reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
16621662
},
16631663
"dist": {
16641664
"type": "zip",
1665-
"url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
1666-
"reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
1665+
"url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
1666+
"reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
16671667
"shasum": ""
16681668
},
16691669
"require": {
@@ -1720,7 +1720,7 @@
17201720
],
17211721
"support": {
17221722
"issues": "https://github.com/guzzle/uri-template/issues",
1723-
"source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
1723+
"source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
17241724
},
17251725
"funding": [
17261726
{
@@ -1736,7 +1736,7 @@
17361736
"type": "tidelift"
17371737
}
17381738
],
1739-
"time": "2023-12-03T19:50:20+00:00"
1739+
"time": "2025-02-03T10:55:03+00:00"
17401740
},
17411741
{
17421742
"name": "intervention/image",
@@ -1955,16 +1955,16 @@
19551955
},
19561956
{
19571957
"name": "laravel/framework",
1958-
"version": "v9.52.18",
1958+
"version": "v9.52.20",
19591959
"source": {
19601960
"type": "git",
19611961
"url": "https://github.com/laravel/framework.git",
1962-
"reference": "41c812bf83e00d0d3f4b6963b0d475b26cb6fbf7"
1962+
"reference": "2bb6835af73fcf0d1d0bfb84af71cef236cb8609"
19631963
},
19641964
"dist": {
19651965
"type": "zip",
1966-
"url": "https://api.github.com/repos/laravel/framework/zipball/41c812bf83e00d0d3f4b6963b0d475b26cb6fbf7",
1967-
"reference": "41c812bf83e00d0d3f4b6963b0d475b26cb6fbf7",
1966+
"url": "https://api.github.com/repos/laravel/framework/zipball/2bb6835af73fcf0d1d0bfb84af71cef236cb8609",
1967+
"reference": "2bb6835af73fcf0d1d0bfb84af71cef236cb8609",
19681968
"shasum": ""
19691969
},
19701970
"require": {
@@ -2149,24 +2149,24 @@
21492149
"issues": "https://github.com/laravel/framework/issues",
21502150
"source": "https://github.com/laravel/framework"
21512151
},
2152-
"time": "2024-11-20T15:56:00+00:00"
2152+
"time": "2025-01-31T10:09:38+00:00"
21532153
},
21542154
{
21552155
"name": "laravel/helpers",
2156-
"version": "v1.7.1",
2156+
"version": "v1.7.2",
21572157
"source": {
21582158
"type": "git",
21592159
"url": "https://github.com/laravel/helpers.git",
2160-
"reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35"
2160+
"reference": "672d79d5b5f65dc821e57783fa11f22c4d762d70"
21612161
},
21622162
"dist": {
21632163
"type": "zip",
2164-
"url": "https://api.github.com/repos/laravel/helpers/zipball/f28907033d7edf8a0525cfb781ab30ce6d531c35",
2165-
"reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35",
2164+
"url": "https://api.github.com/repos/laravel/helpers/zipball/672d79d5b5f65dc821e57783fa11f22c4d762d70",
2165+
"reference": "672d79d5b5f65dc821e57783fa11f22c4d762d70",
21662166
"shasum": ""
21672167
},
21682168
"require": {
2169-
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
2169+
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
21702170
"php": "^7.2.0|^8.0"
21712171
},
21722172
"require-dev": {
@@ -2204,9 +2204,9 @@
22042204
"laravel"
22052205
],
22062206
"support": {
2207-
"source": "https://github.com/laravel/helpers/tree/v1.7.1"
2207+
"source": "https://github.com/laravel/helpers/tree/v1.7.2"
22082208
},
2209-
"time": "2024-11-26T14:56:25+00:00"
2209+
"time": "2025-01-24T15:41:25+00:00"
22102210
},
22112211
{
22122212
"name": "laravel/serializable-closure",
@@ -2271,33 +2271,33 @@
22712271
},
22722272
{
22732273
"name": "laravel/tinker",
2274-
"version": "v2.10.0",
2274+
"version": "v2.10.1",
22752275
"source": {
22762276
"type": "git",
22772277
"url": "https://github.com/laravel/tinker.git",
2278-
"reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
2278+
"reference": "22177cc71807d38f2810c6204d8f7183d88a57d3"
22792279
},
22802280
"dist": {
22812281
"type": "zip",
2282-
"url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
2283-
"reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
2282+
"url": "https://api.github.com/repos/laravel/tinker/zipball/22177cc71807d38f2810c6204d8f7183d88a57d3",
2283+
"reference": "22177cc71807d38f2810c6204d8f7183d88a57d3",
22842284
"shasum": ""
22852285
},
22862286
"require": {
2287-
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
2288-
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
2289-
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
2287+
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
2288+
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
2289+
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
22902290
"php": "^7.2.5|^8.0",
22912291
"psy/psysh": "^0.11.1|^0.12.0",
22922292
"symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
22932293
},
22942294
"require-dev": {
22952295
"mockery/mockery": "~1.3.3|^1.4.2",
22962296
"phpstan/phpstan": "^1.10",
2297-
"phpunit/phpunit": "^8.5.8|^9.3.3"
2297+
"phpunit/phpunit": "^8.5.8|^9.3.3|^10.0"
22982298
},
22992299
"suggest": {
2300-
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
2300+
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0)."
23012301
},
23022302
"type": "library",
23032303
"extra": {
@@ -2331,9 +2331,9 @@
23312331
],
23322332
"support": {
23332333
"issues": "https://github.com/laravel/tinker/issues",
2334-
"source": "https://github.com/laravel/tinker/tree/v2.10.0"
2334+
"source": "https://github.com/laravel/tinker/tree/v2.10.1"
23352335
},
2336-
"time": "2024-09-23T13:32:56+00:00"
2336+
"time": "2025-01-27T14:24:01+00:00"
23372337
},
23382338
{
23392339
"name": "laravel/ui",
@@ -6689,16 +6689,16 @@
66896689
},
66906690
{
66916691
"name": "tecnickcom/tcpdf",
6692-
"version": "6.8.0",
6692+
"version": "6.8.2",
66936693
"source": {
66946694
"type": "git",
66956695
"url": "https://github.com/tecnickcom/TCPDF.git",
6696-
"reference": "14ffa0e308f5634aa2489568b4b90b24073b6731"
6696+
"reference": "f7a781073e1645062f163e058139e2f89355d420"
66976697
},
66986698
"dist": {
66996699
"type": "zip",
6700-
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/14ffa0e308f5634aa2489568b4b90b24073b6731",
6701-
"reference": "14ffa0e308f5634aa2489568b4b90b24073b6731",
6700+
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/f7a781073e1645062f163e058139e2f89355d420",
6701+
"reference": "f7a781073e1645062f163e058139e2f89355d420",
67026702
"shasum": ""
67036703
},
67046704
"require": {
@@ -6750,15 +6750,15 @@
67506750
],
67516751
"support": {
67526752
"issues": "https://github.com/tecnickcom/TCPDF/issues",
6753-
"source": "https://github.com/tecnickcom/TCPDF/tree/6.8.0"
6753+
"source": "https://github.com/tecnickcom/TCPDF/tree/6.8.2"
67546754
},
67556755
"funding": [
67566756
{
67576757
"url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
67586758
"type": "custom"
67596759
}
67606760
],
6761-
"time": "2024-12-23T13:34:57+00:00"
6761+
"time": "2025-01-26T14:03:12+00:00"
67626762
},
67636763
{
67646764
"name": "tijsverkoyen/css-to-inline-styles",
@@ -7252,16 +7252,16 @@
72527252
},
72537253
{
72547254
"name": "filp/whoops",
7255-
"version": "2.16.0",
7255+
"version": "2.17.0",
72567256
"source": {
72577257
"type": "git",
72587258
"url": "https://github.com/filp/whoops.git",
7259-
"reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
7259+
"reference": "075bc0c26631110584175de6523ab3f1652eb28e"
72607260
},
72617261
"dist": {
72627262
"type": "zip",
7263-
"url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
7264-
"reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
7263+
"url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
7264+
"reference": "075bc0c26631110584175de6523ab3f1652eb28e",
72657265
"shasum": ""
72667266
},
72677267
"require": {
@@ -7311,15 +7311,15 @@
73117311
],
73127312
"support": {
73137313
"issues": "https://github.com/filp/whoops/issues",
7314-
"source": "https://github.com/filp/whoops/tree/2.16.0"
7314+
"source": "https://github.com/filp/whoops/tree/2.17.0"
73157315
},
73167316
"funding": [
73177317
{
73187318
"url": "https://github.com/denis-sokolov",
73197319
"type": "github"
73207320
}
73217321
],
7322-
"time": "2024-09-25T12:00:00+00:00"
7322+
"time": "2025-01-25T12:00:00+00:00"
73237323
},
73247324
{
73257325
"name": "hamcrest/hamcrest-php",
@@ -9318,16 +9318,16 @@
93189318
},
93199319
{
93209320
"name": "squizlabs/php_codesniffer",
9321-
"version": "3.11.2",
9321+
"version": "3.11.3",
93229322
"source": {
93239323
"type": "git",
93249324
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
9325-
"reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
9325+
"reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10"
93269326
},
93279327
"dist": {
93289328
"type": "zip",
9329-
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
9330-
"reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
9329+
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
9330+
"reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10",
93319331
"shasum": ""
93329332
},
93339333
"require": {
@@ -9392,9 +9392,13 @@
93929392
{
93939393
"url": "https://opencollective.com/php_codesniffer",
93949394
"type": "open_collective"
9395+
},
9396+
{
9397+
"url": "https://thanks.dev/phpcsstandards",
9398+
"type": "thanks_dev"
93959399
}
93969400
],
9397-
"time": "2024-12-11T16:04:26+00:00"
9401+
"time": "2025-01-23T17:04:15+00:00"
93989402
},
93999403
{
94009404
"name": "theseer/tokenizer",
@@ -9453,7 +9457,7 @@
94539457
"prefer-stable": true,
94549458
"prefer-lowest": false,
94559459
"platform": {
9456-
"php": "^8.0.2"
9460+
"php": "^8.0.2 || ~8.1 || ~8.2"
94579461
},
94589462
"platform-dev": [],
94599463
"plugin-api-version": "2.6.0"

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^8.0.2",
12+
"php": "^8.0.2 || ~8.1 || ~8.2",
1313
"azuyalabs/yasumi": "^2.3",
1414
"doctrine/dbal": "^2.10",
1515
"ezyang/htmlpurifier": "^4.13",

0 commit comments

Comments
 (0)