Skip to content

Commit

Permalink
Merge pull request #101 from advoor/fix/links-with-image-fix
Browse files Browse the repository at this point in the history
Fix links with images
  • Loading branch information
roelofr authored Nov 18, 2023
2 parents 7148d12 + 37f758f commit d4be2a2
Show file tree
Hide file tree
Showing 15 changed files with 2,080 additions and 1,448 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,16 @@ jobs:
- 'nightly'

laravel:
- '8.0'
- '9.0'
- '10.0'

include:
- php: '8.2'
laravel: '9.0'
laravel: '10.0'
stable: true
- php: 'nightly'
experimental: true
- laravel: '8.0'
testbench: '6.0'

- laravel: '9.0'
testbench: '7.0'
- laravel: '10.0'
Expand Down Expand Up @@ -76,10 +74,15 @@ jobs:
- name: Report test results
if: ${{ success() || failure() }}
uses: mikepenz/action-junit-report@v3
uses: mikepenz/action-junit-report@v4
with:
report_paths: ./report-junit.xml
check_name: Test Results Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }} with PHPUnit ${{ steps.phpunit.outputs.phpunit_version }}
check_name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }} (PHPUnit ${{ steps.phpunit.outputs.phpunit_version }})
summary: |
PHP version: `${{ matrix.php }}`
Laravel version: `${{ matrix.laravel }}`
Testbench version: `${{ matrix.testbench }}`
PHPUnit version: `${{ steps.phpunit.outputs.phpunit_version }}`
- name: Determine coverage
uses: slavcodev/[email protected]
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED]

### Fixed

- Fixed invalid image reference image.url in views/link.blade.php

### Deprecated

- Deprecated support for Laravel 8.x. It might still work, but we're not testing it anymore.

## [3.1.0]

### Added
Expand Down
1 change: 1 addition & 0 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The following deprecations from 3.x have been removed in 4.x:

- `Advoor\NovaEditorJs\NovaEditorJs::make`, use `Advoor\NovaEditorJs\NovaEditorJsField::make` instead
- Config setting `editorSettings.initialBlock`, use `editorSettings.defaultBlock` instead
- Support for Laravel 8.x has been dropped.

## From 2.x to 3.x (Laravel Nova 4.x)

Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"ext-exif": "*",
"ext-json": "*",
"codex-team/editor.js": "*",
"guzzlehttp/guzzle": "^6.0|^7.0",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"illuminate/support": "^8.0 || ^9.0 || ^10.0",
"laravel/nova": "^4.0",
"spatie/image": "^1.7 || ^2.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.9",
"orchestra/testbench": "^6.0 || ^7.0",
"orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
"php-parallel-lint/php-parallel-lint": "^1.3"
},
"autoload": {
Expand Down Expand Up @@ -59,7 +59,10 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"platform": {
"php": "8.1.25"
}
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
Loading

0 comments on commit d4be2a2

Please sign in to comment.