Skip to content

Commit acd0e89

Browse files
authored
Fix composer typo (#32)
* Update composer.json Fix typo * Fix phpunit test * Also test on php7.4 * change phpunit script location * fix crossorigin test * add composer.lock * remove lock file + ignore it * change require versions
1 parent ae4908a commit acd0e89

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/vendor
22
/.idea
3+
composer.lock

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ language: php
33
php:
44
- 7.2
55
- 7.3
6+
- 7.4
67

78
before_script:
89
- composer self-update
910
- composer install --prefer-source --no-interaction --dev
1011

11-
script: phpunit
12+
script: vendor/bin/phpunit
1213

1314
notifications:
1415
email:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
],
1212
"require": {
1313
"php": ">=7.2",
14-
"illuminate/contracts": "^5.1. | ^6.0 | ^7.0 | ^8.0",
15-
"illuminate/support": "^5.1 | ^6.0 | ^7.0 | ^8.0",
16-
"illuminate/http": "5.1 | ^6.0 | ^7.0 | ^8.0"
14+
"illuminate/contracts": "^5.1|^6.0|^7.0|^8.0",
15+
"illuminate/support": "^5.1|^6.0|^7.0|^8.0",
16+
"illuminate/http": "^5.1|^6.0|^7.0|^8.0"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "^5.4",

tests/HttpPushTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ class HttpPushTest extends PHPUnit_Framework_TestCase
1515
*/
1616
protected $instance;
1717

18-
public function setUp()
18+
public function setUp(): void
1919
{
2020
$this->instance = new HttpPush();
2121
}
2222

23-
public function tearDown()
23+
public function tearDown(): void
2424
{
2525
$this->instance->clear();
2626
parent::tearDown();
@@ -89,7 +89,7 @@ public function test_resource_generates_font_link_string()
8989
{
9090
$this->instance->queueResource('/assets/font/Roboto.woff', 'font');
9191

92-
$this->assertEquals('</assets/font/Roboto.woff>; rel=preload; as=font', $this->instance->generateLinks()[0]);
92+
$this->assertEquals('</assets/font/Roboto.woff>; rel=preload; as=font; crossorigin', $this->instance->generateLinks()[0]);
9393
}
9494

9595
public function test_clear_resources()

0 commit comments

Comments
 (0)