Skip to content

Commit 23537e5

Browse files
korridorkorridor
committed
Laravel 10 support
1 parent 0ed7328 commit 23537e5

13 files changed

+364
-376
lines changed

‎.gitattributes

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
/phpunit.xml.old export-ignore
44
/phpcs.xml export-ignore
55
/docker export-ignore
6-
/.travis.yml export-ignore
7-
/.styleci.yml export-ignore
8-
/.php_cs export-ignore
9-
/.editorconfig export-ignore
6+
/.php-cs-fixer.php export-ignore
7+
/.editorconfig export-ignore
108
/.gitattributes export-ignore
119
/.gitignore export-ignore
10+
/.github export-ignore
11+
/coverage export-ignore
12+
/.phpunit.cache export-ignore

‎.github/workflows/unittests.yml

+8-40
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,6 @@ jobs:
77
strategy:
88
matrix:
99
include:
10-
# Laravel 6.*
11-
- php: 7.4
12-
laravel: 6.*
13-
testbench: 4.*
14-
composer-flag: '--prefer-stable'
15-
- php: 8.0
16-
laravel: 6.*
17-
testbench: 4.*
18-
composer-flag: '--prefer-stable'
19-
# Laravel 7.*
20-
- php: 7.4
21-
laravel: 7.*
22-
testbench: 5.*
23-
composer-flag: '--prefer-stable'
24-
- php: 8.0
25-
laravel: 7.*
26-
testbench: 5.*
27-
composer-flag: '--prefer-stable'
28-
# Laravel 8.*
29-
- php: 7.4
30-
laravel: 8.*
31-
testbench: 6.*
32-
composer-flag: '--prefer-stable'
33-
- php: 8.0
34-
laravel: 8.*
35-
testbench: 6.*
36-
composer-flag: '--prefer-stable'
37-
- php: 8.1
38-
laravel: 8.*
39-
testbench: 6.*
40-
composer-flag: '--prefer-stable'
41-
# Laravel 9.*
42-
- php: 8.0
43-
laravel: 9.*
44-
testbench: 7.*
45-
composer-flag: '--prefer-stable'
46-
- php: 8.1
47-
laravel: 9.*
48-
testbench: 7.*
49-
composer-flag: '--prefer-stable'
5010
# Laravel 10.*
5111
- php: 8.1
5212
laravel: 10.*
@@ -56,6 +16,14 @@ jobs:
5616
laravel: 10.*
5717
testbench: 8.*
5818
composer-flag: '--prefer-stable'
19+
- php: 8.1
20+
laravel: 10.*
21+
testbench: 8.*
22+
composer-flag: '--prefer-lowest'
23+
- php: 8.2
24+
laravel: 10.*
25+
testbench: 8.*
26+
composer-flag: '--prefer-lowest'
5927

6028
runs-on: ubuntu-latest
6129

‎.travis.yml

-60
This file was deleted.

‎composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
],
1212
"license": "MIT",
1313
"require": {
14-
"php": "^7.4|^8.0",
15-
"illuminate/support": "^6|^7|^8|^9|^10",
16-
"illuminate/database": "^6|^7|^8|^9|^10"
14+
"php": ">=8.1",
15+
"illuminate/support": "^10",
16+
"illuminate/database": "^10"
1717
},
1818
"require-dev": {
19-
"orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0|^8.0",
20-
"phpunit/phpunit": "^7|^8|^9|^10",
19+
"orchestra/testbench": "^8.0",
20+
"phpunit/phpunit": "^10",
2121
"friendsofphp/php-cs-fixer": "^3.6",
2222
"squizlabs/php_codesniffer": "^3.5"
2323
},
@@ -33,7 +33,7 @@
3333
},
3434
"scripts": {
3535
"test": "vendor/bin/phpunit",
36-
"test-coverage": "vendor/bin/phpunit --coverage-html coverage",
36+
"test-coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text --coverage-html coverage",
3737
"fix": "./vendor/bin/php-cs-fixer fix",
3838
"lint": "./vendor/bin/phpcs --extensions=php"
3939
},

‎license.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22
=====================
33

4-
Copyright © `2021` `korridor`
4+
Copyright © `2023` `korridor`
55

66
Permission is hereby granted, free of charge, to any person
77
obtaining a copy of this software and associated documentation

‎phpunit.xml

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
3-
<coverage>
4-
<include>
5-
<directory suffix=".php">src/</directory>
6-
</include>
7-
</coverage>
8-
<testsuites>
9-
<testsuite name="Feature">
10-
<directory>tests/Feature</directory>
11-
</testsuite>
12-
</testsuites>
13-
<php>
14-
<env name="DB_CONNECTION" value="testing"/>
15-
</php>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
3+
colors="true" processIsolation="false" stopOnFailure="false"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache"
5+
backupStaticProperties="false">
6+
<coverage>
7+
<include>
8+
<directory suffix=".php">src/</directory>
9+
</include>
10+
</coverage>
11+
<testsuites>
12+
<testsuite name="Feature">
13+
<directory>tests/Feature</directory>
14+
</testsuite>
15+
</testsuites>
16+
<php>
17+
<env name="DB_CONNECTION" value="testing"/>
18+
</php>
1619
</phpunit>

‎readme.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It uses Eloquent models instead of directly querying the database.
1212

1313
**Advantages**
1414
- The rule can be easily extended with the Eloquent builder. (scopes etc.)
15-
- Softdeletes are working out of the box.
15+
- Soft deletes are working out of the box.
1616
- Logic implemented into the models work in the validation as well. (multi tenancy system, etc.)
1717

1818
## Installation
@@ -23,15 +23,17 @@ You can install the package via composer with following command:
2323
composer require korridor/laravel-model-validation-rules
2424
```
2525

26+
If you want to use this package with older Laravel/PHP version please install the 2.1.* version.
27+
28+
```bash
29+
composer require korridor/laravel-model-validation-rules "^2.1"
30+
```
31+
2632
### Requirements
2733

2834
This package is tested for the following Laravel and PHP versions:
2935

3036
- 10.* (PHP 8.1, 8.2)
31-
- 9.* (PHP 8.0, 8.1)
32-
- 8.* (PHP 7.4, 8.0, 8.1)
33-
- 7.* (PHP 7.4, 8.0)
34-
- 6.* (PHP 7.4, 8.0)
3537

3638
## Usage examples
3739

0 commit comments

Comments
 (0)