Skip to content

Commit

Permalink
Feat laravel 10 (#437)
Browse files Browse the repository at this point in the history
* Add editorconfig

* Update versions

* Migrate phpunit
  • Loading branch information
barryvdh authored Feb 5, 2023
1 parent 638e378 commit 17f5f11
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 41 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org

root = true

[*]
charset = utf-8
indent_size = 4
indent_style = space
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
19 changes: 5 additions & 14 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,12 @@ jobs:

strategy:
matrix:
php: [8.0, 7.4, 7.3, 7.2]
laravel: [8.*, 7.*, 6.*]
php: [8.2, 8.1, 8.0]
laravel: [10.*, 9.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 9.*
php: 8.1
dependency-version: prefer-stable
- laravel: 9.*
php: 8.0
dependency-version: prefer-lowest
exclude:
- laravel: 8.*
php: 7.2
- php: 8.0
dependency-version: prefer-lowest
- laravel: 10.*
php: 8.0

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

Expand All @@ -54,4 +45,4 @@ jobs:
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
- name: Execute Unit Tests
run: composer test
run: composer test
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
],
"require": {
"php": ">=7.2",
"illuminate/support": "^6|^7|^8|^9",
"illuminate/translation": "^6|^7|^8|^9",
"symfony/finder": "^4|^5|^6"
"illuminate/support": "^9|^10",
"illuminate/translation": "^9|^10",
"symfony/finder": "^6"
},
"require-dev": {
"orchestra/testbench": "^4|^5|^6|^7"
"orchestra/testbench": "^7|^8"
},
"suggest": {
"tanmuhittin/laravel-google-translate": "If you want to translate using Google API"
Expand Down
35 changes: 12 additions & 23 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
>
<testsuites>
<testsuite name="Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./src</directory>
</whitelist>
</filter>
</phpunit>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<coverage>
<include>
<directory>./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Test Suite">
<directory>./tests/</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 17f5f11

Please sign in to comment.