Merge pull request #709 from mrclay/docker

Updates

.semver

@@ -1,6 +1,6 @@
 ---
 :major: 3
 :minor: 0
-:patch: 11
+:patch: 14
 :special: ''
 :metadata: ''

CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## [4.0.0] - 2024-01-04
+
+- Support PHP 8.1+
+- Update PHPUnit to 8.x
+- Replace `leafo/scssphp` with `scssphp/scssphp`
+
+## [3.0.14] - 2023-05-05
+
+- Support monolog v3, [#705]
+- Allow invalidation from manual invocation, [#700]
+- Add property declaration, [#699]
+
+[3.0.14]: https://github.com/mrclay/minify/compare/3.0.13...3.0.14
+[#705]: https://github.com/mrclay/minify/pull/705
+[#700]: https://github.com/mrclay/minify/pull/700
+[#699]: https://github.com/mrclay/minify/pull/699
+
 ## [3.0.13] - 2022-10-03
 
 - Add `Minify_Cache_APCu` to replace `Minify_Cache_APC`, [#697]

composer.json

@@ -17,32 +17,36 @@
 		"wiki": "https://github.com/mrclay/minify/blob/master/docs"
 	},
 	"autoload": {
-		"classmap": ["lib/"]
+		"classmap": [
+			"lib/"
+		]
 	},
 	"autoload-dev": {
-		"psr-4": {"Minify\\Test\\": "tests/"}
+		"psr-4": {
+			"Minify\\Test\\": "tests/"
+		}
 	},
 	"config": {
 		"platform": {
-			"php": "5.3.29"
+			"php": "8.1.0"
 		},
 		"sort-packages": true
 	},
 	"require": {
-		"php": "^5.3.0 || ^7.0 || ^8.0",
+		"php": "^8.1",
 		"ext-pcre": "*",
 		"intervention/httpauth": "^2.0|^3.0",
 		"marcusschwarz/lesserphp": "^0.5.5",
-		"monolog/monolog": "~1.1|~2.0",
+		"monolog/monolog": "~1.1|~2.0|~3.0",
 		"mrclay/jsmin-php": "~2",
-		"mrclay/props-dic": "^2.2|^3.0",
+		"mrclay/props-dic": "^4",
 		"tubalmartin/cssmin": "~4"
 	},
 	"require-dev": {
 		"firephp/firephp-core": "~0.4.0",
-		"leafo/scssphp": "^0.3 || ^0.6 || ^0.7",
 		"meenie/javascript-packer": "~1.1",
-		"phpunit/phpunit": "^4.8.36",
+		"phpunit/phpunit": "^8",
+		"scssphp/scssphp": "^1.12",
 		"tedivm/jshrink": "~1.1.0"
 	},
 	"suggest": {

docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.7"
+services:
+  apache:
+    image: php:8.3-apache
+    ports:
+      - 8080:80
+    volumes:
+      - .:/var/www/html/min

lib/Minify.php

@@ -118,6 +118,7 @@ class Minify
             'quiet' => false, // serve() will send headers and output
             'debug' => false,
             'concatOnly' => false,
+            'invalidate' => false,
 
             // if you override these, the response codes MUST be directly after
             // the first space.
@@ -284,6 +285,7 @@ class Minify
             'lastModifiedTime' => $this->options['lastModifiedTime'],
             'isPublic' => $this->options['isPublic'],
             'encoding' => $this->options['encodeMethod'],
+            'invalidate' => $this->options['invalidate'],
         );
 
         if ($this->options['maxAge'] > 0) {

lib/Minify/App.php

@@ -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;
             }
 

lib/Minify/ClosureCompiler.php

@@ -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)) {

lib/Minify/HTML.php

@@ -22,6 +22,11 @@ class Minify_HTML
      * @var boolean
      */
     protected $_jsCleanComments = true;
+    
+    /**
+     * @var string
+     */
+    protected $_html;
 
     /**
      * "Minify" an HTML page

lib/Minify/ScssCssSource.php

@@ -1,7 +1,6 @@
 <?php
-use Leafo\ScssPhp\Compiler;
-use Leafo\ScssPhp\Server;
-use Leafo\ScssPhp\Version;
+use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Version;
 
 /**
  * Class for using SCSS files
@@ -152,12 +151,12 @@ class Minify_ScssCssSource extends Minify_Source
         // and will treat the @import line as css import
         $scss->setImportPaths(dirname($filename));
 
-        $css = $scss->compile(file_get_contents($filename), $filename);
+        $css = $scss->compileString(file_get_contents($filename), $filename)->getCss();
         $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();
 

tests/HTTPEncoderTest.php

@@ -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) {

tests/LessSourceTest.php

@@ -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;

tests/MinifyCSSUriRewriterTest.php

@@ -6,7 +6,7 @@ use Minify_CSS_UriRewriter;
 
 class MinifyCSSUriRewriterTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         Minify_CSS_UriRewriter::$debugText = '';
     }

tests/MinifyCacheAPCTest.php

@@ -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");

tests/MinifyCacheAPCuTest.php

@@ -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");

tests/MinifyCacheMemcacheTest.php

@@ -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");

tests/MinifyCacheWinCacheTest.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");

tests/MinifyCacheZendPlatformTest.php

@@ -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

tests/MinifyClosureCompilerTest.php

@@ -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;

tests/MinifyHTMLHelperTest.php

@@ -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');
         }
     }

tests/MinifyNailgunClosureCompilerTest.php

@@ -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;

tests/MinifyYuiCSSTest.php

@@ -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();
     }

tests/ScssSourceTest.php

@@ -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;

tests/TestCase.php

@@ -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);
     }