Skip to content
Open
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ php:
- 5.5
- 5.6
- 7.0
- hhvm

sudo: false

Expand Down
17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"license": "MIT",
"require": {
"php": ">=5.5.9",
"illuminate/contracts": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/contracts": "~5.0",
"illuminate/support": "~5.0",
"illuminate/console": "~5.0",
"illuminate/http": "~5.0",
"illuminate/view": "~5.0",
"symfony/process": "^2.6|^3.1.0"
},
"require-dev": {
Expand All @@ -32,6 +32,13 @@
"tests/TestCase.php"
]
},
"extra": {
"laravel": {
"providers": [
"Alfheim\\CriticalCss\\CriticalCssServiceProvider"
]
}
},
"config": {
"preferred-install": "dist"
},
Expand Down
10 changes: 6 additions & 4 deletions tests/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ConfigTest extends TestCase
'height' => 'integer',
'ignore' => 'array',
'storage' => 'string',
'pretend' => 'string',
'pretend' => 'bool',
'blade_directive' => 'bool',
'critical_bin' => 'string',
'timeout' => 'integer',
Expand All @@ -33,9 +33,11 @@ public function testConfigIsOk()
}
}

function env($a, $b = null)
{
return $a;
if (! function_exists('env')) {
function env($a, $b = null)
{
return $b;
}
}

function base_path($a = '')
Expand Down