diff --git a/.gitignore b/.gitignore index 5049f84..3806554 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vendor /.idea +composer.lock diff --git a/.travis.yml b/.travis.yml index 6fca301..f07d3dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,13 @@ language: php php: - 7.2 - 7.3 + - 7.4 before_script: - composer self-update - composer install --prefer-source --no-interaction --dev -script: phpunit +script: vendor/bin/phpunit notifications: email: diff --git a/composer.json b/composer.json index 96bd786..6ea5b41 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ ], "require": { "php": ">=7.2", - "illuminate/contracts": "^5.1. | ^6.0 | ^7.0 | ^8.0", - "illuminate/support": "^5.1 | ^6.0 | ^7.0 | ^8.0", - "illuminate/http": "5.1 | ^6.0 | ^7.0 | ^8.0" + "illuminate/contracts": "^5.1|^6.0|^7.0|^8.0", + "illuminate/support": "^5.1|^6.0|^7.0|^8.0", + "illuminate/http": "^5.1|^6.0|^7.0|^8.0" }, "require-dev": { "phpunit/phpunit": "^5.4", diff --git a/tests/HttpPushTest.php b/tests/HttpPushTest.php index af27a71..7c77a6a 100644 --- a/tests/HttpPushTest.php +++ b/tests/HttpPushTest.php @@ -15,12 +15,12 @@ class HttpPushTest extends PHPUnit_Framework_TestCase */ protected $instance; - public function setUp() + public function setUp(): void { $this->instance = new HttpPush(); } - public function tearDown() + public function tearDown(): void { $this->instance->clear(); parent::tearDown(); @@ -89,7 +89,7 @@ public function test_resource_generates_font_link_string() { $this->instance->queueResource('/assets/font/Roboto.woff', 'font'); - $this->assertEquals('; rel=preload; as=font', $this->instance->generateLinks()[0]); + $this->assertEquals('; rel=preload; as=font; crossorigin', $this->instance->generateLinks()[0]); } public function test_clear_resources()