Skip to content

Commit 9c8767d

Browse files
nickvergessennickvergessen
authored
Merge pull request #2212 from nextcloud/dependabot/composer/symfony-32bc18790b
build(deps): bump the symfony group across 1 directory with 3 updates
2 parents 3f7b14d + b3ed32f commit 9c8767d

11 files changed

Lines changed: 302 additions & 44 deletions

File tree

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"symfony/event-dispatcher": "^6.4.8",
5757
"symfony/http-foundation": "^6.4.29",
5858
"symfony/mailer": "^6.4",
59-
"symfony/polyfill-intl-normalizer": "^1.32.0",
59+
"symfony/polyfill-intl-normalizer": "^1.33.0",
6060
"symfony/polyfill-php82": "^1.32.0",
61-
"symfony/polyfill-php83": "^1.32.0",
62-
"symfony/polyfill-php84": "^1.32.0",
61+
"symfony/polyfill-php83": "^1.33.0",
62+
"symfony/polyfill-php84": "^1.33.0",
6363
"symfony/polyfill-php85": "^1.33",
6464
"symfony/process": "^6.4.15",
6565
"symfony/routing": "^6.4.12",

‎composer.lock‎

Lines changed: 27 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,6 +1551,7 @@
15511551
'Punic\\Script' => $vendorDir . '/punic/punic/src/Script.php',
15521552
'Punic\\Territory' => $vendorDir . '/punic/punic/src/Territory.php',
15531553
'Punic\\Unit' => $vendorDir . '/punic/punic/src/Unit.php',
1554+
'ReflectionConstant' => $vendorDir . '/symfony/polyfill-php84/Resources/stubs/ReflectionConstant.php',
15541555
'SQLite3Exception' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
15551556
'Sabre\\CalDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php',
15561557
'Sabre\\CalDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php',

‎composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,6 +2078,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
20782078
'Punic\\Script' => __DIR__ . '/..' . '/punic/punic/src/Script.php',
20792079
'Punic\\Territory' => __DIR__ . '/..' . '/punic/punic/src/Territory.php',
20802080
'Punic\\Unit' => __DIR__ . '/..' . '/punic/punic/src/Unit.php',
2081+
'ReflectionConstant' => __DIR__ . '/..' . '/symfony/polyfill-php84/Resources/stubs/ReflectionConstant.php',
20812082
'SQLite3Exception' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
20822083
'Sabre\\CalDAV\\Backend\\AbstractBackend' => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php',
20832084
'Sabre\\CalDAV\\Backend\\BackendInterface' => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php',

