Skip to content

Commit

Permalink
Merge pull request #10 from digifactory/dev/laravel-10
Browse files Browse the repository at this point in the history
Support for Laravel 10 and PHP 8.2, dropped support for Laravel 9, PH…
  • Loading branch information
StanDigiFactory authored Feb 20, 2023
2 parents 87231ea + b8feba6 commit 2e97c1b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/run-php-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:

strategy:
matrix:
php: [8.0.2,8.1]
laravel: [9.*]
php: [8.2]
laravel: [10.*]
dependency-version: [prefer-lowest, prefer-stable]
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*


name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

All notable changes to `laravel-cookie-consent` will be documented in this file.
## 3.0.0 - 2023-02-20
- Support for Laravel 10 and PHP 8.2
- Dropped support for Laravel 9, PHP 8.0 and PHP 8.1

## 2.0.0 - 2022-02-23
- Support for Laravel 9 and PHP 8.1
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
}
],
"require": {
"php": "^8.0.2|^8.1",
"illuminate/support": "^9.0"
"php": "^8.2",
"illuminate/support": "^10.0"
},
"require-dev": {
"orchestra/testbench": "^7.1",
"phpunit/phpunit": "^9.3",
"spatie/phpunit-snapshot-assertions": "^4.0"
"orchestra/testbench": "^8.0",
"phpunit/phpunit": "^10.0",
"spatie/phpunit-snapshot-assertions": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
<coverage>
<include>
<directory suffix=".php">src/</directory>
Expand Down
2 changes: 1 addition & 1 deletion tests/BladeRegistrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function it_registers_blade_directives($directive)
$this->assertTrue($directives->contains($directive));
}

public function registeredBladeDirectives()
public static function registeredBladeDirectives()
{
return [
['cookieConsentNecessary'],
Expand Down

0 comments on commit 2e97c1b

Please sign in to comment.