Skip to content

Commit

Permalink
Merge pull request #15 from poldixd/laravel-10
Browse files Browse the repository at this point in the history
Laravel 10 Support
  • Loading branch information
poldixd authored Sep 21, 2023
2 parents 77663a2 + a8fc794 commit cfc75d4
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.0, 8.1]
laravel: [8.*, 9.*]
php: [8.1, 8.2]
laravel: [9.*, 10.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: ^6.24
- laravel: 10.*
testbench: 8.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ composer.phar
composer.lock
package-lock.json
.phpunit.result.cache
.phpunit.cache/*
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to `laravel-feather` will be documented in this file

## 10.0.0 - 2023-09-21

- added Laravel 10 support
- dropped PHP8.0 support
- dropped Laravel 8 support

## 9.1.0 - 2022-03-30

- Updated feather-icons to 4.29.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# poldixd/laravel-feather

Use [Feather Icons](https://feathericons.com) as a Blade `include()` or [Blade Component](https://laravel.com/docs/7.x/blade#components) in your Laravel 8.x or 9.x application. This Package uses [Feather 4.28.0](https://github.com/feathericons/feather/releases/tag/v4.28.0).
Use [Feather Icons](https://feathericons.com) as a Blade `include()` or [Blade Component](https://laravel.com/docs/7.x/blade#components) in your Laravel 9.x or 10.x application. This Package uses [Feather 4.28.0](https://github.com/feathericons/feather/releases/tag/v4.28.0).

## Installation

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
}
],
"require": {
"php": "^8.0|^8.1",
"illuminate/support": "^8.0|^9.0"
"php": "^8.1",
"illuminate/support": "^9.0|^10.0"
},
"require-dev": {
"orchestra/testbench": "^6.17|^7.0",
"phpunit/phpunit": "^9.5"
"orchestra/testbench": "^7.0|^8.0",
"phpunit/phpunit": "^9.5|^10.0"
},
"autoload": {
"psr-4": {
Expand Down
13 changes: 7 additions & 6 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" stopOnFailure="false" backupGlobals="false" processIsolation="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" stopOnFailure="false" backupGlobals="false" processIsolation="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<coverage/>
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</source>
</phpunit>
4 changes: 3 additions & 1 deletion tests/LaravelFeatherBladeComponentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public function icon_has_custom_css_class()
$output = view('blade_component_icon_has_custom_css_class')->render();

$this->assertStringContainsString('<svg', $output);
$this->assertStringContainsString('class="feather feather-activity custom-class" style="color: red" x-show="showIcon === true"', $output);
$this->assertStringContainsString('feather feather-activity custom-class', $output);
$this->assertStringContainsString('color: red', $output);
$this->assertStringContainsString('x-show="showIcon === true"', $output);
}
}

0 comments on commit cfc75d4

Please sign in to comment.