Skip to content

Commit

Permalink
Merge pull request #331 from Laravel-Lang/14.x
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
andrey-helldar authored Aug 9, 2023
2 parents 7c4ac6b + 1058480 commit 4e6fa2d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
php-version: ${{ matrix.php }}
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
coverage: none
coverage: xdebug
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
"composer/semver": "^3.3",
"dragon-code/pretty-array": "^4.0",
"dragon-code/support": "^6.3",
"illuminate/console": "^8.79 || ^9.18 || ^10.0",
"illuminate/support": "^8.79 || ^9.18 || ^10.0",
"illuminate/console": "^8.79 || ^9.18 || ^10.0 || ^11.0",
"illuminate/support": "^8.79 || ^9.18 || ^10.0 || ^11.0",
"league/commonmark": "^2.3",
"league/config": "^1.2"
},
"require-dev": {
"laravel-lang/json-fallback-hotfix": "^1.0",
"orchestra/testbench": "^6.25 || ^7.22 || ^8.0",
"phpunit/phpunit": "^9.6",
"orchestra/testbench": "^6.25 || ^7.22 || ^8.0 || ^9.0",
"phpunit/phpunit": "^9.6 || ^10.0",
"symfony/var-dumper": "^5.0 || ^6.0"
},
"conflict": {
Expand Down
62 changes: 37 additions & 25 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,46 @@
~
~ @author Andrey Helldar <helldar@dragon-code.pro>
~
~ @copyright 2022 Andrey Helldar
~ @copyright 2023 Andrey Helldar
~
~ @license MIT
~
~ @see https://github.com/Laravel-Lang/publisher
-->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" cacheResult="false" backupGlobals="false" backupStaticAttributes="false" bootstrap="phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" verbose="true">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<file>src/ServiceProvider.php</file>
<directory suffix=".php">src/Facades</directory>
</exclude>
<report>
<clover outputFile="build/logs/clover.xml"/>
<html outputDirectory="build/logs/coverage"/>
<text outputFile="build/logs/coverage.txt"/>
</report>
</coverage>
<php>
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
</php>
<testsuites>
<testsuite name="Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
backupGlobals="false"
backupStaticProperties="false"
bootstrap="phpunit.php"
cacheDirectory=".phpunit.cache"
cacheResult="false"
colors="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
>
<coverage>
<report>
<clover outputFile="build/logs/clover.xml" />
<html outputDirectory="build/logs/coverage" />
<text outputFile="build/logs/coverage.txt" />
</report>
</coverage>
<php>
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF" />
</php>
<testsuites>
<testsuite name="Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<file>src/ServiceProvider.php</file>
<directory suffix=".php">src/Facades</directory>
</exclude>
</source>
</phpunit>

0 comments on commit 4e6fa2d

Please sign in to comment.