Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 11 Support #320

Merged
merged 4 commits into from
Mar 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,18 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.4, 8.0, 8.1, 8.2]
laravel: [8.*, 9.*, 10.*]
php: [8.1, 8.2, 8.3]
laravel: [10.*, 11.*]
dependency-version: [prefer-stable]
exclude:
- php: 7.4
laravel: 9.*
- php: 7.4
laravel: 10.*
- php: 8.0
laravel: 10.*
- php: 8.1
laravel: 11.*

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -42,4 +38,4 @@ jobs:
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction

- name: Execute tests
run: vendor/bin/phpunit --verbose
run: vendor/bin/phpunit
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
}
],
"require": {
"php": ">=7.1|^8.0",
"php": "^8.1",
"ext-json": "*",
"illuminate/config": "5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
"illuminate/support": "5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
"illuminate/config": "^10.0 || ^11.0",
"illuminate/support": "^10.0 || ^11.0"
},
"require-dev": {
"orchestra/testbench": "~3.8.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
"orchestra/testbench": "^8.0 || ^9.0",
"phpspec/phpspec": "~5.1.1 || ^6.0 || ^7.0",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^9.0 || ^10.0"
},
"autoload": {
"psr-4": {
Expand Down
20 changes: 2 additions & 18 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
verbose="true"
>
<testsuites>
<testsuite name="SEOTools Test Suite">
<directory suffix=".php">./tests</directory>
<directory suffix="Test.php">tests</directory>
<exclude>./tests/SEOTools/BaseTest.php</exclude>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<logging>
<log type="tap" target="build/report.tap"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
<log type="coverage-php" target="build/coverage.serialized"/>
</logging>
</phpunit>
2 changes: 1 addition & 1 deletion tests/SEOTools/BaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class BaseTest.
*/
abstract class BaseTest extends TestCase
class BaseTest extends TestCase
{
/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion tests/SEOTools/SEOMetaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function test_set_canonical()
$this->assertEquals($canonical, $this->seoMeta->getCanonical());
}

public function dataTestUrls()
public static function dataTestUrls()
{
return [
['http://localhost/hello/world', 'http://localhost/hello/world'],
Expand Down
2 changes: 1 addition & 1 deletion tests/SEOTools/SEOToolsServiceProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function test_container_are_provided($contract, $concreteClass)
/**
* @return array
*/
public function bindsListProvider()
public static function bindsListProvider()
{
return [
[
Expand Down