Skip to content

Commit

Permalink
Merge pull request #18 from JacobBennett/tests/jb-l11-test-fixes
Browse files Browse the repository at this point in the history
Fix L11 Shift tests
  • Loading branch information
aarondfrancis authored Mar 15, 2024
2 parents 246701f + ad4284a commit 1b3ce0d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 45 deletions.
40 changes: 22 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,38 @@ on:
push:
branches:
- main

pull_request:
types: [ opened, synchronize, reopened ]
types:
- opened
- synchronize
- reopened

jobs:
test:
runs-on: ubuntu-latest

if: "!contains(github.event.head_commit.message, 'ci skip')"

strategy:
fail-fast: false
matrix:
php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
laravel: [ 7.*, 8.*, 9.* , 10.*]
dependency-version: [ prefer-lowest, prefer-stable ]
php: [7.2, 7.3, 7.4, 8.0, 8.1, '8.2']
laravel: ['7.*', '8.*', '9.*', '10.*', '11.*']
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 7.*
testbench: 5.*

- laravel: 7.*
dependency-version: prefer-lowest
composer-version: --1

- laravel: 8.*
testbench: 6.*

- laravel: 9.*
testbench: 7.*

- laravel: 11.*
testbench: 9.*
exclude:
- laravel: 10.*
php: 7.2
Expand All @@ -45,25 +47,27 @@ jobs:
php: 8.0
- laravel: 7.*
php: 8.1

- laravel: 8.*
php: 8.1
dependency-version: prefer-lowest

# Laravel 8 requires PHP 7.3.
- laravel: 8.*
php: 7.2

# Laravel 9 requires PHP 8.
- laravel: 9.*
php: 7.2

- laravel: 9.*
php: 7.3

- laravel: 9.*
php: 7.4

- laravel: 11.*
php: 7.2
- laravel: 11.*
php: 7.3
- laravel: 11.*
php: 7.4
- laravel: 11.*
php: 8.0
- laravel: 11.*
php: 8.1

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

Expand Down Expand Up @@ -91,4 +95,4 @@ jobs:
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
- name: Execute tests
run: vendor/bin/phpunit
run: vendor/bin/phpunit
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
],
"require": {
"php": "^7.2|^8.0",
"illuminate/support": "^7.0|^8.0|^9.0|^10.0",
"illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
"illuminate/console": "^7.0|^8.0|^9.0|^10.0"
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/console": "^7.0|^8.0|^9.0|^10.0|^11.0"
},
"require-dev": {
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
"mockery/mockery": "^1.3.3",
"phpunit/phpunit": "^8.4|^9.5"
"phpunit/phpunit": "^8.4|^9.5|^10.5"
},
"autoload": {
"psr-4": {
Expand Down
36 changes: 14 additions & 22 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="TBD Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<php>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<testsuites>
<testsuite name="TBD Test Suite">
<directory>tests</directory>
<exclude>tests/BaseTest.php</exclude>
</testsuite>
</testsuites>
<php>
</php>
</phpunit>
<source>
<include>
<directory suffix=".php">src/</directory>
</include>
</source>
</phpunit>

0 comments on commit 1b3ce0d

Please sign in to comment.