Skip to content

Commit c2a1611

Browse files
Merge pull request #134 from Laravel-Lang/2.x
Added support for publisher version 15
2 parents 4289d82 + f9b9646 commit c2a1611

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.github/workflows/phpunit.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ jobs:
88
laravel:
99
runs-on: ubuntu-latest
1010

11-
name: PHP Unit
11+
strategy:
12+
fail-fast: true
13+
matrix:
14+
php: [ "8.1", "8.2" ]
15+
publisher: [ "14.0", "15.0" ]
16+
17+
name: PHP ${{ matrix.php }}, Publisher ${{ matrix.publisher }}
1218

1319
steps:
1420
- name: Checkout code
@@ -17,13 +23,14 @@ jobs:
1723
- name: Setup PHP
1824
uses: shivammathur/setup-php@v2
1925
with:
26+
php-version: ${{ matrix.php }}
2027
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
2128
coverage: xdebug
2229
env:
2330
COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
2431

2532
- name: Install dependencies
26-
run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
33+
run: composer require laravel-lang/publisher:^${{ matrix.publisher }}
2734

2835
- name: Execute tests
2936
run: sudo vendor/bin/phpunit --colors=always

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727
"require": {
2828
"php": "^8.1",
2929
"ext-json": "*",
30-
"laravel-lang/publisher": "^14.0"
30+
"laravel-lang/publisher": "^14.0 || ^15.0"
3131
},
3232
"require-dev": {
33-
"laravel-lang/status-generator": "^1.19",
33+
"laravel-lang/status-generator": "^1.19 || ^2.0",
3434
"phpunit/phpunit": "^10.0",
3535
"symfony/var-dumper": "^6.0"
3636
},
3737
"minimum-stability": "stable",
3838
"prefer-stable": true,
3939
"autoload": {
4040
"psr-4": {
41-
"LaravelLang\\Attributes\\": "src"
41+
"LaravelLang\\Attributes\\": "src/"
4242
}
4343
},
4444
"autoload-dev": {
4545
"psr-4": {
46-
"Tests\\": "tests"
46+
"Tests\\": "tests/"
4747
}
4848
},
4949
"config": {

phpunit.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
4-
backupGlobals="false"
5-
backupStaticProperties="false"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
64
bootstrap="vendor/autoload.php"
7-
cacheDirectory=".phpunit.cache"
85
cacheResult="false"
96
colors="true"
10-
processIsolation="false"
11-
stopOnError="false"
12-
stopOnFailure="false"
137
>
148
<coverage>
159
<report>
@@ -23,12 +17,12 @@
2317
</php>
2418
<testsuites>
2519
<testsuite name="Test Suite">
26-
<directory suffix="Test.php">./tests</directory>
20+
<directory>./tests</directory>
2721
</testsuite>
2822
</testsuites>
2923
<source>
3024
<include>
31-
<directory suffix=".php">./src</directory>
25+
<directory>./src</directory>
3226
</include>
3327
</source>
3428
</phpunit>

0 commit comments

Comments
 (0)