Skip to content

Commit a8f3e3d

Browse files
Merge branch '12.5'
* 12.5: Update dependencies Update tools Update ChangeLog Reorganize Remove now duplicated events Report invalid data provider on exceptions
2 parents 2e7a9b3 + b286e9a commit a8f3e3d

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
44
<phar name="php-cs-fixer" version="^3.80" installed="3.89.2" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.18" location="./tools/php-scoper" copy="true"/>
6-
<phar name="composer" version="^2.8" installed="2.9.0" location="./tools/composer" copy="true"/>
6+
<phar name="composer" version="^2.8" installed="2.9.1" location="./tools/composer" copy="true"/>
77
</phive>

composer.lock

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

tools/.phpstan/vendor/composer/installed.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php return array(
22
'root' => array(
33
'name' => '__root__',
4-
'pretty_version' => '12.5.x-dev',
5-
'version' => '12.5.9999999.9999999-dev',
6-
'reference' => '48e4bfd6c671ec0410cf92447e73bde6598539ba',
4+
'pretty_version' => 'dev-main',
5+
'version' => 'dev-main',
6+
'reference' => '358e859c96577eff74ac67d5356edd4618adbbd4',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
1010
'dev' => true,
1111
),
1212
'versions' => array(
1313
'__root__' => array(
14-
'pretty_version' => '12.5.x-dev',
15-
'version' => '12.5.9999999.9999999-dev',
16-
'reference' => '48e4bfd6c671ec0410cf92447e73bde6598539ba',
14+
'pretty_version' => 'dev-main',
15+
'version' => 'dev-main',
16+
'reference' => '358e859c96577eff74ac67d5356edd4618adbbd4',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),

tools/.phpstan/vendor/phpstan/extension-installer/src/GeneratedConfig.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class GeneratedConfig
1212
public const EXTENSIONS = array (
1313
'ergebnis/phpstan-rules' =>
1414
array (
15-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
15+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/ergebnis/phpstan-rules',
1616
'relative_install_path' => '../../../ergebnis/phpstan-rules',
1717
'extra' =>
1818
array (
@@ -26,7 +26,7 @@ final class GeneratedConfig
2626
),
2727
'phpstan/phpstan-strict-rules' =>
2828
array (
29-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
29+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/phpstan/phpstan-strict-rules',
3030
'relative_install_path' => '../../phpstan-strict-rules',
3131
'extra' =>
3232
array (
@@ -40,7 +40,7 @@ final class GeneratedConfig
4040
),
4141
'tomasvotruba/type-coverage' =>
4242
array (
43-
'install_path' => '/usr/local/src/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
43+
'install_path' => '/Users/sb/Work/OpenSource/phpunit/tools/.phpstan/vendor/tomasvotruba/type-coverage',
4444
'relative_install_path' => '../../../tomasvotruba/type-coverage',
4545
'extra' =>
4646
array (

tools/composer

481 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)