‎composer/installed.json‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5265,8 +5265,8 @@
52655265
},
52665266
{
52675267
"name": "symfony/polyfill-intl-normalizer",
5268-
"version": "v1.32.0",
5269-
"version_normalized": "1.32.0.0",
5268+
"version": "v1.33.0",
5269+
"version_normalized": "1.33.0.0",
52705270
"source": {
52715271
"type": "git",
52725272
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -5329,7 +5329,7 @@
53295329
"shim"
53305330
],
53315331
"support": {
5332-
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
5332+
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
53335333
},
53345334
"funding": [
53355335
{
@@ -5340,6 +5340,10 @@
53405340
"url": "https://github.com/fabpot",
53415341
"type": "github"
53425342
},
5343+
{
5344+
"url": "https://github.com/nicolas-grekas",
5345+
"type": "github"
5346+
},
53435347
{
53445348
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
53455349
"type": "tidelift"
@@ -5349,23 +5353,23 @@
53495353
},
53505354
{
53515355
"name": "symfony/polyfill-php83",
5352-
"version": "v1.32.0",
5353-
"version_normalized": "1.32.0.0",
5356+
"version": "v1.33.0",
5357+
"version_normalized": "1.33.0.0",
53545358
"source": {
53555359
"type": "git",
53565360
"url": "https://github.com/symfony/polyfill-php83.git",
5357-
"reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
5361+
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
53585362
},
53595363
"dist": {
53605364
"type": "zip",
5361-
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
5362-
"reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
5365+
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
5366+
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
53635367
"shasum": ""
53645368
},
53655369
"require": {
53665370
"php": ">=7.2"
53675371
},
5368-
"time": "2024-09-09T11:45:10+00:00",
5372+
"time": "2025-07-08T02:45:35+00:00",
53695373
"type": "library",
53705374
"extra": {
53715375
"thanks": {
@@ -5408,7 +5412,7 @@
54085412
"shim"
54095413
],
54105414
"support": {
5411-
"source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
5415+
"source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
54125416
},
54135417
"funding": [
54145418
{
@@ -5419,6 +5423,10 @@
54195423
"url": "https://github.com/fabpot",
54205424
"type": "github"
54215425
},
5426+
{
5427+
"url": "https://github.com/nicolas-grekas",
5428+
"type": "github"
5429+
},
54225430
{
54235431
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
54245432
"type": "tidelift"
@@ -5428,23 +5436,23 @@
54285436
},
54295437
{
54305438
"name": "symfony/polyfill-php84",
5431-
"version": "v1.32.0",
5432-
"version_normalized": "1.32.0.0",
5439+
"version": "v1.33.0",
5440+
"version_normalized": "1.33.0.0",
54335441
"source": {
54345442
"type": "git",
54355443
"url": "https://github.com/symfony/polyfill-php84.git",
5436-
"reference": "000df7860439609837bbe28670b0be15783b7fbf"
5444+
"reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
54375445
},
54385446
"dist": {
54395447
"type": "zip",
5440-
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf",
5441-
"reference": "000df7860439609837bbe28670b0be15783b7fbf",
5448+
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
5449+
"reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
54425450
"shasum": ""
54435451
},
54445452
"require": {
54455453
"php": ">=7.2"
54465454
},
5447-
"time": "2025-02-20T12:04:08+00:00",
5455+
"time": "2025-06-24T13:30:11+00:00",
54485456
"type": "library",
54495457
"extra": {
54505458
"thanks": {
@@ -5487,7 +5495,7 @@
54875495
"shim"
54885496
],
54895497
"support": {
5490-
"source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0"
5498+
"source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
54915499
},
54925500
"funding": [
54935501
{
@@ -5498,6 +5506,10 @@
54985506
"url": "https://github.com/fabpot",
54995507
"type": "github"
55005508
},
5509+
{
5510+
"url": "https://github.com/nicolas-grekas",
5511+
"type": "github"
5512+
},
55015513
{
55025514
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
55035515
"type": "tidelift"

‎composer/installed.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,8 @@
764764
'dev_requirement' => false,
765765
),
766766
'symfony/polyfill-intl-normalizer' => array(
767-
'pretty_version' => 'v1.32.0',
768-
'version' => '1.32.0.0',
767+
'pretty_version' => 'v1.33.0',
768+
'version' => '1.33.0.0',
769769
'reference' => '3833d7255cc303546435cb650316bff708a1c75c',
770770
'type' => 'library',
771771
'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
@@ -797,18 +797,18 @@
797797
),
798798
),
799799
'symfony/polyfill-php83' => array(
800-
'pretty_version' => 'v1.32.0',
801-
'version' => '1.32.0.0',
802-
'reference' => '2fb86d65e2d424369ad2905e83b236a8805ba491',
800+
'pretty_version' => 'v1.33.0',
801+
'version' => '1.33.0.0',
802+
'reference' => '17f6f9a6b1735c0f163024d959f700cfbc5155e5',
803803
'type' => 'library',
804804
'install_path' => __DIR__ . '/../symfony/polyfill-php83',
805805
'aliases' => array(),
806806
'dev_requirement' => false,
807807
),
808808
'symfony/polyfill-php84' => array(
809-
'pretty_version' => 'v1.32.0',
810-
'version' => '1.32.0.0',
811-
'reference' => '000df7860439609837bbe28670b0be15783b7fbf',
809+
'pretty_version' => 'v1.33.0',
810+
'version' => '1.33.0.0',
811+
'reference' => 'd8ced4d875142b6a7426000426b8abc631d6b191',
812812
'type' => 'library',
813813
'install_path' => __DIR__ . '/../symfony/polyfill-php84',
814814
'aliases' => array(),

‎symfony/polyfill-php83/Php83.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static function json_validate(string $json, int $depth = 512, int $flags
3535
throw new \ValueError(sprintf('json_validate(): Argument #2 ($depth) must be less than %d', self::JSON_MAX_DEPTH));
3636
}
3737

38-
json_decode($json, null, $depth, $flags);
38+
json_decode($json, true, $depth, $flags);
3939

4040
return \JSON_ERROR_NONE === json_last_error();
4141
}

‎symfony/polyfill-php84/Php84.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,44 @@ private static function mb_internal_trim(string $regex, string $string, ?string
174174

175175
return mb_convert_encoding($string, $encoding, 'UTF-8');
176176
}
177+
178+
public static function grapheme_str_split(string $string, int $length)
179+
{
180+
if (0 > $length || 1073741823 < $length) {
181+
throw new \ValueError('grapheme_str_split(): Argument #2 ($length) must be greater than 0 and less than or equal to 1073741823.');
182+
}
183+
184+
if ('' === $string) {
185+
return [];
186+
}
187+
188+
$regex = ((float) \PCRE_VERSION < 10 ? (float) \PCRE_VERSION >= 8.32 : (float) \PCRE_VERSION >= 10.39)
189+
? '\X'
190+
: '(?:\r\n|(?:[ -~\x{200C}\x{200D}]|[ᆨ-ᇹ]+|[ᄀ-ᅟ]*(?:[가개갸걔거게겨계고과괘괴교구궈궤귀규그긔기까깨꺄꺠꺼께껴꼐꼬꽈꽤꾀꾜꾸꿔꿰뀌뀨끄끠끼나내냐냬너네녀녜노놔놰뇌뇨누눠눼뉘뉴느늬니다대댜댸더데뎌뎨도돠돼되됴두둬뒈뒤듀드듸디따때땨떄떠떼뗘뗴또똬뙈뙤뚀뚜뚸뛔뛰뜌뜨띄띠라래랴럐러레려례로롸뢔뢰료루뤄뤠뤼류르릐리마매먀먜머메며몌모뫄뫠뫼묘무뭐뭬뮈뮤므믜미바배뱌뱨버베벼볘보봐봬뵈뵤부붜붸뷔뷰브븨비빠빼뺘뺴뻐뻬뼈뼤뽀뽜뽸뾔뾰뿌뿨쀄쀠쀼쁘쁴삐사새샤섀서세셔셰소솨쇄쇠쇼수숴쉐쉬슈스싀시싸쌔쌰썌써쎄쎠쎼쏘쏴쐐쐬쑈쑤쒀쒜쒸쓔쓰씌씨아애야얘어에여예오와왜외요우워웨위유으의이자재쟈쟤저제져졔조좌좨죄죠주줘줴쥐쥬즈즤지짜째쨔쨰쩌쩨쪄쪠쪼쫘쫴쬐쬬쭈쭤쮀쮜쮸쯔쯰찌차채챠챼처체쳐쳬초촤쵀최쵸추춰췌취츄츠츼치카캐캬컈커케켜켸코콰쾌쾨쿄쿠쿼퀘퀴큐크킈키타태탸턔터테텨톄토톼퇘퇴툐투퉈퉤튀튜트틔티파패퍄퍠퍼페펴폐포퐈퐤푀표푸풔풰퓌퓨프픠피하해햐햬허헤혀혜호화홰회효후훠훼휘휴흐희히]?[ᅠ-ᆢ]+|[가-힣])[ᆨ-ᇹ]*|[ᄀ-ᅟ]+|[^\p{Cc}\p{Cf}\p{Zl}\p{Zp}])[\p{Mn}\p{Me}\x{09BE}\x{09D7}\x{0B3E}\x{0B57}\x{0BBE}\x{0BD7}\x{0CC2}\x{0CD5}\x{0CD6}\x{0D3E}\x{0D57}\x{0DCF}\x{0DDF}\x{200C}\x{200D}\x{1D165}\x{1D16E}-\x{1D172}]*|[\p{Cc}\p{Cf}\p{Zl}\p{Zp}])';
191+
192+
if (!preg_match_all('/'. $regex .'/u', $string, $matches)) {
193+
return false;
194+
}
195+
196+
if (1 === $length) {
197+
return $matches[0];
198+
}
199+
200+
$chunks = array_chunk($matches[0], $length);
201+
foreach ($chunks as &$chunk) {
202+
$chunk = implode('', $chunk);
203+
}
204+
205+
return $chunks;
206+
}
207+
208+
public static function bcdivmod(string $num1, string $num2, ?int $scale = null): ?array
209+
{
210+
if (null === $quot = \bcdiv($num1, $num2, 0)) {
211+
return null;
212+
}
213+
$scale = $scale ?? (\PHP_VERSION_ID >= 70300 ? \bcscale() : (ini_get('bcmath.scale') ?: 0));
214+
215+
return [$quot, \bcmod($num1, $num2, $scale)];
216+
}
177217
}

0 commit comments

Comments
 (0)