Changeset 2928234

Timestamp:

06/19/2023 08:53:19 PM (3 years ago)

Author:

seismicpixels

Message:

Updating to 1.9.4

Location:

optimize-scripts-styles

Files:

• assets/banner-1544x500.jpg (modified) (previous)
• assets/banner-772x250.jpg (modified) (previous)
• assets/icon-128x128.png (modified) (previous)
• assets/icon-256x256.png (modified) (previous)
• trunk/library/functions.php (modified) (1 diff)
• trunk/library/includes/minify/src/CSS.php (modified) (19 diffs)
• trunk/library/includes/minify/src/Exception.php (modified) (2 diffs)
• trunk/library/includes/minify/src/Exceptions/BasicException.php (modified) (3 diffs)
• trunk/library/includes/minify/src/Exceptions/FileImportException.php (modified) (2 diffs)
• trunk/library/includes/minify/src/Exceptions/IOException.php (modified) (2 diffs)
• trunk/library/includes/minify/src/JS.php (modified) (20 diffs)
• trunk/library/includes/minify/src/Minify.php (modified) (16 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/sp-optimize-scripts.php (modified) (1 diff)

optimize-scripts-styles/trunk/library/functions.php

@@ -751 +751 @@
  */
 // returns false if the file doesn't exist
-function get_path_from_src( $src ) {
-    return realpath( '.' . str_replace( get_bloginfo('url'), '', preg_replace( '/\?.*/', '', $src ) ) );
+function get_path_from_src( $src ) {    
+    // break the blog URL apart to replace all parts separately
+    $protocols = ['https://', 'http://'];
+    $blog_uri =  str_replace( $protocols, '', get_bloginfo('url') );
+    $path = str_replace( array_merge( $protocols, [$blog_uri] ), '', preg_replace( '/\?.*/', '', $src ) );
+    // grab the file system path
+    $realpath = realpath( '.' . $path );
+    return $realpath;
 }
 

optimize-scripts-styles/trunk/library/includes/minify/src/CSS.php

@@ -1 +1 @@
 <?php
+
 /**
- * CSS Minifier
+ * CSS Minifier.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -13 +14 @@
 
 use MatthiasMullie\Minify\Exceptions\FileImportException;
+use MatthiasMullie\PathConverter\Converter;
 use MatthiasMullie\PathConverter\ConverterInterface;
-use MatthiasMullie\PathConverter\Converter;
 
 /**
- * CSS minifier
+ * CSS minifier.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
  *
- * @package Minify
  * @author Matthias Mullie <[email protected]>
  * @author Tijs Verkoyen <[email protected]>
@@ -45 +45 @@
         'svg' => 'data:image/svg+xml',
         'woff' => 'data:application/x-font-woff',
+        'woff2' => 'data:application/x-font-woff2',
+        'avif' => 'data:image/avif',
+        'apng' => 'data:image/apng',
+        'webp' => 'data:image/webp',
         'tif' => 'image/tiff',
         'tiff' => 'image/tiff',
@@ -94 +98 @@
 
             // add to top
-            $content = implode(';', $matches[2]).';'.trim($content, ';');
+            $content = implode(';', $matches[2]) . ';' . trim($content, ';');
         }
 
@@ -103 +107 @@
      * Combine CSS from import statements.
      *
-     * @import's will be loaded and their content merged into the original file,
-     * to save HTTP requests.
+     * Import statements will be loaded and their content merged into the original
+     * file, to save HTTP requests.
      *
      * @param string   $source  The file to combine imports for
@@ -201 +205 @@
         foreach ($matches as $match) {
             // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
+            $importPath = dirname($source) . '/' . $match['path'];
 
             // only replace the import with the content if we can grab the
@@ -212 +216 @@
             // import chain.
             if (in_array($importPath, $parents)) {
-                throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+                throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.');
             }
 
             // grab referenced file & minify it (which may include importing
             // yet other @import statements recursively)
-            $minifier = new static($importPath);
+            $minifier = new self($importPath);
             $minifier->setMaxImportSize($this->maxImportSize);
             $minifier->setImportExtensions($this->importExtensions);
@@ -224 +228 @@
             // check if this is only valid for certain media
             if (!empty($match['media'])) {
-                $importContent = '@media '.$match['media'].'{'.$importContent.'}';
+                $importContent = '@media ' . $match['media'] . '{' . $importContent . '}';
             }
 
@@ -263 +267 @@
                 // get the path for the file that will be imported
                 $path = $match[2];
-                $path = dirname($source).'/'.$path;
+                $path = dirname($source) . '/' . $path;
 
                 // only replace the import with the content if we're able to get
@@ -274 +278 @@
                     // build replacement
                     $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+                    $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')';
                 }
             }
@@ -290 +294 @@
      *
      * @param string[optional] $path    Path to write the data to
-     * @param string[]         $parents Parent paths, for circular reference checks
+     * @param string[] $parents Parent paths, for circular reference checks
      *
      * @return string The minified data
@@ -308 +312 @@
             $this->extractStrings();
             $this->stripComments();
-            $this->extractCalcs();
+            $this->extractMath();
+            $this->extractCustomProperties();
             $css = $this->replace($css);
 
@@ -465 +470 @@
             $search[] = $match[0];
             if ($type === 'url') {
-                $replace[] = 'url('.$url.')';
+                $replace[] = 'url(' . $url . ')';
             } elseif ($type === 'import') {
-                $replace[] = '@import "'.$url.'"';
+                $replace[] = '@import "' . $url . '"';
             }
         }
@@ -526 +531 @@
 
         return preg_replace_callback(
-            '/(?<=[: ])('.implode('|', array_keys($colors)).')(?=[; }])/i',
+            '/(?<=[: ])(' . implode('|', array_keys($colors)) . ')(?=[; }])/i',
             function ($match) use ($colors) {
                 return $colors[strtoupper($match[0])];
@@ -549 +554 @@
 
         $callback = function ($match) use ($weights) {
-            return $match[1].$weights[$match[2]];
+            return $match[1] . $weights[$match[2]];
         };
 
-        return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content);
+        return preg_replace_callback('/(font-weight\s*:\s*)(' . implode('|', array_keys($weights)) . ')(?=[;}])/', $callback, $content);
     }
 
@@ -584 +589 @@
         // 0%, potentially other units as well. Only stripping 'px' for now.
         // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+        $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content);
 
         // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content);
         // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+        $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content);
 
         // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content);
 
         // IE doesn't seem to understand a unitless flex-basis value (correct -
@@ -628 +633 @@
     protected function stripComments()
     {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            $count = count($minifier->extracted);
-            $placeholder = '/*'.$count.'*/';
-            $minifier->extracted[$placeholder] = $match[0];
-
-            return $placeholder;
-        };
-        $this->registerPattern('/\n?\/\*(!|.*?@license|.*?@preserve).*?\*\/\n?/s', $callback);
-
-        $this->registerPattern('/\/\*.*?\*\//s', '');
+        $this->stripMultilineComments();
     }
 
