diff --git a/.gitignore b/.gitignore index 106ff4c..8e75dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /vendor composer.lock /.idea -.phpunit.result.cache \ No newline at end of file +/.phpunit.cache \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b04baa2..e9c55c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.7.2] - 2023-12-07 +### Added +- support `laravel` version `10` by change composer require for laravel to `>=7.0` +- update phpunit to `^10` + ## [1.7.1] - 2022-03-03 ### Fixed - wrong return phpdoc in Step.php @@ -78,3 +83,5 @@ And will be changed to non-static [1.5.0]: https://github.com/smajti1/laravel-wizard/compare/v1.4.0...v1.5.0 [1.6.0]: https://github.com/smajti1/laravel-wizard/compare/v1.5.0...v1.6.0 [1.7.0]: https://github.com/smajti1/laravel-wizard/compare/v1.6.0...v1.7.0 +[1.7.1]: https://github.com/smajti1/laravel-wizard/compare/v1.7.0...v1.7.1 +[1.7.2]: https://github.com/smajti1/laravel-wizard/compare/v1.7.1...v1.7.2 diff --git a/README.md b/README.md index 5d72b7e..9ec9638 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ simple laravel step-by-step wizard -| Version | Laravel Version | Php Version | -|---- |----|----| -| ^1.6 | 7.* || 8.* || 9.* | ^7.3 || ^8.0 | -| ^1.4 | 6.* || 7.* || 8.* | ^7.2 || ^8.0 | -| 1.1 | 5.* | ^7.0 | +| Version | Laravel Version | Php Version | +|---------|---------------------------------------|------------------------| +| ^1.6 | \>= 7.0 | ^7.3 || ^8.0 | +| ^1.4 | 6.* || 7.* || 8.* | ^7.2 || ^8.0 | +| 1.1 | 5.* | ^7.0 | ## Install diff --git a/attach.sh b/attach.sh index 9c7fc22..ef211ab 100755 --- a/attach.sh +++ b/attach.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker-compose exec --user www-data web bash +docker compose exec --user www-data web bash diff --git a/composer.json b/composer.json index 28dc078..ffc656c 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,10 @@ "homepage": "https://github.com/smajti1/laravel-wizard", "require": { "php": "^7.3 || ^8.0", - "illuminate/http": "^7.0 || ^8.0 || ^9.0" + "illuminate/http": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^10.5", "phpstan/phpstan": "^1.4" }, "autoload": { @@ -27,5 +27,9 @@ "psr-4": { "Smajti1\\LaravelWizard\\Test\\": "tests/" } + }, + "scripts": { + "phpunit": "./vendor/bin/phpunit", + "phpstan": "vendor/bin/phpstan analyse --configuration=phpstan.neon" } } diff --git a/phpunit.xml b/phpunit.xml index 4a81430..27fb46e 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,22 +1,23 @@ - - - - ./src/ - - + ./tests/ + + + ./src/ + + diff --git a/tests/WizardTest.php b/tests/WizardTest.php index 86e5309..550f2d4 100644 --- a/tests/WizardTest.php +++ b/tests/WizardTest.php @@ -31,10 +31,8 @@ class WizardTest extends TestCase /** @var string */ protected $wizardThirdStepKey; - public function __construct() + protected function setUp(): void { - parent::__construct(); - $this->wizardFirstStepKey = 'first_step_key'; $this->wizardThirdStepKey = 'step_key_third'; $this->steps = [