1
0
mirror of https://github.com/mrclay/minify.git synced 2025-08-13 17:44:00 +02:00

Merge pull request #622 from glensc/travis-php-versions

travis: test php 5.3..7.3
This commit is contained in:
Elan Ruusamäe
2018-01-05 14:12:04 +02:00
committed by GitHub
5 changed files with 24 additions and 22 deletions

View File

@@ -1,21 +1,26 @@
language: php language: php
sudo: false sudo: false
dist: trusty
php: jobs:
- 7.0 fast_finish: true
- 5.6 allow_failures:
- 5.5 - php: "hhvm"
- 5.4 include:
- hhvm - php: "5.3"
dist: precise
- php: "5.4"
- php: "5.5"
- php: "5.6"
- php: "7.0"
- php: "7.1"
- php: "7.2"
- php: "nightly"
- php: "hhvm"
env: env:
- CLOSURE_VERSION: 20161024 - CLOSURE_VERSION: 20161024
matrix:
allow_failures:
- php: hhvm
- php: 7.0
services: services:
- memcached - memcached

View File

@@ -33,7 +33,7 @@
}, },
"require-dev": { "require-dev": {
"firephp/firephp-core": "~0.4.0", "firephp/firephp-core": "~0.4.0",
"leafo/scssphp": "~0.6.6", "leafo/scssphp": "^0.3 || ^0.6 || ^0.7",
"marcusschwarz/lesserphp": "~0.5.1", "marcusschwarz/lesserphp": "~0.5.1",
"meenie/javascript-packer": "~1.1", "meenie/javascript-packer": "~1.1",
"phpunit/phpunit": "^4.8.36", "phpunit/phpunit": "^4.8.36",

View File

@@ -7,7 +7,7 @@ use HTTP_Encoder;
class HTTPEncoderTest extends TestCase class HTTPEncoderTest extends TestCase
{ {
/** /**
* @dataProvider testToIe6Data * @dataProvider ToIe6DataProvider
* @preserveGlobals * @preserveGlobals
*/ */
public function testToIe6($ua, $ae, $exp, $desc) public function testToIe6($ua, $ae, $exp, $desc)
@@ -20,7 +20,7 @@ class HTTPEncoderTest extends TestCase
$this->assertSame($exp, $ret, $desc); $this->assertSame($exp, $ret, $desc);
} }
public function testToIe6Data() public function ToIe6DataProvider()
{ {
return array( return array(
array( array(
@@ -69,7 +69,7 @@ class HTTPEncoderTest extends TestCase
} }
/** /**
* @dataProvider testEncodeNonIeData * @dataProvider EncodeNonIeDataProvider
*/ */
public function testEncodeNonIe($ua, $ae, $exp, $desc) public function testEncodeNonIe($ua, $ae, $exp, $desc)
{ {
@@ -81,7 +81,7 @@ class HTTPEncoderTest extends TestCase
$this->assertSame($exp, $ret, $desc); $this->assertSame($exp, $ret, $desc);
} }
public function testEncodeNonIeData() public function EncodeNonIeDataProvider()
{ {
return array( return array(
array( array(

View File

@@ -57,7 +57,8 @@ class JSMinTest extends TestCase
* @param string $label * @param string $label
* @param string $expClass * @param string $expClass
* @param string $expMessage * @param string $expMessage
* @dataProvider testJSMinExceptionData *
* @dataProvider JSMinExceptionDataProvider
*/ */
public function testJSMinException($js, $label, $expClass, $expMessage) public function testJSMinException($js, $label, $expClass, $expMessage)
{ {
@@ -71,7 +72,7 @@ class JSMinTest extends TestCase
$this->assertTrue($eClass === $expClass && $eMsg === $expMessage, 'Throw on ' . $label); $this->assertTrue($eClass === $expClass && $eMsg === $expMessage, 'Throw on ' . $label);
} }
public function testJSMinExceptionData() public function JSMinExceptionDataProvider()
{ {
// $js, $label, $expClass, $expMessage // $js, $label, $expClass, $expMessage
return array( return array(

View File

@@ -8,10 +8,6 @@ class ScssSourceTest extends TestCase
{ {
public function setUp() public function setUp()
{ {
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
$this->markTestSkipped('scssphp is not compatible with this PHP version.');
}
$this->realDocRoot = $_SERVER['DOCUMENT_ROOT']; $this->realDocRoot = $_SERVER['DOCUMENT_ROOT'];
$_SERVER['DOCUMENT_ROOT'] = self::$document_root; $_SERVER['DOCUMENT_ROOT'] = self::$document_root;
} }