@@ -670 +664 @@
         // selectors like `div.weird- p`
         $pseudos = array('nth-child', 'nth-last-child', 'nth-last-of-type', 'nth-of-type');
-        $content = preg_replace('/:('.implode('|', $pseudos).')\(\s*([+-]?)\s*(.+?)\s*([+-]?)\s*(.*?)\s*\)/', ':$1($2$3$4$5)', $content);
+        $content = preg_replace('/:(' . implode('|', $pseudos) . ')\(\s*([+-]?)\s*(.+?)\s*([+-]?)\s*(.*?)\s*\)/', ':$1($2$3$4$5)', $content);
 
         // remove semicolon/whitespace followed by closing bracket
@@ -679 +673 @@
 
     /**
-     * Replace all `calc()` occurrences.
-     */
-    protected function extractCalcs()
-    {
+     * Replace all occurrences of functions that may contain math, where
+     * whitespace around operators needs to be preserved (e.g. calc, clamp).
+     */
+    protected function extractMath()
+    {
+        $functions = array('calc', 'clamp', 'min', 'max');
+        $pattern = '/\b(' . implode('|', $functions) . ')(\(.+?)(?=$|;|})/m';
+
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            $length = strlen($match[1]);
+        $callback = function ($match) use ($minifier, $pattern, &$callback) {
+            $function = $match[1];
+            $length = strlen($match[2]);
             $expr = '';
             $opened = 0;
 
-            for ($i = 0; $i < $length; $i++) {
-                $char = $match[1][$i];
+            // the regular expression for extracting math has 1 significant problem:
+            // it can't determine the correct closing parenthesis...
+            // instead, it'll match a larger portion of code to where it's certain that
+            // the calc() musts have ended, and we'll figure out which is the correct
+            // closing parenthesis here, by counting how many have opened
+            for ($i = 0; $i < $length; ++$i) {
+                $char = $match[2][$i];
                 $expr .= $char;
                 if ($char === '(') {
-                    $opened++;
+                    ++$opened;
                 } elseif ($char === ')' && --$opened === 0) {
                     break;
                 }
             }
-            $rest = str_replace($expr, '', $match[1]);
-            $expr = trim(substr($expr, 1, -1));
-
+
+            // now that we've figured out where the calc() starts and ends, extract it
             $count = count($minifier->extracted);
-            $placeholder = 'calc('.$count.')';
-            $minifier->extracted[$placeholder] = 'calc('.$expr.')';
-
-            return $placeholder.$rest;
+            $placeholder = 'math(' . $count . ')';
+            $minifier->extracted[$placeholder] = $function . '(' . trim(substr($expr, 1, -1)) . ')';
+
+            // and since we've captured more code than required, we may have some leftover
+            // calc() in here too - go recursive on the remaining but of code to go figure
+            // that out and extract what is needed
+            $rest = $minifier->str_replace_first($function . $expr, '', $match[0]);
+            $rest = preg_replace_callback($pattern, $callback, $rest);
+
+            return $placeholder . $rest;
         };
 
-        $this->registerPattern('/calc(\(.+?)(?=$|;|}|calc\()/', $callback);
-        $this->registerPattern('/calc(\(.+?)(?=$|;|}|calc\()/m', $callback);
+        $this->registerPattern($pattern, $callback);
+    }
+
+    /**
+     * Replace custom properties, whose values may be used in scenarios where
+     * we wouldn't want them to be minified (e.g. inside calc).
+     */
+    protected function extractCustomProperties()
+    {
+        // PHP only supports $this inside anonymous functions since 5.4
+        $minifier = $this;
+        $this->registerPattern(
+            '/(?<=^|[;}{])\s*(--[^:;{}"\'\s]+)\s*:([^;{}]+)/m',
+            function ($match) use ($minifier) {
+                $placeholder = '--custom-' . count($minifier->extracted) . ':0';
+                $minifier->extracted[$placeholder] = $match[1] . ':' . trim($match[2]);
+
+                return $placeholder;
+            }
+        );
     }
 

optimize-scripts-styles/trunk/library/includes/minify/src/Exception.php

@@ -1 +1 @@
 <?php
+
 /**
- * Base Exception
+ * Base Exception.
  *
  * @deprecated Use Exceptions\BasicException instead
@@ -7 +8 @@
  * @author Matthias Mullie <[email protected]>
  */
+
 namespace MatthiasMullie\Minify;
 
 /**
- * Base Exception Class
+ * Base Exception Class.
+ *
  * @deprecated Use Exceptions\BasicException instead
  *
- * @package Minify
  * @author Matthias Mullie <[email protected]>
  */

optimize-scripts-styles/trunk/library/includes/minify/src/Exceptions/BasicException.php

@@ -1 +1 @@
 <?php
+
 /**
- * Basic exception
+ * Basic exception.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -9 +10 @@
  * @license MIT License
  */
+
 namespace MatthiasMullie\Minify\Exceptions;
 
@@ -14 +16 @@
 
 /**
- * Basic Exception Class
+ * Basic Exception Class.
  *
- * @package Minify\Exception
  * @author Matthias Mullie <[email protected]>
  */

optimize-scripts-styles/trunk/library/includes/minify/src/Exceptions/FileImportException.php

@@ -1 +1 @@
 <?php
+
 /**
- * File Import Exception
+ * File Import Exception.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -9 +10 @@
  * @license MIT License
  */
+
 namespace MatthiasMullie\Minify\Exceptions;
 
 /**
- * File Import Exception Class
+ * File Import Exception Class.
  *
- * @package Minify\Exception
  * @author Matthias Mullie <[email protected]>
  */

optimize-scripts-styles/trunk/library/includes/minify/src/Exceptions/IOException.php

@@ -1 +1 @@
 <?php
+
 /**
- * IO Exception
+ * IO Exception.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -9 +10 @@
  * @license MIT License
  */
+
 namespace MatthiasMullie\Minify\Exceptions;
 
 /**
- * IO Exception Class
+ * IO Exception Class.
  *
- * @package Minify\Exception
  * @author Matthias Mullie <[email protected]>
  */

optimize-scripts-styles/trunk/library/includes/minify/src/JS.php

@@ -1 +1 @@
 <?php
+
 /**
- * JavaScript minifier
+ * JavaScript minifier.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -9 +10 @@
  * @license MIT License
  */
+
 namespace MatthiasMullie\Minify;
 
 /**
- * JavaScript Minifier Class
+ * JavaScript Minifier Class.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
  *
- * @package Minify
  * @author Matthias Mullie <[email protected]>
  * @author Tijs Verkoyen <[email protected]>
@@ -30 +31 @@
      * pattern modifier (/u) set.
      *
+     * @internal
+     *
      * @var string
      */
@@ -125 +128 @@
     public function __construct()
     {
-        call_user_func_array(array('parent', '__construct'), func_get_args());
-
-        $dataDir = __DIR__.'/../data/js/';
+        call_user_func_array(array('\\MatthiasMullie\Minify\\Minify', '__construct'), func_get_args());
+
+        $dataDir = __DIR__ . '/../data/js/';
         $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operators = file($dataDir.'operators.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+        $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options);
+        $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options);
+        $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options);
+        $this->operators = file($dataDir . 'operators.txt', $options);
+        $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
+        $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
     }
 
@@ -175 +178 @@
 
             // combine js: separating the scripts by a ;
-            $content .= $js.";";
+            $content .= $js . ';';
         }
 
