Skip to content

Commit

Permalink
add support for laravel >= 10 and upgrade phpunit to version 10 (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
smajti1 authored Dec 7, 2023
1 parent f3a5081 commit 7c95b03
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/vendor
composer.lock
/.idea
.phpunit.result.cache
/.phpunit.cache
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion attach.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

docker-compose exec --user www-data web bash
docker compose exec --user www-data web bash
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -27,5 +27,9 @@
"psr-4": {
"Smajti1\\LaravelWizard\\Test\\": "tests/"
}
},
"scripts": {
"phpunit": "./vendor/bin/phpunit",
"phpstan": "vendor/bin/phpstan analyse --configuration=phpstan.neon"
}
}
21 changes: 11 additions & 10 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
>
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src/</directory>
</include>
</coverage>
<coverage/>
<testsuites>
<testsuite name="Package Test Suite">
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">./src/</directory>
</include>
</source>
</phpunit>
4 changes: 1 addition & 3 deletions tests/WizardTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 7c95b03

Please sign in to comment.