From 28ac355a0808532da519537d395b5d55e6fad8c4 Mon Sep 17 00:00:00 2001 From: Kenji ITO Date: Thu, 9 Nov 2017 20:39:57 +0900 Subject: [PATCH 1/5] Added MatthiasMullie\Minify classes --- system/classes/Autoload.php | 21 +- .../MatthiasMullie/minify/CONTRIBUTING.md | 59 ++ .../classes/MatthiasMullie/minify/Dockerfile | 12 + system/classes/MatthiasMullie/minify/LICENSE | 18 + .../MatthiasMullie/minify/bin/minifycss | 45 ++ .../MatthiasMullie/minify/bin/minifyjs | 45 ++ .../MatthiasMullie/minify/composer.json | 38 + .../minify/data/js/keywords_after.txt | 7 + .../minify/data/js/keywords_before.txt | 26 + .../minify/data/js/keywords_reserved.txt | 63 ++ .../minify/data/js/operators.txt | 46 ++ .../minify/data/js/operators_after.txt | 43 ++ .../minify/data/js/operators_before.txt | 43 ++ .../MatthiasMullie/minify/docker-compose.yml | 11 + .../classes/MatthiasMullie/minify/src/CSS.php | 704 ++++++++++++++++++ .../MatthiasMullie/minify/src/Exception.php | 20 + .../minify/src/Exceptions/BasicException.php | 23 + .../src/Exceptions/FileImportException.php | 21 + .../minify/src/Exceptions/IOException.php | 21 + .../classes/MatthiasMullie/minify/src/JS.php | 638 ++++++++++++++++ .../MatthiasMullie/minify/src/Minify.php | 444 +++++++++++ .../MatthiasMullie/path-converter/LICENSE | 18 + .../path-converter/composer.json | 28 + .../path-converter/src/Converter.php | 195 +++++ .../path-converter/src/ConverterInterface.php | 24 + .../path-converter/src/NoConverter.php | 23 + 26 files changed, 2635 insertions(+), 1 deletion(-) create mode 100644 system/classes/MatthiasMullie/minify/CONTRIBUTING.md create mode 100644 system/classes/MatthiasMullie/minify/Dockerfile create mode 100644 system/classes/MatthiasMullie/minify/LICENSE create mode 100644 system/classes/MatthiasMullie/minify/bin/minifycss create mode 100644 system/classes/MatthiasMullie/minify/bin/minifyjs create mode 100644 system/classes/MatthiasMullie/minify/composer.json create mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_after.txt create mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_before.txt create mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt create mode 100644 system/classes/MatthiasMullie/minify/data/js/operators.txt create mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_after.txt create mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_before.txt create mode 100644 system/classes/MatthiasMullie/minify/docker-compose.yml create mode 100644 system/classes/MatthiasMullie/minify/src/CSS.php create mode 100644 system/classes/MatthiasMullie/minify/src/Exception.php create mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php create mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php create mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php create mode 100644 system/classes/MatthiasMullie/minify/src/JS.php create mode 100644 system/classes/MatthiasMullie/minify/src/Minify.php create mode 100644 system/classes/MatthiasMullie/path-converter/LICENSE create mode 100644 system/classes/MatthiasMullie/path-converter/composer.json create mode 100644 system/classes/MatthiasMullie/path-converter/src/Converter.php create mode 100644 system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php create mode 100644 system/classes/MatthiasMullie/path-converter/src/NoConverter.php diff --git a/system/classes/Autoload.php b/system/classes/Autoload.php index 6a891b4a4..3c8e4fe75 100644 --- a/system/classes/Autoload.php +++ b/system/classes/Autoload.php @@ -9,6 +9,8 @@ */ class Autoload { + const DS = DIRECTORY_SEPARATOR; + /** * @var bool */ @@ -33,7 +35,7 @@ public static function load($className) // New classes under \Geeklog namespace $className = str_replace('Geeklog\\', '', $className); $className = ucfirst($className); - $path = __DIR__ . DIRECTORY_SEPARATOR . $className . '.php'; + $path = __DIR__ . self::DS . $className . '.php'; if (file_exists($path)) { /** @noinspection PhpIncludeInspection */ @@ -43,6 +45,23 @@ public static function load($className) $className::init(); } } + } elseif (stripos($className, 'MatthiasMullie\\') === 0) { + if (stripos($className, 'MatthiasMullie\\Minify\\') === 0) { + $path = __DIR__ . self::DS . 'MatthiasMullie' . self::DS . 'minify' + . self::DS . 'src' . self::DS + . str_ireplace('MatthiasMullie\\Minify\\', '', $className) . '.php'; + } elseif (stripos($className, 'MatthiasMullie\\PathConverter\\') === 0) { + $path = __DIR__ . self::DS . 'MatthiasMullie' . self::DS . 'path-converter' + . self::DS . 'src' . self::DS + . str_ireplace('MatthiasMullie\\PathConverter\\', '', $className) . '.php'; + } else { + $path = ''; + } + + if (file_exists($path)) { + /** @noinspection PhpIncludeInspection */ + include $path; + } } else { // Legacy Geeklog classes $path = __DIR__ . DIRECTORY_SEPARATOR . strtolower($className) . '.class.php'; diff --git a/system/classes/MatthiasMullie/minify/CONTRIBUTING.md b/system/classes/MatthiasMullie/minify/CONTRIBUTING.md new file mode 100644 index 000000000..226cf976b --- /dev/null +++ b/system/classes/MatthiasMullie/minify/CONTRIBUTING.md @@ -0,0 +1,59 @@ +# How to contribute + + +## Issues + +When [filing bugs](https://github.com/matthiasmullie/minify/issues/new), +try to be as thorough as possible: +* What version did you use? +* What did you try to do? ***Please post the relevant parts of your code.*** +* What went wrong? ***Please include error messages, if any.*** +* What was the expected result? + + +## Pull requests + +Bug fixes and general improvements to the existing codebase are always welcome. +New features are also welcome, but will be judged on an individual basis. If +you'd rather not risk wasting your time implementing a new feature only to see +it turned down, please start the discussion by +[opening an issue](https://github.com/matthiasmullie/minify/issues/new). + +Don't forget to add your changes to the [changelog](CHANGELOG.md). + + +### Testing + +Please include tests for every change or addition to the code. +To run the complete test suite: + +```sh +vendor/bin/phpunit +``` + +When submitting a new pull request, please make sure that that the test suite +passes (Travis CI will run it & report back on your pull request.) + +To run the tests on Windows, run `tests/convert_symlinks_to_windows_style.sh` +from the command line in order to convert Linux-style test symlinks to +Windows-style. + + +### Coding standards + +All code must follow [PSR-2](http://www.php-fig.org/psr/psr-2/). Just make sure +to run php-cs-fixer before submitting the code, it'll take care of the +formatting for you: + +```sh +vendor/bin/php-cs-fixer fix src +vendor/bin/php-cs-fixer fix tests +``` + +Document the code thoroughly! + + +## License + +Note that minify is MIT-licensed, which basically allows anyone to do +anything they like with it, without restriction. diff --git a/system/classes/MatthiasMullie/minify/Dockerfile b/system/classes/MatthiasMullie/minify/Dockerfile new file mode 100644 index 000000000..3e719ec90 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/Dockerfile @@ -0,0 +1,12 @@ +FROM php:cli + +COPY . /var/www +WORKDIR /var/www + +RUN apt-get update +RUN apt-get install -y zip unzip zlib1g-dev +RUN docker-php-ext-install zip +RUN docker-php-ext-install pcntl +RUN curl -sS https://getcomposer.org/installer | php +RUN mv composer.phar /usr/local/bin/composer +RUN composer install diff --git a/system/classes/MatthiasMullie/minify/LICENSE b/system/classes/MatthiasMullie/minify/LICENSE new file mode 100644 index 000000000..0c0d08a79 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/LICENSE @@ -0,0 +1,18 @@ +Copyright (c) 2012 Matthias Mullie + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/system/classes/MatthiasMullie/minify/bin/minifycss b/system/classes/MatthiasMullie/minify/bin/minifycss new file mode 100644 index 000000000..6a681a850 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/bin/minifycss @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/system/classes/MatthiasMullie/minify/bin/minifyjs b/system/classes/MatthiasMullie/minify/bin/minifyjs new file mode 100644 index 000000000..4cbe63ff8 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/bin/minifyjs @@ -0,0 +1,45 @@ +#!/usr/bin/env php +minify(); +} catch (Exception $e) { + fwrite(STDERR, $e->getMessage(), PHP_EOL); + exit(1); +} diff --git a/system/classes/MatthiasMullie/minify/composer.json b/system/classes/MatthiasMullie/minify/composer.json new file mode 100644 index 000000000..6d81b4f9d --- /dev/null +++ b/system/classes/MatthiasMullie/minify/composer.json @@ -0,0 +1,38 @@ +{ + "name": "matthiasmullie/minify", + "type": "library", + "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.", + "keywords": ["minify", "minifier", "css", "js", "javascript"], + "homepage": "http://www.minifier.org", + "license": "MIT", + "authors": [ + { + "name": "Matthias Mullie", + "homepage": "http://www.mullie.eu", + "email": "minify@mullie.eu", + "role": "Developer" + } + ], + "require": { + "php": ">=5.3.0", + "ext-pcre": "*", + "matthiasmullie/path-converter": "~1.1" + }, + "require-dev": { + "matthiasmullie/scrapbook": "~1.0", + "phpunit/phpunit": "~4.8", + "friendsofphp/php-cs-fixer": "~2.0" + }, + "suggest": { + "psr/cache-implementation": "Cache implementation to use with Minify::cache" + }, + "autoload": { + "psr-4": { + "MatthiasMullie\\Minify\\": "src/" + } + }, + "bin": [ + "bin/minifycss", + "bin/minifyjs" + ] +} diff --git a/system/classes/MatthiasMullie/minify/data/js/keywords_after.txt b/system/classes/MatthiasMullie/minify/data/js/keywords_after.txt new file mode 100644 index 000000000..5c8cba7f3 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/keywords_after.txt @@ -0,0 +1,7 @@ +in +public +extends +private +protected +implements +instanceof \ No newline at end of file diff --git a/system/classes/MatthiasMullie/minify/data/js/keywords_before.txt b/system/classes/MatthiasMullie/minify/data/js/keywords_before.txt new file mode 100644 index 000000000..5abf35799 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/keywords_before.txt @@ -0,0 +1,26 @@ +do +in +let +new +var +case +else +enum +void +with +class +const +yield +delete +export +import +public +static +typeof +extends +package +private +function +protected +implements +instanceof \ No newline at end of file diff --git a/system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt b/system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt new file mode 100644 index 000000000..2a3ad3c0e --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt @@ -0,0 +1,63 @@ +do +if +in +for +let +new +try +var +case +else +enum +eval +null +this +true +void +with +break +catch +class +const +false +super +throw +while +yield +delete +export +import +public +return +static +switch +typeof +default +extends +finally +package +private +continue +debugger +function +arguments +interface +protected +implements +instanceof +abstract +boolean +byte +char +double +final +float +goto +int +long +native +short +synchronized +throws +transient +volatile \ No newline at end of file diff --git a/system/classes/MatthiasMullie/minify/data/js/operators.txt b/system/classes/MatthiasMullie/minify/data/js/operators.txt new file mode 100644 index 000000000..e66229ae1 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/operators.txt @@ -0,0 +1,46 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +~ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +! +. +[ +] +? +: +, +; +( +) +{ +} \ No newline at end of file diff --git a/system/classes/MatthiasMullie/minify/data/js/operators_after.txt b/system/classes/MatthiasMullie/minify/data/js/operators_after.txt new file mode 100644 index 000000000..71a9b7091 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/operators_after.txt @@ -0,0 +1,43 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +. +[ +] +? +: +, +; +( +) +} \ No newline at end of file diff --git a/system/classes/MatthiasMullie/minify/data/js/operators_before.txt b/system/classes/MatthiasMullie/minify/data/js/operators_before.txt new file mode 100644 index 000000000..ff50d8703 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/data/js/operators_before.txt @@ -0,0 +1,43 @@ ++ +- +* +/ +% += ++= +-= +*= +/= +%= +<<= +>>= +>>>= +&= +^= +|= +& +| +^ +~ +<< +>> +>>> +== +=== +!= +!== +> +< +>= +<= +&& +|| +! +. +[ +? +: +, +; +( +{ diff --git a/system/classes/MatthiasMullie/minify/docker-compose.yml b/system/classes/MatthiasMullie/minify/docker-compose.yml new file mode 100644 index 000000000..c03580c3a --- /dev/null +++ b/system/classes/MatthiasMullie/minify/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3' +services: + php: + build: + context: . + dockerfile: Dockerfile + volumes: + - ./src:/var/www/src + - ./data:/var/www/data + - ./tests:/var/www/tests + - ./phpunit.xml.dist:/var/www/phpunit.xml.dist diff --git a/system/classes/MatthiasMullie/minify/src/CSS.php b/system/classes/MatthiasMullie/minify/src/CSS.php new file mode 100644 index 000000000..6a7910015 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/CSS.php @@ -0,0 +1,704 @@ + + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ + +namespace MatthiasMullie\Minify; + +use MatthiasMullie\Minify\Exceptions\FileImportException; +use MatthiasMullie\PathConverter\ConverterInterface; +use MatthiasMullie\PathConverter\Converter; + +/** + * CSS minifier + * + * Please report bugs on https://github.com/matthiasmullie/minify/issues + * + * @package Minify + * @author Matthias Mullie + * @author Tijs Verkoyen + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +class CSS extends Minify +{ + /** + * @var int maximum inport size in kB + */ + protected $maxImportSize = 5; + + /** + * @var string[] valid import extensions + */ + protected $importExtensions = array( + 'gif' => 'data:image/gif', + 'png' => 'data:image/png', + 'jpe' => 'data:image/jpeg', + 'jpg' => 'data:image/jpeg', + 'jpeg' => 'data:image/jpeg', + 'svg' => 'data:image/svg+xml', + 'woff' => 'data:application/x-font-woff', + 'tif' => 'image/tiff', + 'tiff' => 'image/tiff', + 'xbm' => 'image/x-xbitmap', + ); + + /** + * Set the maximum size if files to be imported. + * + * Files larger than this size (in kB) will not be imported into the CSS. + * Importing files into the CSS as data-uri will save you some connections, + * but we should only import relatively small decorative images so that our + * CSS file doesn't get too bulky. + * + * @param int $size Size in kB + */ + public function setMaxImportSize($size) + { + $this->maxImportSize = $size; + } + + /** + * Set the type of extensions to be imported into the CSS (to save network + * connections). + * Keys of the array should be the file extensions & respective values + * should be the data type. + * + * @param string[] $extensions Array of file extensions + */ + public function setImportExtensions(array $extensions) + { + $this->importExtensions = $extensions; + } + + /** + * Move any import statements to the top. + * + * @param string $content Nearly finished CSS content + * + * @return string + */ + protected function moveImportsToTop($content) + { + if (preg_match_all('/@import[^;]+;/', $content, $matches)) { + // remove from content + foreach ($matches[0] as $import) { + $content = str_replace($import, '', $content); + } + + // add to top + $content = implode('', $matches[0]).$content; + } + + return $content; + } + + /** + * Combine CSS from import statements. + * + * @import's will be loaded and their content merged into the original file, + * to save HTTP requests. + * + * @param string $source The file to combine imports for + * @param string $content The CSS content to combine imports for + * @param string[] $parents Parent paths, for circular reference checks + * + * @return string + * + * @throws FileImportException + */ + protected function combineImports($source, $content, $parents) + { + $importRegexes = array( + // @import url(xxx) + '/ + # import statement + @import + + # whitespace + \s+ + + # open url() + url\( + + # (optional) open path enclosure + (?P["\']?) + + # fetch path + (?P.+?) + + # (optional) close path enclosure + (?P=quotes) + + # close url() + \) + + # (optional) trailing whitespace + \s* + + # (optional) media statement(s) + (?P[^;]*) + + # (optional) trailing whitespace + \s* + + # (optional) closing semi-colon + ;? + + /ix', + + // @import 'xxx' + '/ + + # import statement + @import + + # whitespace + \s+ + + # open path enclosure + (?P["\']) + + # fetch path + (?P.+?) + + # close path enclosure + (?P=quotes) + + # (optional) trailing whitespace + \s* + + # (optional) media statement(s) + (?P[^;]*) + + # (optional) trailing whitespace + \s* + + # (optional) closing semi-colon + ;? + + /ix', + ); + + // find all relative imports in css + $matches = array(); + foreach ($importRegexes as $importRegex) { + if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) { + $matches = array_merge($matches, $regexMatches); + } + } + + $search = array(); + $replace = array(); + + // loop the matches + foreach ($matches as $match) { + // get the path for the file that will be imported + $importPath = dirname($source).'/'.$match['path']; + + // only replace the import with the content if we can grab the + // content of the file + if (!$this->canImportByPath($match['path']) || !$this->canImportFile($importPath)) { + continue; + } + + // check if current file was not imported previously in the same + // import chain. + if (in_array($importPath, $parents)) { + 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); + $importContent = $minifier->execute($source, $parents); + + // check if this is only valid for certain media + if (!empty($match['media'])) { + $importContent = '@media '.$match['media'].'{'.$importContent.'}'; + } + + // add to replacement array + $search[] = $match[0]; + $replace[] = $importContent; + } + + // replace the import statements + return str_replace($search, $replace, $content); + } + + /** + * Import files into the CSS, base64-ized. + * + * @url(image.jpg) images will be loaded and their content merged into the + * original file, to save HTTP requests. + * + * @param string $source The file to import files for + * @param string $content The CSS content to import files for + * + * @return string + */ + protected function importFiles($source, $content) + { + $regex = '/url\((["\']?)(.+?)\\1\)/i'; + if ($this->importExtensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { + $search = array(); + $replace = array(); + + // loop the matches + foreach ($matches as $match) { + $extension = substr(strrchr($match[2], '.'), 1); + if ($extension && !array_key_exists($extension, $this->importExtensions)) { + continue; + } + + // get the path for the file that will be imported + $path = $match[2]; + $path = dirname($source).'/'.$path; + + // only replace the import with the content if we're able to get + // the content of the file, and it's relatively small + if ($this->canImportFile($path) && $this->canImportBySize($path)) { + // grab content && base64-ize + $importContent = $this->load($path); + $importContent = base64_encode($importContent); + + // build replacement + $search[] = $match[0]; + $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; + } + } + + // replace the import statements + $content = str_replace($search, $replace, $content); + } + + return $content; + } + + /** + * Minify the data. + * Perform CSS optimizations. + * + * @param string[optional] $path Path to write the data to + * @param string[] $parents Parent paths, for circular reference checks + * + * @return string The minified data + */ + public function execute($path = null, $parents = array()) + { + $content = ''; + + // loop CSS data (raw data and files) + foreach ($this->data as $source => $css) { + /* + * Let's first take out strings & comments, since we can't just + * remove whitespace anywhere. If whitespace occurs inside a string, + * we should leave it alone. E.g.: + * p { content: "a test" } + */ + $this->extractStrings(); + $this->stripComments(); + $css = $this->replace($css); + + $css = $this->stripWhitespace($css); + $css = $this->shortenHex($css); + $css = $this->shortenZeroes($css); + $css = $this->shortenFontWeights($css); + $css = $this->stripEmptyTags($css); + + // restore the string we've extracted earlier + $css = $this->restoreExtractedData($css); + + $source = is_int($source) ? '' : $source; + $parents = $source ? array_merge($parents, array($source)) : $parents; + $css = $this->combineImports($source, $css, $parents); + $css = $this->importFiles($source, $css); + + /* + * If we'll save to a new path, we'll have to fix the relative paths + * to be relative no longer to the source file, but to the new path. + * If we don't write to a file, fall back to same path so no + * conversion happens (because we still want it to go through most + * of the move code, which also addresses url() & @import syntax...) + */ + $converter = $this->getPathConverter($source, $path ?: $source); + $css = $this->move($converter, $css); + + // combine css + $content .= $css; + } + + $content = $this->moveImportsToTop($content); + + return $content; + } + + /** + * Moving a css file should update all relative urls. + * Relative references (e.g. ../images/image.gif) in a certain css file, + * will have to be updated when a file is being saved at another location + * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper). + * + * @param ConverterInterface $converter Relative path converter + * @param string $content The CSS content to update relative urls for + * + * @return string + */ + protected function move(ConverterInterface $converter, $content) + { + /* + * Relative path references will usually be enclosed by url(). @import + * is an exception, where url() is not necessary around the path (but is + * allowed). + * This *could* be 1 regular expression, where both regular expressions + * in this array are on different sides of a |. But we're using named + * patterns in both regexes, the same name on both regexes. This is only + * possible with a (?J) modifier, but that only works after a fairly + * recent PCRE version. That's why I'm doing 2 separate regular + * expressions & combining the matches after executing of both. + */ + $relativeRegexes = array( + // url(xxx) + '/ + # open url() + url\( + + \s* + + # open path enclosure + (?P["\'])? + + # fetch path + (?P.+?) + + # close path enclosure + (?(quotes)(?P=quotes)) + + \s* + + # close url() + \) + + /ix', + + // @import "xxx" + '/ + # import statement + @import + + # whitespace + \s+ + + # we don\'t have to check for @import url(), because the + # condition above will already catch these + + # open path enclosure + (?P["\']) + + # fetch path + (?P.+?) + + # close path enclosure + (?P=quotes) + + /ix', + ); + + // find all relative urls in css + $matches = array(); + foreach ($relativeRegexes as $relativeRegex) { + if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) { + $matches = array_merge($matches, $regexMatches); + } + } + + $search = array(); + $replace = array(); + + // loop all urls + foreach ($matches as $match) { + // determine if it's a url() or an @import match + $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url'); + + $url = $match['path']; + if ($this->canImportByPath($url)) { + // attempting to interpret GET-params makes no sense, so let's discard them for awhile + $params = strrchr($url, '?'); + $url = $params ? substr($url, 0, -strlen($params)) : $url; + + // fix relative url + $url = $converter->convert($url); + + // now that the path has been converted, re-apply GET-params + $url .= $params; + } + + /* + * Urls with control characters above 0x7e should be quoted. + * According to Mozilla's parser, whitespace is only allowed at the + * end of unquoted urls. + * Urls with `)` (as could happen with data: uris) should also be + * quoted to avoid being confused for the url() closing parentheses. + * And urls with a # have also been reported to cause issues. + * Urls with quotes inside should also remain escaped. + * + * @see https://developer.mozilla.org/nl/docs/Web/CSS/url#The_url()_functional_notation + * @see https://hg.mozilla.org/mozilla-central/rev/14abca4e7378 + * @see https://github.com/matthiasmullie/minify/issues/193 + */ + $url = trim($url); + if (preg_match('/[\s\)\'"#\x{7f}-\x{9f}]/u', $url)) { + $url = $match['quotes'] . $url . $match['quotes']; + } + + // build replacement + $search[] = $match[0]; + if ($type === 'url') { + $replace[] = 'url('.$url.')'; + } elseif ($type === 'import') { + $replace[] = '@import "'.$url.'"'; + } + } + + // replace urls + return str_replace($search, $replace, $content); + } + + /** + * Shorthand hex color codes. + * #FF0000 -> #F00. + * + * @param string $content The CSS content to shorten the hex color codes for + * + * @return string + */ + protected function shortenHex($content) + { + $content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?=[; }])/i', '#$1$2$3', $content); + + // we can shorten some even more by replacing them with their color name + $colors = array( + '#F0FFFF' => 'azure', + '#F5F5DC' => 'beige', + '#A52A2A' => 'brown', + '#FF7F50' => 'coral', + '#FFD700' => 'gold', + '#808080' => 'gray', + '#008000' => 'green', + '#4B0082' => 'indigo', + '#FFFFF0' => 'ivory', + '#F0E68C' => 'khaki', + '#FAF0E6' => 'linen', + '#800000' => 'maroon', + '#000080' => 'navy', + '#808000' => 'olive', + '#CD853F' => 'peru', + '#FFC0CB' => 'pink', + '#DDA0DD' => 'plum', + '#800080' => 'purple', + '#F00' => 'red', + '#FA8072' => 'salmon', + '#A0522D' => 'sienna', + '#C0C0C0' => 'silver', + '#FFFAFA' => 'snow', + '#D2B48C' => 'tan', + '#FF6347' => 'tomato', + '#EE82EE' => 'violet', + '#F5DEB3' => 'wheat', + ); + + return preg_replace_callback( + '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i', + function ($match) use ($colors) { + return $colors[strtoupper($match[0])]; + }, + $content + ); + } + + /** + * Shorten CSS font weights. + * + * @param string $content The CSS content to shorten the font weights for + * + * @return string + */ + protected function shortenFontWeights($content) + { + $weights = array( + 'normal' => 400, + 'bold' => 700, + ); + + $callback = function ($match) use ($weights) { + return $match[1].$weights[$match[2]]; + }; + + return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content); + } + + /** + * Shorthand 0 values to plain 0, instead of e.g. -0em. + * + * @param string $content The CSS content to shorten the zero values for + * + * @return string + */ + protected function shortenZeroes($content) + { + // reusable bits of code throughout these regexes: + // before & after are used to make sure we don't match lose unintended + // 0-like values (e.g. in #000, or in http://url/1.0) + // units can be stripped from 0 values, or used to recognize non 0 + // values (where wa may be able to strip a .0 suffix) + $before = '(?<=[:(, ])'; + $after = '(?=[ ,);}])'; + $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)'; + + // strip units after zeroes (0px -> 0) + // NOTE: it should be safe to remove all units for a 0 value, but in + // practice, Webkit (especially Safari) seems to stumble over at least + // 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); + + // strip 0-digits (.0 -> 0) + $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); + // strip trailing 0: 50.00 -> 50, 50.00px -> 50px + $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); + + // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) + $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); + + // remove zeroes where they make no sense in calc: e.g. calc(100px - 0) + // the 0 doesn't have any effect, and this isn't even valid without unit + // strip all `+ 0` or `- 0` occurrences: calc(10% + 0) -> calc(10%) + // looped because there may be multiple 0s inside 1 group of parentheses + do { + $previous = $content; + $content = preg_replace('/\(([^\(\)]+) [\+\-] 0( [^\(\)]+)?\)/', '(\\1\\2)', $content); + } while ($content !== $previous); + // strip all `0 +` occurrences: calc(0 + 10%) -> calc(10%) + $content = preg_replace('/\(0 \+ ([^\(\)]+)\)/', '(\\1)', $content); + // strip all `0 -` occurrences: calc(0 - 10%) -> calc(-10%) + $content = preg_replace('/\(0 \- ([^\(\)]+)\)/', '(-\\1)', $content); + // I'm not going to attempt to optimize away `x * 0` instances: + // it's dumb enough code already that it likely won't occur, and it's + // too complex to do right (order of operations would have to be + // respected etc) + // what I cared about most here was fixing incorrectly truncated units + + // IE doesn't seem to understand a unitless flex-basis value, so let's + // add it in again (make it `%`, which is only 1 char: 0%, 0px, 0 + // anything, it's all just the same) + $content = preg_replace('/flex:([^ ]+ [^ ]+ )0([;\}])/', 'flex:${1}0%${2}', $content); + $content = preg_replace('/flex-basis:0([;\}])/', 'flex-basis:0%${1}', $content); + + return $content; + } + + /** + * Strip empty tags from source code. + * + * @param string $content + * + * @return string + */ + protected function stripEmptyTags($content) + { + return preg_replace('/(^|\}|;)[^\{\};]+\{\s*\}/', '\\1', $content); + } + + /** + * Strip comments from source code. + */ + protected function stripComments() + { + $this->registerPattern('/\/\*.*?\*\//s', ''); + } + + /** + * Strip whitespace. + * + * @param string $content The CSS content to strip the whitespace for + * + * @return string + */ + protected function stripWhitespace($content) + { + // remove leading & trailing whitespace + $content = preg_replace('/^\s*/m', '', $content); + $content = preg_replace('/\s*$/m', '', $content); + + // replace newlines with a single space + $content = preg_replace('/\s+/', ' ', $content); + + // remove whitespace around meta characters + // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex + $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content); + $content = preg_replace('/([\[(:])\s+/', '$1', $content); + $content = preg_replace('/\s+([\]\)])/', '$1', $content); + $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content); + + // whitespace around + and - can only be stripped inside some pseudo- + // classes, like `:nth-child(3+2n)` + // not in things like `calc(3px + 2px)`, shorthands like `3px -2px`, or + // 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); + + // remove semicolon/whitespace followed by closing bracket + $content = str_replace(';}', '}', $content); + + return trim($content); + } + + /** + * Check if file is small enough to be imported. + * + * @param string $path The path to the file + * + * @return bool + */ + protected function canImportBySize($path) + { + return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024; + } + + /** + * Check if file a file can be imported, going by the path. + * + * @param string $path + * + * @return bool + */ + protected function canImportByPath($path) + { + return preg_match('/^(data:|https?:|\\/)/', $path) === 0; + } + + /** + * Return a converter to update relative paths to be relative to the new + * destination. + * + * @param string $source + * @param string $target + * + * @return ConverterInterface + */ + protected function getPathConverter($source, $target) + { + return new Converter($source, $target); + } +} diff --git a/system/classes/MatthiasMullie/minify/src/Exception.php b/system/classes/MatthiasMullie/minify/src/Exception.php new file mode 100644 index 000000000..d03898f04 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/Exception.php @@ -0,0 +1,20 @@ + + */ +namespace MatthiasMullie\Minify; + +/** + * Base Exception Class + * @deprecated Use Exceptions\BasicException instead + * + * @package Minify + * @author Matthias Mullie + */ +abstract class Exception extends \Exception +{ +} diff --git a/system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php b/system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php new file mode 100644 index 000000000..af5e81bc0 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php @@ -0,0 +1,23 @@ + + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +namespace MatthiasMullie\Minify\Exceptions; + +use MatthiasMullie\Minify\Exception; + +/** + * Basic Exception Class + * + * @package Minify\Exception + * @author Matthias Mullie + */ +abstract class BasicException extends Exception +{ +} diff --git a/system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php b/system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php new file mode 100644 index 000000000..912a2c908 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php @@ -0,0 +1,21 @@ + + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +namespace MatthiasMullie\Minify\Exceptions; + +/** + * File Import Exception Class + * + * @package Minify\Exception + * @author Matthias Mullie + */ +class FileImportException extends BasicException +{ +} diff --git a/system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php b/system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php new file mode 100644 index 000000000..b172eb48f --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php @@ -0,0 +1,21 @@ + + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +namespace MatthiasMullie\Minify\Exceptions; + +/** + * IO Exception Class + * + * @package Minify\Exception + * @author Matthias Mullie + */ +class IOException extends BasicException +{ +} diff --git a/system/classes/MatthiasMullie/minify/src/JS.php b/system/classes/MatthiasMullie/minify/src/JS.php new file mode 100644 index 000000000..d553c0993 --- /dev/null +++ b/system/classes/MatthiasMullie/minify/src/JS.php @@ -0,0 +1,638 @@ + + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +namespace MatthiasMullie\Minify; + +/** + * JavaScript Minifier Class + * + * Please report bugs on https://github.com/matthiasmullie/minify/issues + * + * @package Minify + * @author Matthias Mullie + * @author Tijs Verkoyen + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +class JS extends Minify +{ + /** + * Var-matching regex based on http://stackoverflow.com/a/9337047/802993. + * + * Note that regular expressions using that bit must have the PCRE_UTF8 + * pattern modifier (/u) set. + * + * @var string + */ + const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b'; + + /** + * Full list of JavaScript reserved words. + * Will be loaded from /data/js/keywords_reserved.txt. + * + * @see https://mathiasbynens.be/notes/reserved-keywords + * + * @var string[] + */ + protected $keywordsReserved = array(); + + /** + * List of JavaScript reserved words that accept a + * after them. Some end of lines are not the end of a statement, like with + * these keywords. + * + * E.g.: we shouldn't insert a ; after this else + * else + * console.log('this is quite fine') + * + * Will be loaded from /data/js/keywords_before.txt + * + * @var string[] + */ + protected $keywordsBefore = array(); + + /** + * List of JavaScript reserved words that accept a + * before them. Some end of lines are not the end of a statement, like when + * continued by one of these keywords on the newline. + * + * E.g.: we shouldn't insert a ; before this instanceof + * variable + * instanceof String + * + * Will be loaded from /data/js/keywords_after.txt + * + * @var string[] + */ + protected $keywordsAfter = array(); + + /** + * List of all JavaScript operators. + * + * Will be loaded from /data/js/operators.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operators = array(); + + /** + * List of JavaScript operators that accept a after + * them. Some end of lines are not the end of a statement, like with these + * operators. + * + * Note: Most operators are fine, we've only removed ++ and --. + * ++ & -- have to be joined with the value they're in-/decrementing. + * + * Will be loaded from /data/js/operators_before.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operatorsBefore = array(); + + /** + * List of JavaScript operators that accept a before + * them. Some end of lines are not the end of a statement, like when + * continued by one of these operators on the newline. + * + * Note: Most operators are fine, we've only removed ), ], ++, --, ! and ~. + * There can't be a newline separating ! or ~ and whatever it is negating. + * ++ & -- have to be joined with the value they're in-/decrementing. + * ) & ] are "special" in that they have lots or usecases. () for example + * is used for function calls, for grouping, in if () and for (), ... + * + * Will be loaded from /data/js/operators_after.txt + * + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators + * + * @var string[] + */ + protected $operatorsAfter = array(); + + /** + * Public property so it can be accessed from inside the closure in + * extractRegex. Once PHP5.3 compatibility is dropped, we can make this + * property protected again. + * + * @var array + */ + public $nestedExtracted = array(); + + /** + * {@inheritdoc} + */ + public function __construct() + { + call_user_func_array(array('parent', '__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); + } + + /** + * Minify the data. + * Perform JS optimizations. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + public function execute($path = null) + { + $content = ''; + + // loop files + foreach ($this->data as $source => $js) { + /* + * Combine js: separating the scripts by a ; + * I'm also adding a newline: it will be eaten when whitespace is + * stripped, but we need to make sure we're not just appending + * a new script right after a previous script that ended with a + * singe-line comment on the last line (in which case it would also + * be seen as part of that comment) + */ + $content .= $js."\n;"; + } + + /* + * Let's first take out strings, comments and regular expressions. + * All of these can contain JS code-like characters, and we should make + * sure any further magic ignores anything inside of these. + * + * Consider this example, where we should not strip any whitespace: + * var str = "a test"; + * + * Comments will be removed altogether, strings and regular expressions + * will be replaced by placeholder text, which we'll restore later. + */ + $this->extractStrings('\'"`'); + $this->stripComments(); + $this->extractRegex(); + $content = $this->replace($content); + + $content = $this->propertyNotation($content); + $content = $this->shortenBools($content); + $content = $this->stripWhitespace($content); + + /* + * Earlier, we extracted strings & regular expressions and replaced them + * with placeholder text. This will restore them. + */ + $content = $this->restoreExtractedData($content); + + return $content; + } + + /** + * Strip comments from source code. + * + * Public method so it can be accessed from inside the closure in + * extractRegex. Once PHP5.3 compatibility is dropped, we can make this + * method protected again. + */ + public function stripComments() + { + // single-line comments + $this->registerPattern('/\/\/.*$/m', ''); + + // multi-line comments + $this->registerPattern('/\/\*.*?\*\//s', ''); + } + + /** + * JS can have /-delimited regular expressions, like: /ab+c/.match(string). + * + * The content inside the regex can contain characters that may be confused + * for JS code: e.g. it could contain whitespace it needs to match & we + * don't want to strip whitespace in there. + * + * The regex can be pretty simple: we don't have to care about comments, + * (which also use slashes) because stripComments() will have stripped those + * already. + * + * This method will replace all string content with simple REGEX# + * placeholder text, so we've rid all regular expressions from characters + * that may be misinterpreted. Original regex content will be saved in + * $this->extracted and after doing all other minifying, we can restore the + * original content via restoreRegex() + */ + protected function extractRegex() + { + // 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['regex']; + + // because we're also trying to find regular expressions that follow + // if/when/for statements, we should also make sure that the content + // within these statements is also minified... + // e.g. `if("some string"/* or comment */)` should become + // `if("some string")` + if (isset($match['before'])) { + $other = new $minifier(); + $other->extractStrings('\'"`', "$count-"); + $other->stripComments(); + $match['before'] = $other->replace($match['before']); + $minifier->nestedExtracted += $other->extracted; + } + + return (isset($match['before']) ? $match['before'] : ''). + $placeholder. + (isset($match['after']) ? $match['after'] : ''); + }; + + $pattern = '(?P\/(?!\/).*?(?[=:,;\}\(\{\[&\|!]|^|'.implode('|', $keywords).')'; + $propertiesAndMethods = array( + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#Properties_2 + 'constructor', + 'flags', + 'global', + 'ignoreCase', + 'multiline', + 'source', + 'sticky', + 'unicode', + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp#Methods_2 + 'compile(', + 'exec(', + 'test(', + 'toSource(', + 'toString(', + ); + $delimiters = array_fill(0, count($propertiesAndMethods), '/'); + $propertiesAndMethods = array_map('preg_quote', $propertiesAndMethods, $delimiters); + $after = '(?P[\.,;\)\}&\|+]|$|\.('.implode('|', $propertiesAndMethods).'))'; + $this->registerPattern('/'.$before.'\s*'.$pattern.'\s*'.$after.'/', $callback); + + // we didn't check for regular expressions after `)`, because that is + // more often than not not a character where a regex can follow (e.g. + // (1+2)/3/4 -> /3/ could be considered a regex, but it's not) + // however, after single-line if/while/for, there could very well be a + // regex after `)` (e.g. if(true)/regex/) + // there is one problem, though: it's (near) impossible to check for + // when the if/while/for statement is closed (same amount of closing + // brackets as there were opened), so I'll ignore single-line statements + // with nested brackets followed by a regex for now... + $before = '(?P\b(if|while|for)\s*\((?P[^\(]+?)\))'; + $this->registerPattern('/'.$before.'\s*'.$pattern.'\s*'.$after.'/', $callback); + + // 1 more edge case: a regex can be followed by a lot more operators or + // keywords if there's a newline (ASI) in between, where the operator + // actually starts a new statement + // (https://github.com/matthiasmullie/minify/issues/56) + $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/'); + $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/'); + $after = '(?P\n\s*('.implode('|', $operators).'))'; + $this->registerPattern('/'.$pattern.'\s*'.$after.'/', $callback); + } + + /** + * In addition to the regular restore routine, we also need to restore a few + * more things that have been extracted as part of the regex extraction... + * + * {@inheritdoc} + */ + protected function restoreExtractedData($content) + { + // restore regular extracted stuff + $content = parent::restoreExtractedData($content); + + // restore nested stuff from within regex extraction + $content = strtr($content, $this->nestedExtracted); + + return $content; + } + + /** + * Strip whitespace. + * + * We won't strip *all* whitespace, but as much as possible. The thing that + * we'll preserve are newlines we're unsure about. + * JavaScript doesn't require statements to be terminated with a semicolon. + * It will automatically fix missing semicolons with ASI (automatic semi- + * colon insertion) at the end of line causing errors (without semicolon.) + * + * Because it's sometimes hard to tell if a newline is part of a statement + * that should be terminated or not, we'll just leave some of them alone. + * + * @param string $content The content to strip the whitespace for + * + * @return string + */ + protected function stripWhitespace($content) + { + // uniform line endings, make them all line feed + $content = str_replace(array("\r\n", "\r"), "\n", $content); + + // collapse all non-line feed whitespace into a single space + $content = preg_replace('/[^\S\n]+/', ' ', $content); + + // strip leading & trailing whitespace + $content = str_replace(array(" \n", "\n "), "\n", $content); + + // collapse consecutive line feeds into just 1 + $content = preg_replace('/\n+/', "\n", $content); + + $operatorsBefore = $this->getOperatorsForRegex($this->operatorsBefore, '/'); + $operatorsAfter = $this->getOperatorsForRegex($this->operatorsAfter, '/'); + $operators = $this->getOperatorsForRegex($this->operators, '/'); + $keywordsBefore = $this->getKeywordsForRegex($this->keywordsBefore, '/'); + $keywordsAfter = $this->getKeywordsForRegex($this->keywordsAfter, '/'); + + // strip whitespace that ends in (or next line begin with) an operator + // that allows statements to be broken up over multiple lines + unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']); + $content = preg_replace( + array( + '/('.implode('|', $operatorsBefore).')\s+/', + '/\s+('.implode('|', $operatorsAfter).')/', + ), '\\1', $content + ); + + // make sure + and - can't be mistaken for, or joined into ++ and -- + $content = preg_replace( + array( + '/(?%&|', $delimiter); + $operators['='] = '(?keywordsReserved; + $callback = function ($match) use ($minifier, $keywords) { + $property = trim($minifier->extracted[$match[1]], '\'"'); + + /* + * Check if the property is a reserved keyword. In this context (as + * property of an object literal/array) it shouldn't matter, but IE8 + * freaks out with "Expected identifier". + */ + if (in_array($property, $keywords)) { + return $match[0]; + } + + /* + * See if the property is in a variable-like format (e.g. + * array['key-here'] can't be replaced by array.key-here since '-' + * is not a valid character there. + */ + if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) { + return $match[0]; + } + + return '.'.$property; + }; + + /* + * Figure out if previous character is a variable name (of the array + * we want to use property notation on) - this is to make sure + * standalone ['value'] arrays aren't confused for keys-of-an-array. + * We can (and only have to) check the last character, because PHP's + * regex implementation doesn't allow unfixed-length look-behind + * assertions. + */ + preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar); + $previousChar = $previousChar[1]; + + /* + * Make sure word preceding the ['value'] is not a keyword, e.g. + * return['x']. Because -again- PHP's regex implementation doesn't allow + * unfixed-length look-behind assertions, I'm just going to do a lot of + * separate look-behind assertions, one for each keyword. + */ + $keywords = $this->getKeywordsForRegex($keywords); + $keywords = '(? + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +namespace MatthiasMullie\Minify; + +use MatthiasMullie\Minify\Exceptions\IOException; +use Psr\Cache\CacheItemInterface; + +/** + * Abstract minifier class. + * + * Please report bugs on https://github.com/matthiasmullie/minify/issues + * + * @package Minify + * @author Matthias Mullie + * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved + * @license MIT License + */ +abstract class Minify +{ + /** + * The data to be minified. + * + * @var string[] + */ + protected $data = array(); + + /** + * Array of patterns to match. + * + * @var string[] + */ + protected $patterns = array(); + + /** + * This array will hold content of strings and regular expressions that have + * been extracted from the JS source code, so we can reliably match "code", + * without having to worry about potential "code-like" characters inside. + * + * @var string[] + */ + public $extracted = array(); + + /** + * Init the minify class - optionally, code may be passed along already. + */ + public function __construct(/* $data = null, ... */) + { + // it's possible to add the source through the constructor as well ;) + if (func_num_args()) { + call_user_func_array(array($this, 'add'), func_get_args()); + } + } + + /** + * Add a file or straight-up code to be minified. + * + * @param string|string[] $data + * + * @return static + */ + public function add($data /* $data = null, ... */) + { + // bogus "usage" of parameter $data: scrutinizer warns this variable is + // not used (we're using func_get_args instead to support overloading), + // but it still needs to be defined because it makes no sense to have + // this function without argument :) + $args = array($data) + func_get_args(); + + // this method can be overloaded + foreach ($args as $data) { + if (is_array($data)) { + call_user_func_array(array($this, 'add'), $data); + continue; + } + + // redefine var + $data = (string) $data; + + // load data + $value = $this->load($data); + $key = ($data != $value) ? $data : count($this->data); + + // replace CR linefeeds etc. + // @see https://github.com/matthiasmullie/minify/pull/139 + $value = str_replace(array("\r\n", "\r"), "\n", $value); + + // store data + $this->data[$key] = $value; + } + + return $this; + } + + /** + * Minify the data & (optionally) saves it to a file. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + public function minify($path = null) + { + $content = $this->execute($path); + + // save to path + if ($path !== null) { + $this->save($content, $path); + } + + return $content; + } + + /** + * Minify & gzip the data & (optionally) saves it to a file. + * + * @param string[optional] $path Path to write the data to + * @param int[optional] $level Compression level, from 0 to 9 + * + * @return string The minified & gzipped data + */ + public function gzip($path = null, $level = 9) + { + $content = $this->execute($path); + $content = gzencode($content, $level, FORCE_GZIP); + + // save to path + if ($path !== null) { + $this->save($content, $path); + } + + return $content; + } + + /** + * Minify the data & write it to a CacheItemInterface object. + * + * @param CacheItemInterface $item Cache item to write the data to + * + * @return CacheItemInterface Cache item with the minifier data + */ + public function cache(CacheItemInterface $item) + { + $content = $this->execute(); + $item->set($content); + + return $item; + } + + /** + * Minify the data. + * + * @param string[optional] $path Path to write the data to + * + * @return string The minified data + */ + abstract public function execute($path = null); + + /** + * Load data. + * + * @param string $data Either a path to a file or the content itself + * + * @return string + */ + protected function load($data) + { + // check if the data is a file + if ($this->canImportFile($data)) { + $data = file_get_contents($data); + + // strip BOM, if any + if (substr($data, 0, 3) == "\xef\xbb\xbf") { + $data = substr($data, 3); + } + } + + return $data; + } + + /** + * Save to file. + * + * @param string $content The minified data + * @param string $path The path to save the minified data to + * + * @throws IOException + */ + protected function save($content, $path) + { + $handler = $this->openFileForWriting($path); + + $this->writeToFile($handler, $content); + + @fclose($handler); + } + + /** + * Register a pattern to execute against the source content. + * + * @param string $pattern PCRE pattern + * @param string|callable $replacement Replacement value for matched pattern + */ + protected function registerPattern($pattern, $replacement = '') + { + // study the pattern, we'll execute it more than once + $pattern .= 'S'; + + $this->patterns[] = array($pattern, $replacement); + } + + /** + * We can't "just" run some regular expressions against JavaScript: it's a + * complex language. E.g. having an occurrence of // xyz would be a comment, + * unless it's used within a string. Of you could have something that looks + * like a 'string', but inside a comment. + * The only way to accurately replace these pieces is to traverse the JS one + * character at a time and try to find whatever starts first. + * + * @param string $content The content to replace patterns in + * + * @return string The (manipulated) content + */ + protected function replace($content) + { + $processed = ''; + $positions = array_fill(0, count($this->patterns), -1); + $matches = array(); + + while ($content) { + // find first match for all patterns + foreach ($this->patterns as $i => $pattern) { + list($pattern, $replacement) = $pattern; + + // no need to re-run matches that are still in the part of the + // content that hasn't been processed + if ($positions[$i] >= 0) { + continue; + } + + $match = null; + if (preg_match($pattern, $content, $match)) { + $matches[$i] = $match; + + // we'll store the match position as well; that way, we + // don't have to redo all preg_matches after changing only + // the first (we'll still know where those others are) + $positions[$i] = strpos($content, $match[0]); + } else { + // if the pattern couldn't be matched, there's no point in + // executing it again in later runs on this same content; + // ignore this one until we reach end of content + unset($matches[$i]); + $positions[$i] = strlen($content); + } + } + + // no more matches to find: everything's been processed, break out + if (!$matches) { + $processed .= $content; + break; + } + + // see which of the patterns actually found the first thing (we'll + // 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]; + + // 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 = 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 + * @param string|callable $replacement Replacement value + * @param string $content Content to match pattern against + * + * @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); + } + } + + /** + * Strings are a pattern we need to match, in order to ignore potential + * code-like content inside them, but we just want all of the string + * content to remain untouched. + * + * This method will replace all string content with simple STRING# + * placeholder text, so we've rid all strings from characters that may be + * misinterpreted. Original string content will be saved in $this->extracted + * and after doing all other minifying, we can restore the original content + * via restoreStrings(). + * + * @param string[optional] $chars + * @param string[optional] $placeholderPrefix + */ + protected function extractStrings($chars = '\'"', $placeholderPrefix = '') + { + // PHP only supports $this inside anonymous functions since 5.4 + $minifier = $this; + $callback = function ($match) use ($minifier, $placeholderPrefix) { + // check the second index here, because the first always contains a quote + if ($match[2] === '') { + /* + * Empty strings need no placeholder; they can't be confused for + * anything else anyway. + * But we still needed to match them, for the extraction routine + * to skip over this particular string. + */ + return $match[0]; + } + + $count = count($minifier->extracted); + $placeholder = $match[1].$placeholderPrefix.$count.$match[1]; + $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1]; + + return $placeholder; + }; + + /* + * The \\ messiness explained: + * * Don't count ' or " as end-of-string if it's escaped (has backslash + * in front of it) + * * Unless... that backslash itself is escaped (another leading slash), + * in which case it's no longer escaping the ' or " + * * So there can be either no backslash, or an even number + * * multiply all of that times 4, to account for the escaping that has + * to be done to pass the backslash into the PHP string without it being + * considered as escape-char (times 2) and to get it in the regex, + * escaped (times 2) + */ + $this->registerPattern('/(['.$chars.'])(.*?(?extracted. + * + * @param string $content + * + * @return string + */ + protected function restoreExtractedData($content) + { + if (!$this->extracted) { + // nothing was extracted, nothing to restore + return $content; + } + + $content = strtr($content, $this->extracted); + + $this->extracted = array(); + + return $content; + } + + /** + * Check if the path is a regular file and can be read. + * + * @param string $path + * + * @return bool + */ + protected function canImportFile($path) + { + return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path); + } + + /** + * Attempts to open file specified by $path for writing. + * + * @param string $path The path to the file + * + * @return resource Specifier for the target file + * + * @throws IOException + */ + 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.'); + } + + return $handler; + } + + /** + * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions. + * + * @param resource $handler The resource to write to + * @param string $content The content to write + * @param string $path The path to the file (for exception printing only) + * + * @throws IOException + */ + 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.'); + } + } +} diff --git a/system/classes/MatthiasMullie/path-converter/LICENSE b/system/classes/MatthiasMullie/path-converter/LICENSE new file mode 100644 index 000000000..491295ad3 --- /dev/null +++ b/system/classes/MatthiasMullie/path-converter/LICENSE @@ -0,0 +1,18 @@ +Copyright (c) 2015 Matthias Mullie + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/system/classes/MatthiasMullie/path-converter/composer.json b/system/classes/MatthiasMullie/path-converter/composer.json new file mode 100644 index 000000000..1cb6a4c59 --- /dev/null +++ b/system/classes/MatthiasMullie/path-converter/composer.json @@ -0,0 +1,28 @@ +{ + "name": "matthiasmullie/path-converter", + "type": "library", + "description": "Relative path converter", + "keywords": ["relative", "path", "converter", "paths"], + "homepage": "http://github.com/matthiasmullie/path-converter", + "license": "MIT", + "authors": [ + { + "name": "Matthias Mullie", + "homepage": "http://www.mullie.eu", + "email": "pathconverter@mullie.eu", + "role": "Developer" + } + ], + "require": { + "php": ">=5.3.0", + "ext-pcre": "*" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "autoload": { + "psr-4": { + "MatthiasMullie\\PathConverter\\": "src/" + } + } +} diff --git a/system/classes/MatthiasMullie/path-converter/src/Converter.php b/system/classes/MatthiasMullie/path-converter/src/Converter.php new file mode 100644 index 000000000..c8b0c696a --- /dev/null +++ b/system/classes/MatthiasMullie/path-converter/src/Converter.php @@ -0,0 +1,195 @@ + + * @copyright Copyright (c) 2015, Matthias Mullie. All rights reserved + * @license MIT License + */ +class Converter implements ConverterInterface +{ + /** + * @var string + */ + protected $from; + + /** + * @var string + */ + protected $to; + + /** + * @param string $from The original base path (directory, not file!) + * @param string $to The new base path (directory, not file!) + */ + public function __construct($from, $to) + { + $shared = $this->shared($from, $to); + if ($shared === '') { + // when both paths have nothing in common, one of them is probably + // absolute while the other is relative + $cwd = getcwd(); + $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; + $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; + + // or traveling the tree via `..` + // attempt to resolve path, or assume it's fine if it doesn't exist + $from = realpath($from) ?: $from; + $to = realpath($to) ?: $to; + } + + $from = $this->dirname($from); + $to = $this->dirname($to); + + $from = $this->normalize($from); + $to = $this->normalize($to); + + $this->from = $from; + $this->to = $to; + } + + /** + * Normalize path. + * + * @param string $path + * + * @return string + */ + protected function normalize($path) + { + // deal with different operating systems' directory structure + $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/'); + + /* + * Example: + * /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif + * to + * /home/forkcms/frontend/core/layout/images/img.gif + */ + do { + $path = preg_replace('/[^\/]+(? $chunk) { + if (isset($path2[$i]) && $path1[$i] == $path2[$i]) { + $shared[] = $chunk; + } else { + break; + } + } + + return implode('/', $shared); + } + + /** + * Convert paths relative from 1 file to another. + * + * E.g. + * ../images/img.gif relative to /home/forkcms/frontend/core/layout/css + * should become: + * ../../core/layout/images/img.gif relative to + * /home/forkcms/frontend/cache/minified_css + * + * @param string $path The relative path that needs to be converted + * + * @return string The new relative path + */ + public function convert($path) + { + // quit early if conversion makes no sense + if ($this->from === $this->to) { + return $path; + } + + $path = $this->normalize($path); + // if we're not dealing with a relative path, just return absolute + if (strpos($path, '/') === 0) { + return $path; + } + + // normalize paths + $path = $this->normalize($this->from.'/'.$path); + + // strip shared ancestor paths + $shared = $this->shared($path, $this->to); + $path = mb_substr($path, mb_strlen($shared)); + $to = mb_substr($this->to, mb_strlen($shared)); + + // add .. for every directory that needs to be traversed to new path + $to = str_repeat('../', mb_substr_count($to, '/')); + + return $to.ltrim($path, '/'); + } + + /** + * Attempt to get the directory name from a path. + * + * @param string $path + * + * @return string + */ + protected function dirname($path) + { + if (is_file($path)) { + return dirname($path); + } + + if (is_dir($path)) { + return rtrim($path, '/'); + } + + // no known file/dir, start making assumptions + + // ends in / = dir + if (mb_substr($path, -1) === '/') { + return rtrim($path, '/'); + } + + // has a dot in the name, likely a file + if (preg_match('/.*\..*$/', basename($path)) !== 0) { + return dirname($path); + } + + // you're on your own here! + return $path; + } +} diff --git a/system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php b/system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php new file mode 100644 index 000000000..dc1b76573 --- /dev/null +++ b/system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php @@ -0,0 +1,24 @@ + + * @copyright Copyright (c) 2015, Matthias Mullie. All rights reserved + * @license MIT License + */ +interface ConverterInterface +{ + /** + * Convert file paths. + * + * @param string $path The path to be converted + * + * @return string The new path + */ + public function convert($path); +} diff --git a/system/classes/MatthiasMullie/path-converter/src/NoConverter.php b/system/classes/MatthiasMullie/path-converter/src/NoConverter.php new file mode 100644 index 000000000..2fcfd0f20 --- /dev/null +++ b/system/classes/MatthiasMullie/path-converter/src/NoConverter.php @@ -0,0 +1,23 @@ + + * @copyright Copyright (c) 2015, Matthias Mullie. All rights reserved + * @license MIT License + */ +class NoConverter implements ConverterInterface +{ + /** + * {@inheritdoc} + */ + public function convert($path) + { + return $path; + } +} From 38a0bbc24c5b221658bb2c19ed629b618d90ccb9 Mon Sep 17 00:00:00 2001 From: Kenji ITO Date: Sun, 12 Nov 2017 13:36:37 +0900 Subject: [PATCH 2/5] Added a simple cache class --- data/cache/index.html | 0 public_html/lib-common.php | 3 + system/classes/Cache.php | 127 ++++++++++++++++++ system/classes/Cache/FileSystem.php | 195 ++++++++++++++++++++++++++++ system/classes/CacheInterface.php | 61 +++++++++ 5 files changed, 386 insertions(+) create mode 100644 data/cache/index.html create mode 100644 system/classes/Cache.php create mode 100644 system/classes/Cache/FileSystem.php create mode 100644 system/classes/CacheInterface.php diff --git a/data/cache/index.html b/data/cache/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/public_html/lib-common.php b/public_html/lib-common.php index a6b64711d..4350aec81 100644 --- a/public_html/lib-common.php +++ b/public_html/lib-common.php @@ -107,6 +107,9 @@ // Get features that has ft_name like 'config%' $_CONF_FT = $config->_get_config_features(); +// Load Cache class +Geeklog\Cache::init(); + // Load in Geeklog Variables Table /** diff --git a/system/classes/Cache.php b/system/classes/Cache.php new file mode 100644 index 000000000..792b02a8b --- /dev/null +++ b/system/classes/Cache.php @@ -0,0 +1,127 @@ +clear(); + } + } + + /** + * Get data + * + * @param string $key + * @param mixed $defaultValue + * @return mixed + */ + public static function get($key, $defaultValue = null) + { + return self::$isEnabled ? self::$instance->get($key, $defaultValue) : $defaultValue; + } + + /** + * Set data + * + * @param string $key + * @param mixed $data + * @param int $ttl + * @return bool + */ + public static function set($key, $data, $ttl = 0) + { + return self::$isEnabled ? self::$instance->set($key, $data, $ttl) : false; + } + + /** + * Add data only if it doesn't exist yet + * + * @param string $key + * @param mixed $data + * @param int $ttl + * @return bool + */ + public static function add($key, $data, $ttl = 0) + { + return self::$isEnabled ? self::$instance->add($key, $data, $ttl) : false; + } + + /** + * Delete existing entry + * + * @param string $key + * @return bool + */ + public static function delete($key) + { + return self::$isEnabled ? self::$instance->delete($key) : false; + } + + /** + * Return if cached data exists + * + * @param string $key + * @return bool + */ + public static function exists($key) + { + return self::$isEnabled ? self::$instance->exists($key) : false; + } +} diff --git a/system/classes/Cache/FileSystem.php b/system/classes/Cache/FileSystem.php new file mode 100644 index 000000000..a479e277a --- /dev/null +++ b/system/classes/Cache/FileSystem.php @@ -0,0 +1,195 @@ +root = rtrim($root, '/\\') . DIRECTORY_SEPARATOR; + } + + /** + * @param string $key + * @return string + */ + private function getFileName($key) + { + static $cache = array(); + + if (!isset($cache[$key])) { + $cache[$key] = $this->root . md5($key) . '.php'; + } + + return $cache[$key]; + } + + /** + * Remove the contents of a directory given + * + * @param string $dir + */ + private function removeDirContents($dir) + { + foreach (scandir($dir) as $entry) { + if (!in_array($entry, $this->excludes)) { + $path = $dir . DIRECTORY_SEPARATOR . $entry; + + if (is_dir($path)) { + $this->removeDirContents($path); + rmdir($path); + } else { + @unlink($path); + } + } + } + } + + /** + * Clear all cached data + */ + public function clear() + { + $this->removeDirContents(rtrim($this->root, '/\\')); + } + + /** + * Calculate hash + * + * @param string $data + * @return string + */ + private function getHash($data) + { + if (is_callable('hash_hmac')) { + $hash = hash_hmac('sha1', $data, $this->root, true); + } else { + $hash = sha1($data . $this->root, true); + } + + return base64_encode($hash); + } + + /** + * Get data + * + * @param string $key + * @param mixed $defaultValue + * @return mixed + */ + public function get($key, $defaultValue = null) + { + if (!$this->exists($key)) { + return $defaultValue; + } else { + $fileName = $this->getFileName($key); + $temp = @file_get_contents($fileName); + + if ($temp === false) { + $this->delete($key); + + return $defaultValue; + } else { + $data = @unserialize($temp); + + if ($data === false) { + // Failed to unserialize the cached data + return $defaultValue; + } + + if (is_array($data) && isset($data['data'], $data['created'], $data['ttl'], $data['hash']) && + (($data['ttl'] === 0) || (time() <= $data['created'] + $data['ttl'])) && + ($this->getHash($data['data'] === $data['hash']))) { + return $data['data']; + } + + return $defaultValue; + } + } + } + + /** + * Set data + * + * @param string $key + * @param mixed $data + * @param int $ttl + * @return bool + */ + public function set($key, $data, $ttl = 0) + { + $fileName = $this->getFileName($key); + $item = array( + 'data' => $data, + 'created' => time(), + 'ttl' => (int) $ttl, + 'hash' => $this->getHash($data), + ); + + return (@file_put_contents($fileName, serialize($item)) !== false); + } + + /** + * Add data only if it doesn't exist yet + * + * @param string $key + * @param mixed $data + * @param int $ttl + * @return bool + */ + public function add($key, $data, $ttl = 0) + { + if ($this->exists($key)) { + return false; + } else { + $this->set($key, $data, $ttl); + + return true; + } + } + + /** + * Delete existing entry + * + * @param string $key + * @return bool + */ + public function delete($key) + { + $fileName = $this->getFileName($key); + + return @unlink($fileName); + } + + public function exists($key) + { + $fileName = $this->getFileName($key); + clearstatcache(); + + return file_exists($fileName); + } +} diff --git a/system/classes/CacheInterface.php b/system/classes/CacheInterface.php new file mode 100644 index 000000000..fee4de1b5 --- /dev/null +++ b/system/classes/CacheInterface.php @@ -0,0 +1,61 @@ + Date: Tue, 14 Nov 2017 22:44:07 +0900 Subject: [PATCH 3/5] Added Resource class --- public_html/lib-common.php | 9 +- public_html/r.php | 58 ++ system/classes/Autoload.php | 2 + system/classes/Cache/FileSystem.php | 50 +- system/classes/Resource.php | 798 ++++++++++++++++++++++++++++ 5 files changed, 895 insertions(+), 22 deletions(-) create mode 100644 public_html/r.php create mode 100644 system/classes/Resource.php diff --git a/public_html/lib-common.php b/public_html/lib-common.php index 4350aec81..093623db8 100644 --- a/public_html/lib-common.php +++ b/public_html/lib-common.php @@ -304,7 +304,7 @@ * * @global $_SCRIPTS Scripts */ -$_SCRIPTS = new Scripts(); +//$_SCRIPTS = new Scripts(); // Include theme functions file which may/may not do anything if (file_exists($_CONF['path_layout'] . 'functions.php')) { @@ -344,6 +344,13 @@ } } +/** + * This provides the ability to set css and javascript. + * + * @global $_SCRIPTS Geeklog\Resource + */ +$_SCRIPTS = new Geeklog\Resource($_CONF); + /** * themes can specify the default image type * fall back to 'gif' if they don't diff --git a/public_html/r.php b/public_html/r.php new file mode 100644 index 000000000..8eac1c86e --- /dev/null +++ b/public_html/r.php @@ -0,0 +1,58 @@ +root, true); } else { @@ -105,30 +109,34 @@ public function get($key, $defaultValue = null) { if (!$this->exists($key)) { return $defaultValue; - } else { - $fileName = $this->getFileName($key); - $temp = @file_get_contents($fileName); + } - if ($temp === false) { - $this->delete($key); + $fileName = $this->getFileName($key); + $temp = @file_get_contents($fileName); - return $defaultValue; - } else { - $data = @unserialize($temp); + if ($temp === false) { + $this->delete($key); - if ($data === false) { - // Failed to unserialize the cached data - return $defaultValue; - } + return $defaultValue; + } - if (is_array($data) && isset($data['data'], $data['created'], $data['ttl'], $data['hash']) && - (($data['ttl'] === 0) || (time() <= $data['created'] + $data['ttl'])) && - ($this->getHash($data['data'] === $data['hash']))) { - return $data['data']; - } + $data = @unserialize($temp); - return $defaultValue; - } + if ($data === false) { + // Failed to unserialize the cached data + $this->delete($key); + + return $defaultValue; + } + + if (is_array($data) && isset($data['data'], $data['created'], $data['ttl'], $data['hash']) && + (($data['ttl'] === 0) || (time() <= $data['created'] + $data['ttl'])) && + ($this->getHash($data['data']) === $data['hash'])) { + return $data['data']; + } else { + $this->delete($key); + + return $defaultValue; } } @@ -190,6 +198,6 @@ public function exists($key) $fileName = $this->getFileName($key); clearstatcache(); - return file_exists($fileName); + return @is_file($fileName) && @is_readable($fileName); } } diff --git a/system/classes/Resource.php b/system/classes/Resource.php new file mode 100644 index 000000000..c8812e7df --- /dev/null +++ b/system/classes/Resource.php @@ -0,0 +1,798 @@ + '/javascript/jquery.min.js', + 'jquery-ui' => '/javascript/jquery_ui/jquery-ui.min.js', + 'jquery-ui-i18n' => '/javascript/jquery_ui/jquery-ui-i18n.min.js', + 'jquery-ui-slideraccess' => '/javascript/jquery_ui/jquery-ui-slideraccess.min.js', + 'jquery-ui-timepicker-addon' => '/javascript/jquery_ui/jquery-ui-timepicker-addon.min.js', + 'jquery-ui-timepicker-addon-i18n' => '/javascript/jquery_ui/jquery-ui-timepicker-addon-i18n.min.js', + 'admin.configuration' => '/javascript/admin.configuration.js', + 'admin.topic' => '/javascript/admin.topic.js', + 'advanced_editor' => '/javascript/advanced_editor.js', + 'comment' => '/javascript/comment.js', + 'common' => '/javascript/common.js', + 'datepicker' => '/javascript/datepicker.js', + 'datetimepicker' => '/javascript/datetimepicker.js', + 'dbadmin' => '/javascript/dbadmin.js', + 'dbbackup' => '/javascript/dbbackup.js', + 'dialog_help' => '/javascript/dialog_help.js', + 'fix_tooltip' => '/javascript/fix_tooltip.js', + 'login' => '/javascript/login.js', + 'moveuser' => '/javascript/moveuser.js', + 'postmode_control' => '/javascript/postmode_control.js', + 'profile_editor' => '/javascript/profile_editor.js', + 'story_editor' => '/javascript/story_editor.js', + 'storyeditor_advanced' => '/javascript/storyeditor_advanced.js', + 'submitcomment_adveditor' => '/javascript/submitcomment_adveitor.js', + 'submitstory_adveditor' => '/javascript/submitstory_adveditor', + 'title_2_id' => '/javascript/title_2_id.js', + 'topic_control' => '/javascript/topic_control.js', + 'uikit_modifier' => '/javascript/uikit_modifier.js', + 'uikit' => '/vendor/uikit/js/uikit.min.js', + ); + + /** + * @var array a copy of $_CONF + */ + private $config; + + /** + * @var bool + */ + private $useJQuery = false; + + /** + * Array of CSS code block to write between tags + * + * @var array + */ + private $cssBlocks = array(); + + /** + * Array of local CSS files + * + * @var array + */ + private $localCssFiles = array(); + + /** + * Array of external CSS URIs + * + * @var array + */ + private $externalCssFiles = array(); + + /** + * Array of JavaScript code to write between tags + * + * @var array + */ + private $jsBlocks = array( + 'header' => array(), + 'footer' => array(), + ); + + /** + * Array of local JavaScript libraries managed by Geeklog + * + * @var array + */ + private $localJsLibraries = array( + 'header' => array(), + 'footer' => array(), + ); + + /** + * Array of local JavaScript files + * + * @var array + */ + private $localJsFiles = array( + 'header' => array(), + 'footer' => array(), + ); + + /** + * Array of external JavaScript URIs + * + * @var array + */ + private $externalJsFiles = array( + 'header' => array(), + 'footer' => array(), + ); + + /** + * @var array + */ + private $lang = array(); + + /** + * @var bool + */ + private $isHeaderSet = false; + + /** + * Resource constructor. + * + * @param array $config + */ + public function __construct(array $config) + { + $config['path_html'] = str_replace('\\', '/', rtrim($config['path_html'], '/\\')); + $this->config = $config; + $this->setJavaScriptLibrary('common'); + } + + /** + * Return if a URI given is an external file + * + * @param string $uri + * @return bool + */ + private function isExternal($uri) + { + $retval = (stripos($uri, 'http://') === 0) || + (stripos($uri, 'https://') === 0) || + (strpos($uri, '//') === 0); + + return $retval; + } + + /** + * Return if a path exists + * + * @param string $path + * @return bool + */ + private function exists($path) + { + clearstatcache(); + + return @is_file($path) && @is_readable($path); + } + + /** + * Check CSS attributes + * + * @param array $attributes + * @return array + */ + private function checkCssAttributes(array $attributes) + { + $retval = array(); + + foreach ($attributes as $key => $value) { + $key = strtolower($key); + + switch ($key) { + case 'rel': + if (!isset($retval[$key])) { + $value = strtolower($value); + + if (($value === 'stylesheet') || ($value === 'alternate stylesheet')) { + $retval[$key] = $value; + } + } + + break; + + case 'title': + if (!isset($retval[$key])) { + $retval[$key] = $value; + } + + break; + } + } + + if (!isset($retval['rel'])) { + $retval['rel'] = 'stylesheet'; + } + + return $retval; + } + + /** + * Set JavaScript Libraries to load + * + * @param string $name + * @param bool $isFooter + * @return bool + */ + public function setJavaScriptLibrary($name, $isFooter = true) + { + $name = strtolower($name); + $position = $isFooter ? 'footer' : 'header'; + + if (!isset($this->localLibraries[$name])) { + return false; + } + + switch ($name) { + case 'jquery': + if ($this->useJQuery) { + // Already used + return true; + } + + $this->useJQuery = true; + + if ($this->config['cdn_hosted']) { + $this->externalJsFiles[$position][] = array( + 'file' => sprintf(self::JQUERY_CDN, self::JQUERY_VERSION), + 'priority' => -self::JQUERY_PRIORITY, + ); + } else { + $this->localJsFiles[$position][] = array( + 'file' => $this->localLibraries[$name], + 'priority' => self::JQUERY_PRIORITY, + ); + } + + return true; + break; + + case 'jquery-ui': + if (!$this->useJQuery) { + $this->setJavaScriptLibrary('jquery', $isFooter); + } + + if ($this->config['cdn_hosted']) { + $this->externalJsFiles[$position][] = array( + 'file' => sprintf(self::JQUERY_UI_CDN, self::JQUERY_UI_VERSION), + 'priority' => self::JQUERY_UI_PRIORITY, + ); + $this->externalCssFiles[] = array( + 'file' => sprintf(self::JQUERY_UI_CDN, self::JQUERY_UI_VERSION, self::JQUERY_UI_THEME), + 'attributes' => array('rel' => 'stylesheet'), + 'priority' => self::JQUERY_UI_PRIORITY, + ); + } else { + $this->localJsFiles[$position][] = array( + 'file' => $this->localLibraries[$name], + 'priority' => self::JQUERY_UI_PRIORITY, + ); + $this->localCssFiles[] = array( + 'file' => '/javascript/jquery-ui/jquery-ui-min.css', + 'attributes' => array('rel' => 'stylesheet'), + 'priority' => self::JQUERY_UI_PRIORITY, + ); + } + + return true; + break; + + case 'uikit': + if (!$this->useJQuery) { + $this->setJavaScriptLibrary('jquery', false); + } + + if ($this->config['cdn_hosted']) { + $this->externalJsFiles['header'][] = array( + 'file' => sprintf(self::UIKIT_CDN, self::UIKIT_VERSION), + 'priority' => self::UIKIT_PRIORITY, + ); + $this->externalCssFiles[] = array( + 'file' => sprintf(self::UIKIT_CSS_CDN, self::UIKIT_VERSION), + 'attributes' => array('rel' => 'stylesheet'), + 'priority' => self::UIKIT_PRIORITY, + ); + } else { + $this->localJsFiles['header'] = array( + 'file' => $this->localLibraries['uikit'], + 'priority' => self::UIKIT_PRIORITY, + ); + $this->localCssFiles[] = array( + 'file' => '/vendor/uikit/css/uikit.css', + 'attributes' => array('rel' => 'stylesheet'), + 'priority' => self::UIKIT_PRIORITY, + ); + } + + return true; + break; + + default: + break; + } + + return false; + } + + /** + * Set JavaScript to load + * + * @param string $code + * @param bool $wrap (not used) + * @param bool $isFooter + * @return bool + */ + public function setJavaScript($code, $wrap = false, $isFooter = true) + { + if ($this->isHeaderSet && !$isFooter) { + return false; + } else { + $this->jsBlocks[$isFooter ? 'footer' : 'header'][] = $code; + + return true; + } + } + + /** + * Set JavaScript file to load + * + * @param string $name (not used) + * @param string $file relative to public_html (must start with '/') + * @param bool $wrap (not used) + * @param bool $isFooter + * @param int $priority + * @return bool + */ + public function setJavaScriptFile($name, $file, $wrap = false, $isFooter = true, $priority = 100) + { + if ($this->isHeaderSet && !$isFooter) { + return false; + } + + $position = $isFooter ? 'footer' : 'header'; + + if ($this->isExternal($file)) { + $this->externalJsFiles[$position][] = array( + 'file' => $file, + 'priority' => $priority, + ); + + return true; + } else { + if ($this->exists($this->config['path_html'] . $file)) { + $this->localJsFiles[$position][] = array( + 'file' => $file, + 'priority' => $priority, + ); + + return true; + } else { + return false; + } + } + } + + /** + * Set language variables used in JavaScript. + * + * @param array $lang_array array of language variables + * @return bool + */ + public function setLang(array $lang_array) + { + $this->lang = array_merge($this->lang, $lang_array); + + return true; + } + + /** + * Set CSS file to load + * + * @param string $name (not used) + * @param string $file relative public_html (must start with '/') + * @param bool $constant (not used) + * @param array $attributes + * @param int $priority + * @param string $type (not used) + * @return bool + */ + public function setCssFile($name, $file, $constant = true, $attributes = array(), $priority = 100, $type = '') + { + if ($this->isHeaderSet) { + return false; + } + + $attributes = $this->checkCssAttributes($attributes); + + if ($this->isExternal($file)) { + $this->externalCssFiles[] = array( + 'file' => $file, + 'attributes' => $attributes, + 'priority' => $priority, + ); + + return true; + } else { + if ($this->exists($this->config['path_html'] . $file)) { + $this->localCssFiles[] = array( + 'file' => $file, + 'attributes' => $attributes, + 'priority' => $priority, + ); + + return true; + } else { + return false; + } + } + } + + /** + * Set CSS in header using style tag + * + * @param string $css + * @return bool + */ + public function setCSS($css) + { + if ($this->isHeaderSet) { + return false; + } else { + $this->cssBlocks[] = $css; + + return true; + } + } + + /** + * Sort criterion by priority + * + * @param array $a + * @param array $b + * @return int + */ + private static function comparePriority(array $a, array $b) + { + if ($a['priority'] < $b['priority']) { + return -1; + } elseif ($a['priority'] > $b['priority']) { + return 1; + } else { + return 0; + } + } + + /** + * Return a tag + * + * @param string $href + * @param array $attributes + * @return string + */ + private function buildLinkTag($href, array $attributes) + { + $retval = sprintf(' $value) { + $key = htmlspecialchars($key, ENT_QUOTES, 'utf-8'); + $value = htmlspecialchars($value, ENT_QUOTES, 'utf-8'); + $retval .= sprintf(' %s="%s"', $key, $value); + } + + $retval .= XHTML . '>'; + + return $retval; + } + + /** + * Return the latest modified time of the files given + * + * @param array $absolutePaths + * @return int + */ + private function getLatestModifiedTime(array $absolutePaths) + { + clearstatcache(); + $retval = time() - 3600 * 24 * 365; + + foreach ($absolutePaths as $absolutePath) { + if ($this->exists($absolutePath)) { + $mTime = @filemtime($absolutePath); + + if ($retval < $mTime) { + $retval = $mTime; + } + } + } + + return $retval; + } + + /** + * Minify local files and build a tag to serve the data + * + * @param array $files array of array('file', 'priority', 'attributes') or array('file', 'priority') + * @param bool $isCss + * @return string + */ + private function makeFileServerTag(array $files, $isCss = true) + { + $absolutePaths = array(); + $relativePaths = array(); + $success = false; + + usort($files, array('Geeklog\\Resource', 'comparePriority')); + + foreach ($files as $file) { + $absolutePaths[] = $this->config['path_html'] . $file['file']; + $relativePaths[] = $file['file']; + } + + $key = md5(implode('|', $relativePaths)); + $cachedData = Cache::get($key); + + // Whether cached data exists and it is still valid? + if (!empty($compressedData) && isset($cachedData['createdAt']) && + ($this->getLatestModifiedTime($absolutePaths) <= $cachedData['createdAt'])) { + $success = true; + } + + if (!$success) { + // Cached data is missing or stale + if ($isCss) { + $min = new Minify\CSS(); + } else { + $min = new Minify\JS(); + } + + $min->add($absolutePaths); + $data = array( + 'createdAt' => microtime(true), + 'data' => $min->minify(), + 'paths' => $relativePaths, + 'type' => ($isCss ? 'c' : 'j'), + ); + $success = Cache::set($key, $data, 0); + } + + if ($success) { + $url = $this->config['site_url'] . '/r.php?k=' . $key; + + if ($isCss) { + $retval = sprintf('', $url, XHTML); + } else { + $retval = sprintf('', $url); + } + } else { + // Somehow failed to save data into cache + $retval = PHP_EOL; + + foreach ($files as $file) { + if ($isCss) { + $retval .= $this->buildLinkTag( + $this->config['site_url'] . $file['file'], $file['attributes'] + ); + } else { + $retval .= sprintf( + '', + $this->config['site_url'] . $file['file'] + ); + } + + $retval .= PHP_EOL; + } + } + + return $retval; + } + + /** + * Convert from array to JavaScript object format string + * + * @param array $source + * @return string + */ + private function arrayToJavaScriptObject(array $source) + { + $retval = '{'; + + foreach ($source as $key => $val) { + $retval .= "$key:"; + + switch (gettype($val)) { + case 'array': + $retval .= $this->arrayToJavaScriptObject($val) . ','; + break; + + case 'boolean': + $retval .= $val ? 'true,' : 'false,'; + break; + + case 'NULL': + $retval .= 'null,'; + break; + + case 'integer': + case 'double': + $retval .= $val . ','; + break; + + default: + $retval .= '"' . $val . '",'; + break; + } + } + + $retval = rtrim($retval, ',') . '}'; + + return $retval; + } + + /** + * Returns header code (JavaScript and CSS) to include in the Head of the web page + * + * @return string + */ + public function getHeader() + { + global $MESSAGE; + + $retval = ''; + $this->isHeaderSet = true; + + /** + * Collect CSS files + */ + + // 1. External CSS files + if (count($this->externalCssFiles) > 0) { + usort($this->externalCssFiles, array('\\Geeklog\\Resource', 'comparePriority')); + + foreach ($this->externalCssFiles as $cssFile) { + $retval .= $this->buildLinkTag($cssFile['file'], $cssFile['attributes']) . PHP_EOL; + } + } + + // 2. Local CSS files + if (count($this->localCssFiles) > 0) { + $retval .= $this->makeFileServerTag($this->localCssFiles, true); + } + + // 3. CSS code blocks + if (count($this->cssBlocks) > 0) { + $min = new Minify\Css(); + $min->add(implode(PHP_EOL, $this->cssBlocks)); + $compressedCss = $min->minify(); + $retval .= '' . PHP_EOL; + } + + // 4. External JavaScript files + if (count($this->externalJsFiles['header']) > 0) { + usort($this->externalJsFiles['header'], array('\\Geeklog\\Resource', 'comparePriority')); + + foreach ($this->externalJsFiles['header'] as $jsFile) { + $retval .= sprintf('', $jsFile['file']) . PHP_EOL; + } + } + + // 5. JavaScript variables + $iso639Code = COM_getLangIso639Code(); + $lang = array( + 'iso639Code' => $iso639Code, + 'tooltip_loading' => $MESSAGE[116], + 'tooltip_not_found' => $MESSAGE[117], + 'tooltip_select_date' => $MESSAGE[118], + 'tabs_more' => $MESSAGE[119], + 'confirm_delete' => $MESSAGE[76], + 'confirm_send' => $MESSAGE[120], + ); + if (!empty($this->lang)) { + $lang = array_merge($lang, $this->lang); + } + + $detect = new \Mobile_Detect; + $device = array( + 'isMobile' => $detect->isMobile(), + 'isTablet' => $detect->isTablet(), + ); + + $src = array( + 'site_url' => $this->config['site_url'], + 'site_admin_url' => $this->config['site_admin_url'], + 'layout_url' => $this->config['layout_url'], + 'xhtml' => XHTML, + 'lang' => $lang, + 'device' => $device, + 'theme_options' => $this->config['theme_options'], + ); + $str = $this->arrayToJavaScriptObject($src); + + // Strip '{' and '}' from both ends of $str + $str = substr($str, 1); + $str = substr($str, 0, strlen($str) - 1); + $retval .= '' . PHP_EOL; + + // 6. Local JavaScript files + if (count($this->localJsFiles['header']) > 0) { + $retval .= $this->makeFileServerTag($this->localJsFiles['header'], false); + } + + // 7. JavaScript code blocks + if (count($this->jsBlocks['header']) > 0) { + $min = new Minify\JS(); + $min->add(PHP_EOL, $this->jsBlocks['header']); + $compressedJs = $min->minify(); + $retval .= '' . PHP_EOL; + } + + return $retval; + } + + /** + * Returns JavaScript footer code to be placed just before + * + * @return string + */ + public function getFooter() + { + $retval = ''; + + // 1. External JavaScript files + if (count($this->externalJsFiles['footer']) > 0) { + usort($this->externalJsFiles['footer'], array('\\Geeklog\\Resource', 'comparePriority')); + + foreach ($this->externalJsFiles['footer'] as $jsFile) { + $retval .= sprintf('', $jsFile['file']) . PHP_EOL; + } + } + + // 2. Local JavaScript files + if (count($this->localJsFiles['footer']) > 0) { + $retval .= $this->makeFileServerTag($this->localJsFiles['footer'], false); + } + + // 3. JavaScript code blocks + if (count($this->jsBlocks['footer']) > 0) { + $min = new JS(); + $min->add(PHP_EOL, $this->jsBlocks['footer']); + $compressedJs = $min->minify(); + $retval .= '' . PHP_EOL; + } + + return $retval; + } +} From 1472e6d40c5ddea520dc398b78f04c5600ae7d20 Mon Sep 17 00:00:00 2001 From: Kenji ITO Date: Sat, 18 Nov 2017 15:32:53 +0900 Subject: [PATCH 4/5] Added Resource class --- public_html/admin/clearctl.php | 1 + public_html/javascript/profile_editor.js | 82 +- public_html/layout/denim/functions.php | 12 +- public_html/siteconfig.php.dist | 1 + public_html/usersettings.php | 32 +- public_html/vendor/jquery-ui/LICENSE.txt | 43 + .../images/ui-bg_glass_75_d0e5f5_1x400.png | Bin 0 -> 336 bytes .../images/ui-bg_glass_85_dfeffc_1x400.png | Bin 0 -> 341 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin 0 -> 5824 bytes .../ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin 0 -> 333 bytes .../ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin 0 -> 292 bytes .../images/ui-icons_217bc0_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_469bdd_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_6da8d5_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_d8e7f3_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_f9bd01_256x240.png | Bin 0 -> 4549 bytes public_html/vendor/jquery-ui/jquery-ui.css | 1312 ++ public_html/vendor/jquery-ui/jquery-ui.js | 18706 ++++++++++++++++ .../vendor/jquery-ui/jquery-ui.min.css | 7 + public_html/vendor/jquery-ui/jquery-ui.min.js | 13 + .../vendor/jquery-ui/jquery-ui.structure.css | 886 + .../jquery-ui/jquery-ui.structure.min.css | 5 + .../vendor/jquery-ui/jquery-ui.theme.css | 443 + .../vendor/jquery-ui/jquery-ui.theme.min.css | 5 + public_html/vendor/jquery/jquery.min.js | 4 + system/classes/Autoload.php | 8 + system/classes/JSMin/JSMin.php | 454 + system/classes/JSMin/LICENSE.txt | 26 + .../JSMin/UnterminatedCommentException.php | 6 + .../JSMin/UnterminatedRegExpException.php | 6 + .../JSMin/UnterminatedStringException.php | 6 + .../MatthiasMullie/minify/CONTRIBUTING.md | 59 - .../classes/MatthiasMullie/minify/Dockerfile | 12 - system/classes/MatthiasMullie/minify/LICENSE | 18 - .../MatthiasMullie/minify/bin/minifycss | 45 - .../MatthiasMullie/minify/bin/minifyjs | 45 - .../MatthiasMullie/minify/composer.json | 38 - .../minify/data/js/keywords_after.txt | 7 - .../minify/data/js/keywords_before.txt | 26 - .../minify/data/js/keywords_reserved.txt | 63 - .../minify/data/js/operators.txt | 46 - .../minify/data/js/operators_after.txt | 43 - .../minify/data/js/operators_before.txt | 43 - .../MatthiasMullie/minify/docker-compose.yml | 11 - .../classes/MatthiasMullie/minify/src/CSS.php | 704 - .../MatthiasMullie/minify/src/Exception.php | 20 - .../minify/src/Exceptions/BasicException.php | 23 - .../src/Exceptions/FileImportException.php | 21 - .../minify/src/Exceptions/IOException.php | 21 - .../classes/MatthiasMullie/minify/src/JS.php | 638 - .../MatthiasMullie/minify/src/Minify.php | 444 - .../MatthiasMullie/path-converter/LICENSE | 18 - .../path-converter/composer.json | 28 - .../path-converter/src/Converter.php | 195 - .../path-converter/src/ConverterInterface.php | 24 - .../path-converter/src/NoConverter.php | 23 - system/classes/Resource.php | 495 +- 60 files changed, 22347 insertions(+), 2821 deletions(-) create mode 100644 public_html/vendor/jquery-ui/LICENSE.txt create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_75_d0e5f5_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_85_dfeffc_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_inset-hard_100_f5f8f9_1x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-bg_inset-hard_100_fcfdfd_1x100.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_217bc0_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_469bdd_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_6da8d5_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_d8e7f3_256x240.png create mode 100644 public_html/vendor/jquery-ui/images/ui-icons_f9bd01_256x240.png create mode 100644 public_html/vendor/jquery-ui/jquery-ui.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.js create mode 100644 public_html/vendor/jquery-ui/jquery-ui.min.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.min.js create mode 100644 public_html/vendor/jquery-ui/jquery-ui.structure.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.structure.min.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.theme.css create mode 100644 public_html/vendor/jquery-ui/jquery-ui.theme.min.css create mode 100644 public_html/vendor/jquery/jquery.min.js create mode 100644 system/classes/JSMin/JSMin.php create mode 100644 system/classes/JSMin/LICENSE.txt create mode 100644 system/classes/JSMin/UnterminatedCommentException.php create mode 100644 system/classes/JSMin/UnterminatedRegExpException.php create mode 100644 system/classes/JSMin/UnterminatedStringException.php delete mode 100644 system/classes/MatthiasMullie/minify/CONTRIBUTING.md delete mode 100644 system/classes/MatthiasMullie/minify/Dockerfile delete mode 100644 system/classes/MatthiasMullie/minify/LICENSE delete mode 100644 system/classes/MatthiasMullie/minify/bin/minifycss delete mode 100644 system/classes/MatthiasMullie/minify/bin/minifyjs delete mode 100644 system/classes/MatthiasMullie/minify/composer.json delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_after.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_before.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/keywords_reserved.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_after.txt delete mode 100644 system/classes/MatthiasMullie/minify/data/js/operators_before.txt delete mode 100644 system/classes/MatthiasMullie/minify/docker-compose.yml delete mode 100644 system/classes/MatthiasMullie/minify/src/CSS.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exception.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/BasicException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/FileImportException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Exceptions/IOException.php delete mode 100644 system/classes/MatthiasMullie/minify/src/JS.php delete mode 100644 system/classes/MatthiasMullie/minify/src/Minify.php delete mode 100644 system/classes/MatthiasMullie/path-converter/LICENSE delete mode 100644 system/classes/MatthiasMullie/path-converter/composer.json delete mode 100644 system/classes/MatthiasMullie/path-converter/src/Converter.php delete mode 100644 system/classes/MatthiasMullie/path-converter/src/ConverterInterface.php delete mode 100644 system/classes/MatthiasMullie/path-converter/src/NoConverter.php diff --git a/public_html/admin/clearctl.php b/public_html/admin/clearctl.php index 9b31aedd4..298b1aca0 100644 --- a/public_html/admin/clearctl.php +++ b/public_html/admin/clearctl.php @@ -45,3 +45,4 @@ */ CTL_clearCache(); COM_redirect($_CONF['site_admin_url'] . '/index.php?msg=500'); +Geeklog\Cache::clear(); diff --git a/public_html/javascript/profile_editor.js b/public_html/javascript/profile_editor.js index e013639b9..d93218548 100644 --- a/public_html/javascript/profile_editor.js +++ b/public_html/javascript/profile_editor.js @@ -1,13 +1,11 @@ /* Reminder: always indent with 4 spaces (no tabs). */ // +---------------------------------------------------------------------------+ -// | Geeklog 1.6 | +// | Geeklog 2.2 | // +---------------------------------------------------------------------------+ // | Copyright (C) 2003-2009 by the following authors: | // | Version 1.0 Date: Jun 24, 2006 | // | Authors: Blaine Lang - blaine@portalparts.com | -// | | // | Javascript functions for Account Profile Editor | -// | | // +---------------------------------------------------------------------------+ // | | // | This program is free software; you can redistribute it and/or | @@ -26,51 +24,85 @@ // | | // +---------------------------------------------------------------------------+ -// @param string selected Name of div that has been selected -// @param int selindex index id of the selected tab as in 1 - 7 used to set the selected tab -function showhideProfileEditorDiv(selected, selindex) { - +// @param string selected Name of div that has been selected +// @param int selectedIndex index id of the selected tab as in 1 - 7 used to set the selected tab +function showhideProfileEditorDiv(selected, selectedIndex) { + 'use strict'; // Reset the current selected navbar tab - var cnavbar = document.getElementById('current'); - if (cnavbar) cnavbar.id = ''; + var cNavbar = document.getElementById('current'); + + if (cNavbar) { + cNavbar.id = ''; + } - // Cycle thru the navlist child elements - buiding an array of just the link items + // Cycle thru the navlist child elements - building an array of just the link items var navbar = document.getElementById('navlist'); - var menuitems = new Array(7); + var menuItems = new Array(7); var item = 0; - for (var i=0 ;i < navbar.childNodes.length ; i++ ) { - if (navbar.childNodes[i].nodeName.toLowerCase() == 'li') { - menuitems[item] = navbar.childNodes[i]; + for (var i = 0; i < navbar.childNodes.length; i++) { + if (navbar.childNodes[i].nodeName.toLowerCase() === 'li') { + menuItems[item] = navbar.childNodes[i]; item++; } } + // Now that I have just the link items I can set the selected tab using the passed selected Item number // Set the