@@ -196 +199 @@
     protected function stripComments()
     {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            $count = count($minifier->extracted);
-            $placeholder = '/*'.$count.'*/';
-            $minifier->extracted[$placeholder] = $match[0];
-
-            return $placeholder;
-        };
-        // multi-line comments
-        $this->registerPattern('/\n?\/\*(!|.*?@license|.*?@preserve).*?\*\/\n?/s', $callback);
-        $this->registerPattern('/\/\*.*?\*\//s', '');
+        $this->stripMultilineComments();
 
         // single-line comments
@@ -236 +228 @@
         $callback = function ($match) use ($minifier) {
             $count = count($minifier->extracted);
-            $placeholder = '"'.$count.'"';
+            $placeholder = '"' . $count . '"';
             $minifier->extracted[$placeholder] = $match[0];
 
@@ -255 +247 @@
         // likely part of a division, not a regex)
         $keywords = array('do', 'in', 'new', 'else', 'throw', 'yield', 'delete', 'return',  'typeof');
-        $before = '([=:,;\+\-\*\/\}\(\{\[&\|!]|^|'.implode('|', $keywords).')\s*';
+        $before = '(^|[=:,;\+\-\*\?\/\}\(\{\[&\|!]|' . implode('|', $keywords) . ')\s*';
         $propertiesAndMethods = array(
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#Properties_2
@@ -275 +267 @@
         $delimiters = array_fill(0, count($propertiesAndMethods), '/');
         $propertiesAndMethods = array_map('preg_quote', $propertiesAndMethods, $delimiters);
-        $after = '(?=\s*([\.,;\)\}&\|+]|\/\/|$|\.('.implode('|', $propertiesAndMethods).')))';
-        $this->registerPattern('/'.$before.'\K'.$pattern.$after.'/', $callback);
+        $after = '(?=\s*([\.,;:\)\}&\|+]|\/\/|$|\.(' . implode('|', $propertiesAndMethods) . ')))';
+        $this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);
 
         // regular expressions following a `)` are rather annoying to detect...
@@ -290 +282 @@
         // it's quite likely not a regex
         $before = '\)\s*';
-        $after = '(?=\s*\.('.implode('|', $propertiesAndMethods).'))';
-        $this->registerPattern('/'.$before.'\K'.$pattern.$after.'/', $callback);
+        $after = '(?=\s*\.(' . implode('|', $propertiesAndMethods) . '))';
+        $this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);
 
         // 1 more edge case: a regex can be followed by a lot more operators or
