Skip to content

Commit d59e86d

Browse files
jmschejmsche
authored andcommitted
Drop support for Symfony < 6.4 & PHP < 8.2 & add support for Symfony 7
1 parent e4f0115 commit d59e86d

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

.github/workflows/coding-standards.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ on:
99
jobs:
1010
php-cs-fixer:
1111
name: PHP CS Fixer (PHP ${{ matrix.php-version }})
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
strategy:
1515
matrix:
1616
php-version:
17-
- '8.1'
17+
- '8.3'
1818

1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222

2323
- name: Install PHP
2424
uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
2929
extensions: zip
3030

3131
- name: Install Composer dependencies
32-
uses: ramsey/composer-install@v1
32+
uses: ramsey/composer-install@v2
3333

3434
- name: Run PHP CS Fixer
3535
run: 'vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr'

.github/workflows/continuous-integration.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,22 @@ on:
99
jobs:
1010
phpunit:
1111
name: PHPUnit (PHP ${{ matrix.php-version }} - Symfony ${{ matrix.symfony-version }})
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
env:
1414
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
1515

1616
strategy:
1717
matrix:
1818
php-version:
19-
- '8.0'
20-
- '8.1'
2119
- '8.2'
20+
- '8.3'
2221
symfony-version:
23-
- '5.4.*'
24-
- '6.0.*'
25-
include:
26-
- php-version: '8.1'
27-
symfony-version: '6.1.*'
28-
- php-version: '8.2'
29-
symfony-version: '6.1.*'
22+
- '6.4.*'
23+
- '7.0.*'
3024

3125
steps:
3226
- name: Checkout code
33-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
3428
with:
3529
fetch-depth: 2
3630

@@ -47,11 +41,11 @@ jobs:
4741
composer global require --no-progress --no-scripts --no-plugins symfony/flex
4842
4943
- name: Install Composer dependencies
50-
uses: ramsey/composer-install@v1
44+
uses: ramsey/composer-install@v2
5145

5246
- name: Run PHPUnit
5347
run: vendor/bin/phpunit --coverage-clover=coverage.xml
5448

5549
- name: Upload to Codecov
5650
uses: codecov/codecov-action@v2
57-
if: matrix.php-version == '8.1' && matrix.symfony-version == '6.0.*'
51+
if: matrix.php-version == '8.3' && matrix.symfony-version == '6.4.*'

.github/workflows/static-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ on:
99
jobs:
1010
phpstan:
1111
name: PHPStan (PHP ${{ matrix.php-version }})
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313

1414
strategy:
1515
matrix:
1616
php-version:
17-
- '8.1'
17+
- '8.3'
1818

1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222

2323
- name: Install PHP
2424
uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
2929
extensions: zip
3030

3131
- name: Install Composer dependencies
32-
uses: ramsey/composer-install@v1
32+
uses: ramsey/composer-install@v2
3333

3434
- name: Run PHPStan
3535
run: 'vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr'

CHANGELOG-1.x.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
1.5.0
2+
-----
3+
4+
* Drop support for PHP < 8.2
5+
* Drop support for Symfony < 6.4
6+
* Add support for Symfony 7
7+
18
1.4.0
29
-----
310

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Introduction
1010

11-
This bundle aims to easily integrate & use the Froala editor in Symfony 5.4+/6.0+.
11+
This bundle aims to easily integrate & use the Froala editor in Symfony 6.4+/7.0+.
1212

1313
This bundle is a maintained fork of the [KMSFroalaEditorBundle](https://github.com/froala/KMSFroalaEditorBundle).
1414

@@ -45,8 +45,9 @@ The changelog is available here:
4545

4646
## Migration to Leapt Froala Editor bundle from KMS
4747

48-
It now supports only Symfony 5.4+ & 6.0+, and PHP >= 8.0.
48+
It now supports only Symfony 6.4+ & 7.0+, and PHP >= 8.2.
4949
Symfony 5.3 is supported in v1.0.0, but its support has been dropped in v1.1.0.
50+
Symfony < 6.4 is supported in v1.4.0, but its support has been dropped in v1.5.0.
5051

5152
Replace occurrences of "kms" by "leapt" everywhere (matching case: `KMS` becomes `Leapt` & `kms` becomes `leapt`).
5253

composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "leapt/froala-editor-bundle",
33
"type": "symfony-bundle",
4-
"description": "Provides a Froala editor integration for Symfony 5 & 6.",
4+
"description": "Provides a Froala editor integration for Symfony 6 & 7.",
55
"keywords": [ "froala", "editor", "wysiwyg" ],
66
"license": "MIT",
77
"authors": [
@@ -19,25 +19,25 @@
1919
}
2020
],
2121
"require": {
22-
"php": "^8.0",
22+
"php": "^8.2",
2323
"ext-zip": "*",
24-
"symfony/asset": "^5.4 || ^6.0",
25-
"symfony/console": "^5.4 || ^6.0",
26-
"symfony/framework-bundle": "^5.4 || ^6.0",
27-
"symfony/form": "^5.4 || ^6.0",
28-
"symfony/http-client": "^5.4 || ^6.0",
29-
"symfony/string": "^5.4 || ^6.0",
30-
"symfony/twig-bundle": "^5.4 || ^6.0",
24+
"symfony/asset": "^6.4 || ^7.0",
25+
"symfony/console": "^6.4 || ^7.0",
26+
"symfony/framework-bundle": "^6.4 || ^7.0",
27+
"symfony/form": "^6.4 || ^7.0",
28+
"symfony/http-client": "^6.4 || ^7.0",
29+
"symfony/string": "^6.4 || ^7.0",
30+
"symfony/twig-bundle": "^6.4 || ^7.0",
3131
"twig/twig": "^3.0"
3232
},
3333
"require-dev": {
3434
"friendsofphp/php-cs-fixer": "^3.49.0",
3535
"phpstan/phpstan": "^1.10.57",
3636
"phpstan/phpstan-deprecation-rules": "^1.1.4",
3737
"phpunit/phpunit": "^9.6.16",
38-
"symfony/css-selector": "^5.4 || ^6.0",
39-
"symfony/dom-crawler": "^5.4 || ^6.0",
40-
"symfony/yaml": "^5.4 || ^6.0"
38+
"symfony/css-selector": "^6.4 || ^7.0",
39+
"symfony/dom-crawler": "^6.4 || ^7.0",
40+
"symfony/yaml": "^6.4 || ^7.0"
4141
},
4242
"scripts": {
4343
"ci": [

0 commit comments

Comments
 (0)