Skip to content

Commit

Permalink
Let's push 5.x branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jmsche committed Dec 5, 2023
1 parent 34c6cad commit e4c17c6
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build docs

on:
push:
branches: ['4.x']
branches: ['5.x']

jobs:
deploy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Coding Standards

on:
pull_request:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']
push:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']

jobs:
php-cs-fixer:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Continuous Integration

on:
pull_request:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']
push:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']

jobs:
phpunit:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Static Analysis

on:
pull_request:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']
push:
branches: ['4.x', '3.x']
branches: ['5.x', '4.x', '3.x']

jobs:
phpstan:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG-5.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
5.0.0
-----


17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,20 @@ See the [Documentation and examples](https://im-bundle.leapt.dev/)
Versions & dependencies
-----------------------

The current version (4.x) of the bundle works with Symfony 5.4 & Symfony 6.0+.
The current version (5.x) of the bundle works with Symfony 6.4 & Symfony 7.0+.
The project follows SemVer.

You can check the [changelog](CHANGELOG-4.x.md) for version 4 and the [upgrade document](UPGRADE-4.x.md) when upgrading
from 3.x bundle version.

| ImBundle version | Symfony version | PHP version
| ----------------- | ------------------------- | -----------
| 4.x | ^5.4 \|\| ^6.0 | ^8.0
| 3.x | ^4.4 \|\| ^5.0 | ^7.2 \|\| ^8.0
| 2.1+ | ^3.3 \|\| ^4.0 | >=5.5
| 2.0, < 2.1 | ^2.7 \|\| ^3.0 \|\| ^4.0 | >=5.4
| 1.x | ^2.7 | >=5.3.3
| ImBundle version | Symfony version | PHP version
|------------------|--------------------------| -----------
| 5.x | ^6.4 \|\| ^7.0 | ^8.2
| 4.x | ^5.4 \|\| ^6.0 | ^8.0
| 3.x | ^4.4 \|\| ^5.0 | ^7.2 \|\| ^8.0
| 2.1+ | ^3.3 \|\| ^4.0 | >=5.5
| 2.0, < 2.1 | ^2.7 \|\| ^3.0 \|\| ^4.0 | >=5.4
| 1.x | ^2.7 | >=5.3.3

Contributing
------------
Expand Down
4 changes: 4 additions & 0 deletions UPGRADE-5.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Upgrade from 4.x to 5.x
-----------------------


6 changes: 2 additions & 4 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

* You need to have the ImageMagick binaries available (convert & mogrify)
* You need to have a cache folder in your web dir, writeable by the webserver
* Symfony 5.4/6.0+
* PHP 8.0+

This bundle requires PHP 8.0+ and Symfony 5.4/6.0+.
* Symfony 6.4/7.0+
* PHP 8.2+

## Install steps

Expand Down

0 comments on commit e4c17c6

Please sign in to comment.