@@ -299 +291 @@
         $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
         $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/');
-        $after = '(?=\s*\n\s*('.implode('|', $operators).'))';
-        $this->registerPattern('/'.$pattern.$after.'/', $callback);
+        $after = '(?=\s*\n\s*(' . implode('|', $operators) . '))';
+        $this->registerPattern('/' . $pattern . $after . '/', $callback);
     }
 
@@ -344 +336 @@
         $content = preg_replace(
             array(
-                '/('.implode('|', $operatorsBefore).')\s+/',
-                '/\s+('.implode('|', $operatorsAfter).')/',
+                '/(' . implode('|', $operatorsBefore) . ')\s+/',
+                '/\s+(' . implode('|', $operatorsAfter) . ')/',
             ),
             '\\1',
@@ -362 +354 @@
 
         // collapse whitespace around reserved words into single space
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $keywordsBefore).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $keywordsAfter).')(?=([;\{\s]|$))/', ' \\1', $content);
+        $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $keywordsBefore) . ')\s+/', '\\2 ', $content);
+        $content = preg_replace('/\s+(' . implode('|', $keywordsAfter) . ')(?=([;\{\s]|$))/', ' \\1', $content);
 
         /*
@@ -373 +365 @@
         $operatorsDiffBefore = array_diff($operators, $operatorsBefore);
         $operatorsDiffAfter = array_diff($operators, $operatorsAfter);
-        $content = preg_replace('/('.implode('|', $operatorsDiffBefore).')[^\S\n]+/', '\\1', $content);
-        $content = preg_replace('/[^\S\n]+('.implode('|', $operatorsDiffAfter).')/', '\\1', $content);
+        $content = preg_replace('/(' . implode('|', $operatorsDiffBefore) . ')[^\S\n]+/', '\\1', $content);
+        $content = preg_replace('/[^\S\n]+(' . implode('|', $operatorsDiffAfter) . ')/', '\\1', $content);
 
         /*
@@ -406 +398 @@
          * I'm going to double that semicolon (if any) so after the next line,
          * which strips semicolons here & there, we're still left with this one.
-         */
-        $content = preg_replace('/(for\([^;\{]*;[^;\{]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content);
+         * Note the special recursive construct in the three inner parts of the for:
+         * (\{([^\{\}]*(?-2))*[^\{\}]*\})? - it is intended to match inline
+         * functions bodies, e.g.: i<arr.map(function(e){return e}).length.
+         * Also note that the construct is applied only once and multiplied
+         * for each part of the for, otherwise it risks a catastrophic backtracking.
+         * The limitation is that it will not allow closures in more than one
+         * of the three parts for a specific for() case.
+         * REGEX throwing catastrophic backtracking: $content = preg_replace('/(for\([^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*;[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*;[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*\));(\}|$)/s', '\\1;;\\8', $content);
+         */
+        $content = preg_replace('/(for\((?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*);[^;\{]*;[^;\{]*\));(\}|$)/s', '\\1;;\\4', $content);
+        $content = preg_replace('/(for\([^;\{]*;(?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*);[^;\{]*\));(\}|$)/s', '\\1;;\\4', $content);
+        $content = preg_replace('/(for\([^;\{]*;[^;\{]*;(?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*)\));(\}|$)/s', '\\1;;\\4', $content);
+
         $content = preg_replace('/(for\([^;\{]+\s+in\s+[^;\{]+\));(\}|$)/s', '\\1;;\\2', $content);
+
+        /*
+         * Do the same for the if's that don't have a body but are followed by ;}
+         */
+        $content = preg_replace('/(\bif\s*\([^{;]*\));\}/s', '\\1;;}', $content);
+
         /*
          * Below will also keep `;` after a `do{}while();` along with `while();`
@@ -466 +475 @@
         // don't confuse = with other assignment shortcuts (e.g. +=)
         $chars = preg_quote('+-*\=<>%&|', $delimiter);
-        $operators['='] = '(?<!['.$chars.'])\=';
+        $operators['='] = '(?<![' . $chars . '])\=';
 
         return $operators;
@@ -488 +497 @@
         // add word boundaries
         array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
+            return '\b' . $value . '\b';
         });
 
@@ -525 +534 @@
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+            if (!preg_match('/^' . $minifier::REGEX_VARIABLE . '$/u', $property)) {
                 return $match[0];
             }
 
-            return '.'.$property;
+            return '.' . $property;
         };
 
@@ -550 +559 @@
          */
         $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
-
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
+        $keywords = '(?<!' . implode(')(?<!', $keywords) . ')';
+
+        return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
     }
 
