Skip to content

Commit

Permalink
Merge pull request #2 from Assisted-Mindfulness/updated
Browse files Browse the repository at this point in the history
added phpunit 10
  • Loading branch information
tabuna authored Feb 24, 2023
2 parents 4a5febb + 66e55f1 commit 784ca99
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 39 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.1, 8.0 ]
php: [ 8.2, 8.1]
os: [ ubuntu-latest, windows-latest ]
laravel: [ 9.* ]
laravel: [ 10.* ]
dependency-version: [ prefer-lowest, prefer-stable ]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*

name: P${{ matrix.php }} - ${{ matrix.os }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}

Expand All @@ -41,4 +41,4 @@ jobs:
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
- name: Execute tests (Unit and Feature tests) via PHPUnit 🧪
run: vendor/bin/phpunit --verbose
run: vendor/bin/phpunit
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
}
],
"require": {
"php": "^8.0",
"illuminate/support": "^9.0",
"php": "^8.1",
"illuminate/support": "^9.0|^10.0",
"brick/math": "^0.9.3"
},
"require-dev": {
"phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^9.5.14",
"phpunit/phpunit": "^9.5.14|^10",
"symfony/var-dumper": "^6.0"
},
"autoload-dev": {
Expand Down
38 changes: 7 additions & 31 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
stopOnError="false"
defaultTestSuite="Main"
verbose="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<directory suffix=".blade.php">./src/</directory>
</exclude>
<report>
<clover outputFile="clover.xml"/>
</report>
</coverage>
<testsuites>
<testsuite name="Main">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<logging/>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" stopOnError="false" defaultTestSuite="Main" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="Main">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<logging/>
</phpunit>

0 comments on commit 784ca99

Please sign in to comment.