Skip to content

Commit bb57b9b

Browse files
GrahamCampbellGrahamCampbell
committed
Working on next version
1 parent 042c23d commit bb57b9b

File tree

7 files changed

+26
-41
lines changed

7 files changed

+26
-41
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,13 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
15-
laravel: ['8', '9', '10', '11']
14+
php: ['8.1', '8.2', '8.3', '8.4']
15+
laravel: ['9', '10', '11', '12']
1616
exclude:
17-
- php: '7.4'
18-
laravel: '9'
19-
- php: '7.4'
20-
laravel: '10'
21-
- php: '7.4'
22-
laravel: '11'
23-
- php: '8.0'
24-
laravel: '10'
25-
- php: '8.0'
26-
laravel: '11'
2717
- php: '8.1'
2818
laravel: '11'
19+
- php: '8.1'
20+
laravel: '12'
2921
- php: '8.2'
3022
laravel: '8'
3123
- php: '8.3'
@@ -54,14 +46,6 @@ jobs:
5446
- name: Setup Problem Matchers
5547
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
5648

57-
- name: Select Laravel 8
58-
uses: nick-invision/retry@v3
59-
with:
60-
timeout_minutes: 5
61-
max_attempts: 5
62-
command: composer require "laravel/framework:^8.83.27" "phpunit/phpunit:^9.6.17" --no-update --no-interaction
63-
if: "matrix.laravel == '8'"
64-
6549
- name: Select Laravel 9
6650
uses: nick-invision/retry@v3
6751
with:

‎README.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@ Laravel Markdown was created by, and is maintained by [Graham Campbell](https://
1616

1717
## Installation
1818

19-
This version requires [PHP](https://www.php.net/) 7.4-8.4 and supports [Laravel](https://laravel.com/) 8-11.
20-
21-
| Markdown | L5.5 | L5.6 | L5.7 | L5.8 | L6 | L7 | L8 | L9 | L10 | L11 |
22-
|----------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|
23-
| 10.3 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
24-
| 11.2 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: |
25-
| 12.0 | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: |
26-
| 13.1 | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: |
27-
| 14.0 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: |
28-
| 15.3 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
19+
This version requires [PHP](https://www.php.net/) 8.1-8.4 and supports [Laravel](https://laravel.com/) 9-12.
20+
21+
| Markdown | L5.5 | L5.6 | L5.7 | L5.8 | L6 | L7 | L8 | L9 | L10 | L11 | L12 |
22+
|----------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|
23+
| 10.3 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
24+
| 11.2 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
25+
| 12.0 | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
26+
| 13.1 | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: |
27+
| 14.0 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: |
28+
| 15.3 | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |
29+
| 16.0 | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
2930

3031
To get the latest version, simply require the project using [Composer](https://getcomposer.org/):
3132

3233
```bash
33-
$ composer require "graham-campbell/markdown:^15.3"
34+
$ composer require "graham-campbell/markdown:^16.0"
3435
```
3536

3637
Once installed, if you are not using automatic package discovery, then you need to register the `GrahamCampbell\Markdown\MarkdownServiceProvider` service provider in your `config/app.php`.

‎composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
],
1313
"require": {
1414
"php": "^7.4.15 || ^8.0.2",
15-
"illuminate/contracts": "^8.75 || ^9.0 || ^10.0 || ^11.0",
16-
"illuminate/filesystem": "^8.75 || ^9.0 || ^10.0 || ^11.0",
17-
"illuminate/support": "^8.75 || ^9.0 || ^10.0 || ^11.0",
18-
"illuminate/view": "^8.75 || ^9.0 || ^10.0 || ^11.0",
15+
"illuminate/contracts": "^9.0 || ^10.0 || ^11.0 || ^12.0",
16+
"illuminate/filesystem": "^9.0 || ^10.0 || ^11.0 || ^12.0",
17+
"illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",
18+
"illuminate/view": "^9.0 || ^10.0 || ^11.0 || ^12.0",
1919
"league/commonmark": "^2.6.1"
2020
},
2121
"require-dev": {
22-
"graham-campbell/analyzer": "^4.2.1",
22+
"graham-campbell/analyzer": "^5.0",
2323
"graham-campbell/testbench": "^6.2",
2424
"mockery/mockery": "^1.6.6",
25-
"phpunit/phpunit": "^9.6.17 || ^10.5.13"
25+
"phpunit/phpunit": "^10.5.45 || ^11.5.10"
2626
},
2727
"autoload": {
2828
"psr-4": {

‎src/View/Compiler/CommonMarkCompiler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
final class CommonMarkCompiler extends Compiler implements CompilerInterface
2525
{
26-
private ConverterInterface $converter;
26+
private readonly ConverterInterface $converter;
2727

2828
/**
2929
* @param \League\CommonMark\ConverterInterface $converter

‎src/View/Directive/CommonMarkDirective.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
final class CommonMarkDirective implements DirectiveInterface
2222
{
23-
private ConverterInterface $converter;
23+
private readonly ConverterInterface $converter;
2424

2525
/**
2626
* @param \League\CommonMark\ConverterInterface $converter

‎src/View/Engine/BladeCommonMarkEngine.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
final class BladeCommonMarkEngine extends CompilerEngine
2525
{
26-
private ConverterInterface $converter;
26+
private readonly ConverterInterface $converter;
2727

2828
/**
2929
* @param \Illuminate\View\Compilers\CompilerInterface $compiler

‎src/View/Engine/PhpCommonMarkEngine.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
final class PhpCommonMarkEngine extends PhpEngine
2424
{
25-
private ConverterInterface $converter;
25+
private readonly ConverterInterface $converter;
2626

2727
/**
2828
* @param \Illuminate\Filesystem\Filesystem $files

0 commit comments

Comments
 (0)