@@ -576 +585 @@
             }
 
-            return $match[1].($match[2] === 'true' ? '!0' : '!1');
+            return $match[1] . ($match[2] === 'true' ? '!0' : '!1');
         };
         $content = preg_replace_callback('/(^|.\s*)\b(true|false)\b(?!:)/', $callback, $content);

optimize-scripts-styles/trunk/library/includes/minify/src/Minify.php

@@ -1 +1 @@
 <?php
+
 /**
- * Abstract minifier class
+ * Abstract minifier class.
  *
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
@@ -9 +10 @@
  * @license MIT License
  */
+
 namespace MatthiasMullie\Minify;
 
@@ -19 +21 @@
  * Please report bugs on https://github.com/matthiasmullie/minify/issues
  *
- * @package Minify
  * @author Matthias Mullie <[email protected]>
  * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
@@ -45 +46 @@
      * without having to worry about potential "code-like" characters inside.
      *
+     * @internal
+     *
      * @var string[]
      */
@@ -106 +109 @@
      *
      * @return static
-     * 
+     *
      * @throws IOException
      */
@@ -129 +132 @@
             // check if we can read the file
             if (!$this->canImportFile($path)) {
-                throw new IOException('The file "'.$path.'" could not be opened for reading. Check if PHP has enough permissions.');
+                throw new IOException('The file "' . $path . '" could not be opened for reading. Check if PHP has enough permissions.');
             }
 
