mirror of
https://github.com/mrclay/minify.git
synced 2025-07-31 03:10:09 +02:00
Test fixes
This commit is contained in:
@@ -122,7 +122,7 @@ class App extends Container
|
||||
|
||||
$type = $that->typeOf($ctrl);
|
||||
throw new RuntimeException('$min_factories["controller"] callable must return an implementation'
|
||||
." of Minify_CacheInterface. Returned $type");
|
||||
. " of Minify_CacheInterface. Returned $type");
|
||||
};
|
||||
|
||||
$this->docRoot = function (App $app) {
|
||||
@@ -188,7 +188,7 @@ class App extends Container
|
||||
|
||||
$type = $that->typeOf($value);
|
||||
throw new RuntimeException('If set, $min_errorLogger must be a PSR-3 logger or a Monolog handler.'
|
||||
." Given $type");
|
||||
. " Given $type");
|
||||
};
|
||||
|
||||
$this->minify = function (App $app) use ($that) {
|
||||
@@ -205,7 +205,7 @@ class App extends Container
|
||||
|
||||
$type = $that->typeOf($minify);
|
||||
throw new RuntimeException('$min_factories["minify"] callable must return a Minify object.'
|
||||
." Returned $type");
|
||||
. " Returned $type");
|
||||
};
|
||||
|
||||
$this->serveOptions = function (App $app) {
|
||||
@@ -232,7 +232,7 @@ class App extends Container
|
||||
}
|
||||
|
||||
// check for URI versioning
|
||||
if ($env->get('v') !== null || preg_match('/&\\d/', $app->env->server('QUERY_STRING'))) {
|
||||
if ($env->get('v') !== null || preg_match('/&\\d/', $app->env->server('QUERY_STRING') ?? '')) {
|
||||
$ret['maxAge'] = 31536000;
|
||||
}
|
||||
|
||||
|
@@ -188,7 +188,7 @@ class Minify_ClosureCompiler
|
||||
*/
|
||||
protected function checkTempdir($tempDir)
|
||||
{
|
||||
if (!is_dir($tempDir)) {
|
||||
if ($tempDir === null || !is_dir($tempDir)) {
|
||||
throw new Minify_ClosureCompiler_Exception('$tempDir(' . $tempDir . ') is not a valid direcotry.');
|
||||
}
|
||||
if (!is_writable($tempDir)) {
|
||||
|
@@ -156,8 +156,8 @@ class Minify_ScssCssSource extends Minify_Source
|
||||
$elapsed = round((microtime(true) - $start), 4);
|
||||
|
||||
$v = Version::VERSION;
|
||||
$ts = date('r', $start);
|
||||
$css = "/* compiled by scssphp $v on $ts (${elapsed}s) */\n\n" . $css;
|
||||
$ts = date('r', (int) $start);
|
||||
$css = "/* compiled by scssphp $v on $ts ({$elapsed}s) */\n\n" . $css;
|
||||
|
||||
$imports = $scss->getParsedFiles();
|
||||
|
||||
|
@@ -113,10 +113,12 @@ class HTTPEncoderTest extends TestCase
|
||||
);
|
||||
|
||||
foreach ($encodingTests as $test) {
|
||||
$e = new HTTP_Encoder(array(
|
||||
'content' => $variedContent,
|
||||
'method' => $test['method'],
|
||||
));
|
||||
$e = new HTTP_Encoder(
|
||||
array(
|
||||
'content' => $variedContent,
|
||||
'method' => $test['method'],
|
||||
)
|
||||
);
|
||||
$e->encode(9);
|
||||
$ret = $this->countBytes($e->getContent());
|
||||
|
||||
@@ -153,12 +155,12 @@ function _gzdecode($data)
|
||||
}
|
||||
|
||||
// http://www.php.net/manual/en/function.gzdecode.php#82930
|
||||
function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null)
|
||||
function _phpman_gzdecode($data, &$filename = '', &$error = '', $maxlength = 0)
|
||||
{
|
||||
$mbIntEnc = null;
|
||||
$hasMbOverload = (function_exists('mb_strlen')
|
||||
&& (ini_get('mbstring.func_overload') !== '')
|
||||
&& ((int)ini_get('mbstring.func_overload') & 2));
|
||||
&& (ini_get('mbstring.func_overload') !== '')
|
||||
&& ((int) ini_get('mbstring.func_overload') & 2));
|
||||
if ($hasMbOverload) {
|
||||
$mbIntEnc = mb_internal_encoding();
|
||||
mb_internal_encoding('8bit');
|
||||
@@ -174,7 +176,7 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null)
|
||||
return null; // Not GZIP format (See RFC 1952)
|
||||
}
|
||||
$method = ord(substr($data, 2, 1)); // Compression method
|
||||
$flags = ord(substr($data, 3, 1)); // Flags
|
||||
$flags = ord(substr($data, 3, 1)); // Flags
|
||||
if ($flags & 31 != $flags) {
|
||||
$error = "Reserved bits not allowed.";
|
||||
if ($mbIntEnc !== null) {
|
||||
@@ -185,11 +187,11 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null)
|
||||
// NOTE: $mtime may be negative (PHP integer limitations)
|
||||
$mtime = unpack("V", substr($data, 4, 4));
|
||||
$mtime = $mtime[1];
|
||||
$xfl = substr($data, 8, 1);
|
||||
$os = substr($data, 8, 1);
|
||||
$xfl = substr($data, 8, 1);
|
||||
$os = substr($data, 8, 1);
|
||||
$headerlen = 10;
|
||||
$extralen = 0;
|
||||
$extra = "";
|
||||
$extralen = 0;
|
||||
$extra = "";
|
||||
if ($flags & 4) {
|
||||
// 2-byte length prefixed EXTRA data in header
|
||||
if ($len - $headerlen - 2 < 8) {
|
||||
@@ -276,7 +278,7 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null)
|
||||
$isize = unpack("V", substr($data, -4));
|
||||
$isize = $isize[1];
|
||||
// decompression:
|
||||
$bodylen = $len-$headerlen-8;
|
||||
$bodylen = $len - $headerlen - 8;
|
||||
if ($bodylen < 1) {
|
||||
// IMPLEMENTATION BUG!
|
||||
if ($mbIntEnc !== null) {
|
||||
@@ -288,20 +290,20 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null)
|
||||
$data = "";
|
||||
if ($bodylen > 0) {
|
||||
switch ($method) {
|
||||
case 8:
|
||||
// Currently the only supported compression method:
|
||||
$data = gzinflate($body, $maxlength);
|
||||
break;
|
||||
default:
|
||||
$error = "Unknown compression method.";
|
||||
if ($mbIntEnc !== null) {
|
||||
mb_internal_encoding($mbIntEnc);
|
||||
}
|
||||
return false;
|
||||
case 8:
|
||||
// Currently the only supported compression method:
|
||||
$data = gzinflate($body, $maxlength);
|
||||
break;
|
||||
default:
|
||||
$error = "Unknown compression method.";
|
||||
if ($mbIntEnc !== null) {
|
||||
mb_internal_encoding($mbIntEnc);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
} // zero-byte body content is allowed
|
||||
// Verifiy CRC32
|
||||
$crc = sprintf("%u", crc32($data));
|
||||
$crc = sprintf("%u", crc32($data));
|
||||
$crcOK = $crc == $datacrc;
|
||||
$lenOK = $isize == strlen($data);
|
||||
if (!$lenOK || !$crcOK) {
|
||||
|
@@ -6,7 +6,9 @@ use Minify_HTML_Helper;
|
||||
|
||||
class LessSourceTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public string $realDocRoot;
|
||||
|
||||
public function setUp(): void
|
||||
{
|
||||
$this->realDocRoot = $_SERVER['DOCUMENT_ROOT'];
|
||||
$_SERVER['DOCUMENT_ROOT'] = self::$document_root;
|
||||
|
@@ -6,7 +6,7 @@ use Minify_CSS_UriRewriter;
|
||||
|
||||
class MinifyCSSUriRewriterTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
Minify_CSS_UriRewriter::$debugText = '';
|
||||
}
|
||||
|
@@ -6,7 +6,7 @@ use Minify_Cache_APC;
|
||||
|
||||
class MinifyCacheAPCTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
if (!function_exists('apc_store')) {
|
||||
$this->markTestSkipped("To test this component, install APC extension");
|
||||
|
@@ -6,7 +6,7 @@ use Minify_Cache_APCu;
|
||||
|
||||
class MinifyCacheAPCuTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
if (!function_exists('apcu_store')) {
|
||||
$this->markTestSkipped("To test this component, install APCu extension");
|
||||
|
@@ -10,7 +10,7 @@ class MinifyCacheMemcacheTest extends TestCase
|
||||
/** @var Memcache */
|
||||
private $mc;
|
||||
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
if (!function_exists('memcache_set')) {
|
||||
$this->markTestSkipped("To test this component, install memcache in PHP");
|
||||
|
@@ -6,7 +6,7 @@ use Minify_Cache_WinCache;
|
||||
|
||||
class MinifyCacheWinCacheTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
if (!function_exists('wincache_ucache_info')) {
|
||||
$this->markTestSkipped("To test this component, install WinCache extension");
|
||||
|
@@ -6,7 +6,7 @@ use Minify_Cache_ZendPlatform;
|
||||
|
||||
class MinifyCacheZendPlatformTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
if (!function_exists('output_cache_put')) {
|
||||
// FIXME: be specific what to actually install
|
||||
|
@@ -7,7 +7,7 @@ use Minify_ClosureCompiler;
|
||||
|
||||
class MinifyClosureCompilerTest extends TestCase
|
||||
{
|
||||
public static function setupBeforeClass()
|
||||
public static function setupBeforeClass(): void
|
||||
{
|
||||
parent::setupBeforeClass();
|
||||
Minify_ClosureCompiler::$isDebug = true;
|
||||
|
@@ -9,14 +9,14 @@ class MinifyHTMLHelperTest extends TestCase
|
||||
{
|
||||
private $realDocRoot;
|
||||
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
$this->realDocRoot = $_SERVER['DOCUMENT_ROOT'];
|
||||
$_SERVER['DOCUMENT_ROOT'] = self::$document_root;
|
||||
}
|
||||
|
||||
// TODO: this is probably not needed if backupGlobals is enabled?
|
||||
public function tearDown()
|
||||
public function tearDown(): void
|
||||
{
|
||||
$_SERVER['DOCUMENT_ROOT'] = $this->realDocRoot;
|
||||
}
|
||||
@@ -43,13 +43,16 @@ class MinifyHTMLHelperTest extends TestCase
|
||||
$this->assertEquals($expected, $actual, 'non-existent group & debug');
|
||||
|
||||
$expected = "/myApp/min/?g=css&{$maxTime}";
|
||||
$actual = Minify_HTML_Helper::getUri('css', array(
|
||||
'rewriteWorks' => false
|
||||
,
|
||||
'minAppUri' => '/myApp/min/'
|
||||
,
|
||||
'groupsConfigFile' => self::$test_files . '/htmlHelper_groupsConfig.php'
|
||||
));
|
||||
$actual = Minify_HTML_Helper::getUri(
|
||||
'css',
|
||||
array(
|
||||
'rewriteWorks' => false
|
||||
,
|
||||
'minAppUri' => '/myApp/min/'
|
||||
,
|
||||
'groupsConfigFile' => self::$test_files . '/htmlHelper_groupsConfig.php'
|
||||
)
|
||||
);
|
||||
$this->assertEquals($expected, $actual, 'existing group');
|
||||
|
||||
|
||||
@@ -58,25 +61,32 @@ class MinifyHTMLHelperTest extends TestCase
|
||||
require_once $utilsFile;
|
||||
|
||||
$fiveSecondsAgo = $_SERVER['REQUEST_TIME'] - 5;
|
||||
$obj = new Minify_Source(array(
|
||||
'id' => '1',
|
||||
'content' => '1',
|
||||
'lastModified' => $fiveSecondsAgo,
|
||||
));
|
||||
$obj = new Minify_Source(
|
||||
array(
|
||||
'id' => '1',
|
||||
'content' => '1',
|
||||
'lastModified' => $fiveSecondsAgo,
|
||||
)
|
||||
);
|
||||
|
||||
$output = Minify_mtime(array($uri1, $uri2, $obj));
|
||||
$this->assertEquals($fiveSecondsAgo, $output, 'utils.php : Minify_mtime w/ files & obj');
|
||||
|
||||
$obj = new Minify_Source(array(
|
||||
'id' => '2',
|
||||
'content' => '2',
|
||||
'lastModified' => strtotime('2000-01-01'),
|
||||
));
|
||||
$output = Minify_mtime(array(
|
||||
$obj
|
||||
,
|
||||
'css'
|
||||
), self::$test_files . '/htmlHelper_groupsConfig.php');
|
||||
$obj = new Minify_Source(
|
||||
array(
|
||||
'id' => '2',
|
||||
'content' => '2',
|
||||
'lastModified' => strtotime('2000-01-01'),
|
||||
)
|
||||
);
|
||||
$output = Minify_mtime(
|
||||
array(
|
||||
$obj
|
||||
,
|
||||
'css'
|
||||
),
|
||||
self::$test_files . '/htmlHelper_groupsConfig.php'
|
||||
);
|
||||
$this->assertEquals($maxTime, $output, 'utils.php : Minify_mtime w/ obj & group');
|
||||
}
|
||||
}
|
||||
|
@@ -8,7 +8,7 @@ use Minify_NailgunClosureCompiler;
|
||||
|
||||
class MinifyNailgunClosureCompilerTest extends TestCase
|
||||
{
|
||||
public static function setupBeforeClass()
|
||||
public static function setupBeforeClass(): void
|
||||
{
|
||||
parent::setupBeforeClass();
|
||||
Minify_ClosureCompiler::$isDebug = true;
|
||||
|
@@ -7,7 +7,7 @@ use Minify_YUICompressor;
|
||||
|
||||
class MinifyYuiCSSTest extends TestCase
|
||||
{
|
||||
public static function setupBeforeClass()
|
||||
public static function setupBeforeClass(): void
|
||||
{
|
||||
parent::setupBeforeClass();
|
||||
|
||||
@@ -18,7 +18,7 @@ class MinifyYuiCSSTest extends TestCase
|
||||
Minify_YUICompressor::$tempDir = sys_get_temp_dir();
|
||||
}
|
||||
|
||||
public function setUp()
|
||||
public function setUp(): void
|
||||
{
|
||||
$this->assertHasJar();
|
||||
}
|
||||
|
@@ -6,7 +6,9 @@ use Minify_HTML_Helper;
|
||||
|
||||
class ScssSourceTest extends TestCase
|
||||
{
|
||||
public function setUp()
|
||||
public string $realDocRoot;
|
||||
|
||||
public function setUp(): void
|
||||
{
|
||||
$this->realDocRoot = $_SERVER['DOCUMENT_ROOT'];
|
||||
$_SERVER['DOCUMENT_ROOT'] = self::$document_root;
|
||||
|
@@ -11,7 +11,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
|
||||
/** @var string */
|
||||
protected static $test_files;
|
||||
|
||||
public static function setupBeforeClass()
|
||||
public static function setupBeforeClass(): void
|
||||
{
|
||||
self::$document_root = __DIR__;
|
||||
self::$test_files = __DIR__ . '/_test_files';
|
||||
@@ -25,7 +25,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
|
||||
*/
|
||||
protected function countBytes($str)
|
||||
{
|
||||
return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
|
||||
return (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2))
|
||||
? mb_strlen($str, '8bit')
|
||||
: strlen($str);
|
||||
}
|
||||
|
Reference in New Issue
Block a user