Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Laravel 10 Support #41

Merged
merged 4 commits into from
Mar 18, 2024
Merged

Adding Laravel 10 Support #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2b3fdb
Preparing the develop branch
arcanedev-maroc Mar 11, 2022
18bf4fa
Adding Laravel 10 support
arcanedev-maroc Mar 18, 2024
0b1f566
Updating the phpunit config file
arcanedev-maroc Mar 18, 2024
2232eff
Fixing the tests
arcanedev-maroc Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.0, 8.1]
php: [8.1, 8.2, 8.3]
dependency-version: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.idea
/.phpunit.cache
/build
/vendor
.phpunit.result.cache
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checks:
tools:
external_code_coverage:
timeout: 600
runs: 4
runs: 2
php_code_sniffer:
enabled: true
config:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LaravelSettin

### Features

* Laravel `5.2` to `9.x` are supported.
* Laravel `5.2` to `10.x` are supported.
* Multiple store drivers: `array`, `json`, `database`, `redis`.
* Easy setup & configuration.
* Well documented & IDE Friendly.
Expand All @@ -45,7 +45,7 @@ Any ideas are welcome. Feel free to submit any issues or pull requests, please c
- [All Contributors][link-contributors]

[badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-settings.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-5.2%20to%209.x-orange.svg?style=flat-square
[badge_laravel]: https://img.shields.io/badge/Laravel-5.2%20to%2010.x-orange.svg?style=flat-square
[badge_build]: https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelSettings/run-tests?style=flat-square
[badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelSettings.svg?style=flat-square
[badge_quality]: https://img.shields.io/scrutinizer/g/ARCANEDEV/LaravelSettings.svg?style=flat-square
Expand Down
31 changes: 17 additions & 14 deletions _docs/1-Installation-and-Setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@

## Version Compatibility

| Laravel | LaravelSettings |
|:-----------------------------|:----------------------------------------------|
| ![Laravel v9.x][laravel_9_x] | ![LaravelSettings v9.x][laravel_settings_9_x] |
| ![Laravel v8.x][laravel_8_x] | ![LaravelSettings v8.x][laravel_settings_8_x] |
| ![Laravel v7.x][laravel_7_x] | ![LaravelSettings v7.x][laravel_settings_7_x] |
| ![Laravel v6.x][laravel_6_x] | ![LaravelSettings v6.x][laravel_settings_6_x] |
| ![Laravel v5.8][laravel_5_8] | ![LaravelSettings v5.x][laravel_settings_5_x] |
| ![Laravel v5.7][laravel_5_7] | ![LaravelSettings v4.x][laravel_settings_4_x] |
| ![Laravel v5.6][laravel_5_6] | ![LaravelSettings v3.x][laravel_settings_3_x] |
| ![Laravel v5.5][laravel_5_5] | ![LaravelSettings v2.x][laravel_settings_2_x] |
| ![Laravel v5.4][laravel_5_4] | ![LaravelSettings v1.x][laravel_settings_1_x] |
| ![Laravel v5.3][laravel_5_3] | ![LaravelSettings v0.x][laravel_settings_0_x] |
| ![Laravel v5.2][laravel_5_2] | ![LaravelSettings v0.x][laravel_settings_0_x] |

| Laravel | LaravelSettings |
|:-------------------------------|:------------------------------------------------|
| ![Laravel v10.x][laravel_10_x] | ![LaravelSettings v10.x][laravel_settings_10_x] |
| ![Laravel v9.x][laravel_9_x] | ![LaravelSettings v9.x][laravel_settings_9_x] |
| ![Laravel v8.x][laravel_8_x] | ![LaravelSettings v8.x][laravel_settings_8_x] |
| ![Laravel v7.x][laravel_7_x] | ![LaravelSettings v7.x][laravel_settings_7_x] |
| ![Laravel v6.x][laravel_6_x] | ![LaravelSettings v6.x][laravel_settings_6_x] |
| ![Laravel v5.8][laravel_5_8] | ![LaravelSettings v5.x][laravel_settings_5_x] |
| ![Laravel v5.7][laravel_5_7] | ![LaravelSettings v4.x][laravel_settings_4_x] |
| ![Laravel v5.6][laravel_5_6] | ![LaravelSettings v3.x][laravel_settings_3_x] |
| ![Laravel v5.5][laravel_5_5] | ![LaravelSettings v2.x][laravel_settings_2_x] |
| ![Laravel v5.4][laravel_5_4] | ![LaravelSettings v1.x][laravel_settings_1_x] |
| ![Laravel v5.3][laravel_5_3] | ![LaravelSettings v0.x][laravel_settings_0_x] |
| ![Laravel v5.2][laravel_5_2] | ![LaravelSettings v0.x][laravel_settings_0_x] |

[laravel_10_x]: https://img.shields.io/badge/version-10.x-blue.svg?style=flat-square "Laravel v10.x"
[laravel_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "Laravel v9.x"
[laravel_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "Laravel v8.x"
[laravel_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "Laravel v7.x"
Expand All @@ -34,6 +36,7 @@
[laravel_5_3]: https://img.shields.io/badge/version-5.3-blue.svg?style=flat-square "Laravel v5.3"
[laravel_5_2]: https://img.shields.io/badge/version-5.2-blue.svg?style=flat-square "Laravel v5.2"

[laravel_settings_10_x]: https://img.shields.io/badge/version-10.x-blue.svg?style=flat-square "LaravelSettings v10.x"
[laravel_settings_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "LaravelSettings v9.x"
[laravel_settings_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "LaravelSettings v8.x"
[laravel_settings_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "LaravelSettings v7.x"
Expand Down
16 changes: 8 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"type": "library",
"license": "MIT",
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"arcanedev/support": "^9.0"
"arcanedev/support": "^10.0"
},
"require-dev": {
"laravel/framework": "^9.0",
"mockery/mockery": "^1.4.2",
"orchestra/testbench-core": "^7.0",
"phpunit/phpunit": "^9.5.10",
"predis/predis": "^1.1.9"
"laravel/framework": "^10.0",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^8.18",
"phpunit/phpunit": "^10.0.7",
"predis/predis": "^2.0.2"
},
"autoload": {
"psr-4": {
Expand All @@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-develop": "9.x-dev"
"dev-develop": "10.x-dev"
},
"laravel": {
"providers": [
Expand Down
7 changes: 4 additions & 3 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
cacheDirectory=".phpunit.cache"
>
<testsuites>
<testsuite name="Package Test Suite">
<directory suffix=".php">./tests</directory>
<directory>./tests</directory>
</testsuite>
</testsuites>
<coverage processUncoveredFiles="true">
<coverage>
<include>
<directory suffix=".php">./src</directory>
<directory suffix=".php">src</directory>
</include>
<report>
<clover outputFile="build/coverage/clover.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/Stores/AbstractStoreTest.php → tests/Stores/AbstractStoreTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* @author ARCANEDEV <[email protected]>
*/
abstract class AbstractStoreTest extends TestCase
abstract class AbstractStoreTestCase extends TestCase
{
/* -----------------------------------------------------------------
| Main Methods
Expand Down
2 changes: 1 addition & 1 deletion tests/Stores/ArrayStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* @author ARCANEDEV <[email protected]>
*/
class ArrayStoreTest extends AbstractStoreTest
class ArrayStoreTest extends AbstractStoreTestCase
{
/* -----------------------------------------------------------------
| Main Methods
Expand Down
2 changes: 1 addition & 1 deletion tests/Stores/DatabaseStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @author ARCANEDEV <[email protected]>
*/
class DatabaseStoreTest extends AbstractStoreTest
class DatabaseStoreTest extends AbstractStoreTestCase
{
/* -----------------------------------------------------------------
| Main Methods
Expand Down
2 changes: 1 addition & 1 deletion tests/Stores/JsonStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* @author ARCANEDEV <[email protected]>
*/
class JsonStoreTest extends AbstractStoreTest
class JsonStoreTest extends AbstractStoreTestCase
{
/* -----------------------------------------------------------------
| Main Methods
Expand Down
2 changes: 1 addition & 1 deletion tests/Stores/RedisStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* @author ARCANEDEV <[email protected]>
*/
class RedisStoreTest extends AbstractStoreTest
class RedisStoreTest extends AbstractStoreTestCase
{
/* -----------------------------------------------------------------
| Main Methods
Expand Down
Loading