Skip to content

Commit

Permalink
Merge branch '8.5' into 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Aug 14, 2023
2 parents 6904cfa + 998b825 commit d6a232a
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpab" version="^1.25" installed="1.28.0" location="./tools/phpab" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.22.0" location="./tools/php-cs-fixer" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.23.0" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.0" installed="5.14.1" location="./tools/psalm" copy="true"/>
<phar name="humbug/php-scoper" version="^0.18.1" installed="0.18.3" location="./tools/php-scoper" copy="true"/>
<phar name="composer" version="^2.0.3" installed="2.5.8" location="./tools/composer" copy="true"/>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/CoverageTwoDefaultClassAnnotations.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php declare(strict_types=1);

/*
* This file is part of PHPUnit.
*
Expand Down
1 change: 1 addition & 0 deletions tests/end-to-end/phar/src/autoload.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php declare(strict_types=1);

/*
* This file is part of PHPUnit.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php declare(strict_types=1);

/*
* This file is part of PHPUnit.
*
Expand Down
1 change: 1 addition & 0 deletions tests/end-to-end/regression/797/bootstrap797.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php declare(strict_types=1);

/*
* This file is part of PHPUnit.
*
Expand Down
1 change: 1 addition & 0 deletions tests/end-to-end/regression/873/Issue873Test.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php declare(strict_types=1);

/*
* This file is part of PHPUnit.
*
Expand Down
Binary file modified tools/php-cs-fixer
Binary file not shown.

0 comments on commit d6a232a

Please sign in to comment.