@@ -244 +247 @@
      * Register a pattern to execute against the source content.
      *
+     * If $replacement is a string, it must be plain text. Placeholders like $1 or \2 don't work.
+     * If you need that functionality, use a callback instead.
+     *
      * @param string          $pattern     PCRE pattern
      * @param string|callable $replacement Replacement value for matched pattern
@@ -253 +259 @@
 
         $this->patterns[] = array($pattern, $replacement);
+    }
+
+    /**
+     * Both JS and CSS use the same form of multi-line comment, so putting the common code here.
+     */
+    protected function stripMultilineComments()
+    {
+        // First extract comments we want to keep, so they can be restored later
+        // PHP only supports $this inside anonymous functions since 5.4
+        $minifier = $this;
+        $callback = function ($match) use ($minifier) {
+            $count = count($minifier->extracted);
+            $placeholder = '/*'.$count.'*/';
+            $minifier->extracted[$placeholder] = $match[0];
+
+            return $placeholder;
+        };
+        $this->registerPattern('/
+            # optional newline
+            \n?
+
+            # start comment
+            \/\*
+
+            # comment content
+            (?:
+                # either starts with an !
+                !
+            |
+                # or, after some number of characters which do not end the comment
+                (?:(?!\*\/).)*?
+
+                # there is either a @license or @preserve tag
+                @(?:license|preserve)
+            )
+
+            # then match to the end of the comment
+            .*?\*\/\n?
+
+            /ixs', $callback);
+
+        // Then strip all other comments
+        $this->registerPattern('/\/\*.*?\*\//s', '');
     }
 
@@ -269 +318 @@
     protected function replace($content)
     {
-        $processed = '';
+        $contentLength = strlen($content);
+        $output = '';
+        $processedOffset = 0;
         $positions = array_fill(0, count($this->patterns), -1);
         $matches = array();
 
-        while ($content) {
+        while ($processedOffset < $contentLength) {
             // find first match for all patterns
             foreach ($this->patterns as $i => $pattern) {
@@ -286 +337 @@
                 // no need to re-run matches that are still in the part of the
                 // content that hasn't been processed
-                if ($positions[$i] >= 0) {
+                if ($positions[$i] >= $processedOffset) {
                     continue;
                 }
 
                 $match = null;
-                if (preg_match($pattern, $content, $match, PREG_OFFSET_CAPTURE)) {
+                if (preg_match($pattern, $content, $match, PREG_OFFSET_CAPTURE, $processedOffset)) {
                     $matches[$i] = $match;
 
@@ -308 +359 @@
             // no more matches to find: everything's been processed, break out
             if (!$matches) {
-                $processed .= $content;
+                // output the remaining content
+                $output .= substr($content, $processedOffset);
                 break;
             }
@@ -315 +367 @@
             // only want to execute that one, since we're unsure if what the
             // other found was not inside what the first found)
-            $discardLength = min($positions);
-            $firstPattern = array_search($discardLength, $positions);
-            $match = $matches[$firstPattern][0][0];
+            $matchOffset = min($positions);
+            $firstPattern = array_search($matchOffset, $positions);
+            $match = $matches[$firstPattern];
 
             // execute the pattern that matches earliest in the content string
-            list($pattern, $replacement) = $this->patterns[$firstPattern];
-            $replacement = $this->replacePattern($pattern, $replacement, $content);
-
-            // figure out which part of the string was unmatched; that's the
-            // part we'll execute the patterns on again next
-            $content = (string) substr($content, $discardLength);
-            $unmatched = (string) substr($content, strpos($content, $match) + strlen($match));
-
-            // move the replaced part to $processed and prepare $content to
-            // again match batch of patterns against
-            $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched));
-            $content = $unmatched;
-
-            // first match has been replaced & that content is to be left alone,
-            // the next matches will start after this replacement, so we should
-            // fix their offsets
-            foreach ($positions as $i => $position) {
-                $positions[$i] -= $discardLength + strlen($match);
-            }
-        }
-
-        return $processed;
-    }
-
-    /**
-     * This is where a pattern is matched against $content and the matches
-     * are replaced by their respective value.
-     * This function will be called plenty of times, where $content will always
-     * move up 1 character.
-     *
-     * @param string          $pattern     Pattern to match
+            list(, $replacement) = $this->patterns[$firstPattern];
+
+            // add the part of the input between $processedOffset and the first match;
+            // that content wasn't matched by anything
+            $output .= substr($content, $processedOffset, $matchOffset - $processedOffset);
+            // add the replacement for the match
+            $output .= $this->executeReplacement($replacement, $match);
+            // advance $processedOffset past the match
+            $processedOffset = $matchOffset + strlen($match[0][0]);
+        }
+
+        return $output;
+    }
+
+    /**
+     * If $replacement is a callback, execute it, passing in the match data.
+     * If it's a string, just pass it through.
+     *
      * @param string|callable $replacement Replacement value
-     * @param string          $content     Content to match pattern against
+     * @param array           $match       Match data, in PREG_OFFSET_CAPTURE form
      *
      * @return string
      */
-    protected function replacePattern($pattern, $replacement, $content)
-    {
-        if (is_callable($replacement)) {
-            return preg_replace_callback($pattern, $replacement, $content, 1, $count);
-        } else {
-            return preg_replace($pattern, $replacement, $content, 1, $count);
-        }
+    protected function executeReplacement($replacement, $match)
+    {
+        if (!is_callable($replacement)) {
+            return $replacement;
+        }
+        // convert $match from the PREG_OFFSET_CAPTURE form to the form the callback expects
+        foreach ($match as &$matchItem) {
+            $matchItem = $matchItem[0];
+        }
+
+        return $replacement($match);
     }
 
@@ -396 +439 @@
 
             $count = count($minifier->extracted);
-            $placeholder = $match[1].$placeholderPrefix.$count.$match[1];
-            $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
+            $placeholder = $match[1] . $placeholderPrefix . $count . $match[1];
+            $minifier->extracted[$placeholder] = $match[1] . $match[2] . $match[1];
 
             return $placeholder;
@@ -414 +457 @@
          * escaped (times 2)
          */
-        $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
+        $this->registerPattern('/([' . $chars . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
     }
 
@@ -473 +516 @@
     protected function openFileForWriting($path)
     {
-        if (($handler = @fopen($path, 'w')) === false) {
-            throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
+        if ($path === '' || ($handler = @fopen($path, 'w')) === false) {
+            throw new IOException('The file "' . $path . '" could not be opened for writing. Check if PHP has enough permissions.');
         }
 
@@ -491 +534 @@
     protected function writeToFile($handler, $content, $path = '')
     {
-        if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
-            throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
-        }
+        if (
+            !is_resource($handler) ||
+            ($result = @fwrite($handler, $content)) === false ||
+            ($result < strlen($content))
+        ) {
+            throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.');
+        }
+    }
+
+    protected static function str_replace_first($search, $replace, $subject)
+    {
+        $pos = strpos($subject, $search);
+        if ($pos !== false) {
+            return substr_replace($subject, $replace, $pos, strlen($search));
+        }
+
+        return $subject;
     }
 }

optimize-scripts-styles/trunk/readme.txt

@@ -4 +4 @@
 Tags: scripts, styles, optimize, optimization, minify, compress, seo, performance, combine
 Requires at least: 4.0
-Tested up to: 5.8
-Requires PHP: 5.6
-Stable tag: 1.9.3
+Tested up to: 6.2
+Requires PHP: 7.4
+Stable tag: 1.9.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -90 +90 @@
 
 == Changelog ==
+
+= 1.9.4 =
+* PHP 8.2 compatibility
+* Updated minify package to 1.3.71
+* Fixed a bug with stylesheet dependencies
 
 = 1.9.3 =

optimize-scripts-styles/trunk/sp-optimize-scripts.php

@@ -4 +4 @@
  * Plugin URI: https://www.seismicpixels.com/optimize-scripts-styles-for-wordpress/
  * Description: Provides a quick way to combine and minify all scripts and styles and cache them in your content folder.
- * Version: 1.9.3
+ * Version: 1.9.4
  * Author: Seismic Pixels
  * Author URI: https://www.seismicpixels.com
- * Copyright 2021 Sean Michaud - Seismic Pixels, LLC
+ * Copyright 2023 Sean Michaud - Seismic Pixels, LLC
 */
 
 global $spos_version;
-$spos_version = '1.9.3';
+$spos_version = '1.9.4';
 
 global $spos_settings;