diff --git a/.gitignore b/.gitignore
index a7a975ea6f..1549c2c310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,9 @@ custom_avatar/
Sources/Unicode/*.php
!Sources/Unicode/index.php
!Sources/Unicode/Utf8String.php
+Sources/Libs/
+!Sources/Libs/index.php
+Sources/composer.lock
# Compiled source #
###################
diff --git a/Sources/Autoloader.php b/Sources/Autoloader.php
index cfab91ad01..1763756faa 100644
--- a/Sources/Autoloader.php
+++ b/Sources/Autoloader.php
@@ -24,15 +24,12 @@
static $hook_value = '';
static $class_map = [
- // Some special cases.
- 'ReCaptcha\\' => 'ReCaptcha/',
- 'MatthiasMullie\\Minify\\' => 'minify/src/',
- 'MatthiasMullie\\PathConverter\\' => 'minify/path-converter/src/',
-
// In general, the SMF namespace maps to $sourcedir.
'SMF\\' => '',
];
+ require_once __DIR__ . '/Libs/autoload.php';
+
// Ensure $sourcedir is set to something valid.
if (class_exists(Config::class, false) && isset(Config::$sourcedir)) {
$sourcedir = Config::$sourcedir;
diff --git a/Sources/ReCaptcha/RequestMethod/index.php b/Sources/Libs/index.php
similarity index 100%
rename from Sources/ReCaptcha/RequestMethod/index.php
rename to Sources/Libs/index.php
diff --git a/Sources/Minify/CSS.php b/Sources/Minify/CSS.php
new file mode 100644
index 0000000000..cae98b90fa
--- /dev/null
+++ b/Sources/Minify/CSS.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2024 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Minify;
+
+use MatthiasMullie\Minify\CSS as BaseCSS;
+
+class CSS extends BaseCSS
+{
+ use CustomTrait;
+}
+
+?>
\ No newline at end of file
diff --git a/Sources/Minify/CustomTrait.php b/Sources/Minify/CustomTrait.php
new file mode 100644
index 0000000000..5d217147c1
--- /dev/null
+++ b/Sources/Minify/CustomTrait.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2024 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Minify;
+
+trait CustomTrait
+{
+ public function minify($path = null)
+ {
+ $content = $this->execute($path);
+
+ // These are not the droids you're looking for
+ $content = "/* Any changes to this file will be overwritten. To change the content\nof this file, edit the source files from which it was compiled. */\n" . $content;
+
+ // save to path
+ if ($path !== null) {
+ $this->save($content, $path);
+ }
+
+ return $content;
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/Sources/Minify/JS.php b/Sources/Minify/JS.php
new file mode 100644
index 0000000000..f27d7621a8
--- /dev/null
+++ b/Sources/Minify/JS.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2024 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Minify;
+
+use MatthiasMullie\Minify\JS as BaseJS;
+
+class JS extends BaseJS
+{
+ use CustomTrait;
+}
+
+?>
\ No newline at end of file
diff --git a/Sources/ReCaptcha/index.php b/Sources/Minify/index.php
similarity index 100%
rename from Sources/ReCaptcha/index.php
rename to Sources/Minify/index.php
diff --git a/Sources/ReCaptcha/ReCaptcha.php b/Sources/ReCaptcha/ReCaptcha.php
deleted file mode 100644
index 31ec44a075..0000000000
--- a/Sources/ReCaptcha/ReCaptcha.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha;
-
-/**
- * reCAPTCHA client.
- */
-class ReCaptcha
-{
- /**
- * Version of this client library.
- * @const string
- */
- const VERSION = 'php_1.2.4';
-
- /**
- * URL for reCAPTCHA siteverify API
- * @const string
- */
- const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
-
- /**
- * Invalid JSON received
- * @const string
- */
- const E_INVALID_JSON = 'invalid-json';
-
- /**
- * Could not connect to service
- * @const string
- */
- const E_CONNECTION_FAILED = 'connection-failed';
-
- /**
- * Did not receive a 200 from the service
- * @const string
- */
- const E_BAD_RESPONSE = 'bad-response';
-
- /**
- * Not a success, but no error codes received!
- * @const string
- */
- const E_UNKNOWN_ERROR = 'unknown-error';
-
- /**
- * ReCAPTCHA response not provided
- * @const string
- */
- const E_MISSING_INPUT_RESPONSE = 'missing-input-response';
-
- /**
- * Expected hostname did not match
- * @const string
- */
- const E_HOSTNAME_MISMATCH = 'hostname-mismatch';
-
- /**
- * Expected APK package name did not match
- * @const string
- */
- const E_APK_PACKAGE_NAME_MISMATCH = 'apk_package_name-mismatch';
-
- /**
- * Expected action did not match
- * @const string
- */
- const E_ACTION_MISMATCH = 'action-mismatch';
-
- /**
- * Score threshold not met
- * @const string
- */
- const E_SCORE_THRESHOLD_NOT_MET = 'score-threshold-not-met';
-
- /**
- * Challenge timeout
- * @const string
- */
- const E_CHALLENGE_TIMEOUT = 'challenge-timeout';
-
- /**
- * Shared secret for the site.
- * @var string
- */
- private $secret;
-
- /**
- * Method used to communicate with service. Defaults to POST request.
- * @var RequestMethod
- */
- private $requestMethod;
-
- /**
- * Create a configured instance to use the reCAPTCHA service.
- *
- * @param string $secret The shared key between your site and reCAPTCHA.
- * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
- * @throws \RuntimeException if $secret is invalid
- */
- public function __construct($secret, RequestMethod $requestMethod = null)
- {
- if (empty($secret)) {
- throw new \RuntimeException('No secret provided');
- }
-
- if (!is_string($secret)) {
- throw new \RuntimeException('The provided secret must be a string');
- }
-
- $this->secret = $secret;
- $this->requestMethod = (is_null($requestMethod)) ? new RequestMethod\Post() : $requestMethod;
- }
-
- /**
- * Calls the reCAPTCHA siteverify API to verify whether the user passes
- * CAPTCHA test and additionally runs any specified additional checks
- *
- * @param string $response The user response token provided by reCAPTCHA, verifying the user on your site.
- * @param string $remoteIp The end user's IP address.
- * @return Response Response from the service.
- */
- public function verify($response, $remoteIp = null)
- {
- // Discard empty solution submissions
- if (empty($response)) {
- $recaptchaResponse = new Response(false, array(self::E_MISSING_INPUT_RESPONSE));
- return $recaptchaResponse;
- }
-
- $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
- $rawResponse = $this->requestMethod->submit($params);
- $initialResponse = Response::fromJson($rawResponse);
- $validationErrors = array();
-
- if (isset($this->hostname) && strcasecmp($this->hostname, $initialResponse->getHostname()) !== 0) {
- $validationErrors[] = self::E_HOSTNAME_MISMATCH;
- }
-
- if (isset($this->apkPackageName) && strcasecmp($this->apkPackageName, $initialResponse->getApkPackageName()) !== 0) {
- $validationErrors[] = self::E_APK_PACKAGE_NAME_MISMATCH;
- }
-
- if (isset($this->action) && strcasecmp($this->action, $initialResponse->getAction()) !== 0) {
- $validationErrors[] = self::E_ACTION_MISMATCH;
- }
-
- if (isset($this->threshold) && $this->threshold > $initialResponse->getScore()) {
- $validationErrors[] = self::E_SCORE_THRESHOLD_NOT_MET;
- }
-
- if (isset($this->timeoutSeconds)) {
- $challengeTs = strtotime($initialResponse->getChallengeTs());
-
- if ($challengeTs > 0 && time() - $challengeTs > $this->timeoutSeconds) {
- $validationErrors[] = self::E_CHALLENGE_TIMEOUT;
- }
- }
-
- if (empty($validationErrors)) {
- return $initialResponse;
- }
-
- return new Response(
- false,
- array_merge($initialResponse->getErrorCodes(), $validationErrors),
- $initialResponse->getHostname(),
- $initialResponse->getChallengeTs(),
- $initialResponse->getApkPackageName(),
- $initialResponse->getScore(),
- $initialResponse->getAction()
- );
- }
-
- /**
- * Provide a hostname to match against in verify()
- * This should be without a protocol or trailing slash, e.g. www.google.com
- *
- * @param string $hostname Expected hostname
- * @return ReCaptcha Current instance for fluent interface
- */
- public function setExpectedHostname($hostname)
- {
- $this->hostname = $hostname;
- return $this;
- }
-
- /**
- * Provide an APK package name to match against in verify()
- *
- * @param string $apkPackageName Expected APK package name
- * @return ReCaptcha Current instance for fluent interface
- */
- public function setExpectedApkPackageName($apkPackageName)
- {
- $this->apkPackageName = $apkPackageName;
- return $this;
- }
-
- /**
- * Provide an action to match against in verify()
- * This should be set per page.
- *
- * @param string $action Expected action
- * @return ReCaptcha Current instance for fluent interface
- */
- public function setExpectedAction($action)
- {
- $this->action = $action;
- return $this;
- }
-
- /**
- * Provide a threshold to meet or exceed in verify()
- * Threshold should be a float between 0 and 1 which will be tested as response >= threshold.
- *
- * @param float $threshold Expected threshold
- * @return ReCaptcha Current instance for fluent interface
- */
- public function setScoreThreshold($threshold)
- {
- $this->threshold = floatval($threshold);
- return $this;
- }
-
- /**
- * Provide a timeout in seconds to test against the challenge timestamp in verify()
- *
- * @param int $timeoutSeconds Expected hostname
- * @return ReCaptcha Current instance for fluent interface
- */
- public function setChallengeTimeout($timeoutSeconds)
- {
- $this->timeoutSeconds = $timeoutSeconds;
- return $this;
- }
-}
diff --git a/Sources/ReCaptcha/RequestMethod.php b/Sources/ReCaptcha/RequestMethod.php
deleted file mode 100644
index 0a2a6716ea..0000000000
--- a/Sources/ReCaptcha/RequestMethod.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha;
-
-/**
- * Method used to send the request to the service.
- */
-interface RequestMethod
-{
-
- /**
- * Submit the request with the specified parameters.
- *
- * @param RequestParameters $params Request parameters
- * @return string Body of the reCAPTCHA response
- */
- public function submit(RequestParameters $params);
-}
diff --git a/Sources/ReCaptcha/RequestMethod/Curl.php b/Sources/ReCaptcha/RequestMethod/Curl.php
deleted file mode 100644
index eb9984253d..0000000000
--- a/Sources/ReCaptcha/RequestMethod/Curl.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-/**
- * Convenience wrapper around the cURL functions to allow mocking.
- */
-class Curl
-{
-
- /**
- * @see http://php.net/curl_init
- * @param string $url
- * @return resource cURL handle
- */
- public function init($url = null)
- {
- return curl_init($url);
- }
-
- /**
- * @see http://php.net/curl_setopt_array
- * @param resource $ch
- * @param array $options
- * @return bool
- */
- public function setoptArray($ch, array $options)
- {
- return curl_setopt_array($ch, $options);
- }
-
- /**
- * @see http://php.net/curl_exec
- * @param resource $ch
- * @return mixed
- */
- public function exec($ch)
- {
- return curl_exec($ch);
- }
-
- /**
- * @see http://php.net/curl_close
- * @param resource $ch
- */
- public function close($ch)
- {
- curl_close($ch);
- }
-}
diff --git a/Sources/ReCaptcha/RequestMethod/CurlPost.php b/Sources/ReCaptcha/RequestMethod/CurlPost.php
deleted file mode 100644
index 1bd7cce52d..0000000000
--- a/Sources/ReCaptcha/RequestMethod/CurlPost.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\ReCaptcha;
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends cURL request to the reCAPTCHA service.
- * Note: this requires the cURL extension to be enabled in PHP
- * @see http://php.net/manual/en/book.curl.php
- */
-class CurlPost implements RequestMethod
-{
- /**
- * Curl connection to the reCAPTCHA service
- * @var Curl
- */
- private $curl;
-
- /**
- * URL for reCAPTCHA siteverify API
- * @var string
- */
- private $siteVerifyUrl;
-
- /**
- * Only needed if you want to override the defaults
- *
- * @param Curl $curl Curl resource
- * @param string $siteVerifyUrl URL for reCAPTCHA siteverify API
- */
- public function __construct(Curl $curl = null, $siteVerifyUrl = null)
- {
- $this->curl = (is_null($curl)) ? new Curl() : $curl;
- $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
- }
-
- /**
- * Submit the cURL request with the specified parameters.
- *
- * @param RequestParameters $params Request parameters
- * @return string Body of the reCAPTCHA response
- */
- public function submit(RequestParameters $params)
- {
- $handle = $this->curl->init($this->siteVerifyUrl);
-
- $options = array(
- CURLOPT_POST => true,
- CURLOPT_POSTFIELDS => $params->toQueryString(),
- CURLOPT_HTTPHEADER => array(
- 'Content-Type: application/x-www-form-urlencoded'
- ),
- CURLINFO_HEADER_OUT => false,
- CURLOPT_HEADER => false,
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_SSL_VERIFYPEER => true
- );
- $this->curl->setoptArray($handle, $options);
-
- $response = $this->curl->exec($handle);
- $this->curl->close($handle);
-
- if ($response !== false) {
- return $response;
- }
-
- return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
- }
-}
diff --git a/Sources/ReCaptcha/RequestMethod/Post.php b/Sources/ReCaptcha/RequestMethod/Post.php
deleted file mode 100644
index 836d58700e..0000000000
--- a/Sources/ReCaptcha/RequestMethod/Post.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\ReCaptcha;
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends POST requests to the reCAPTCHA service.
- */
-class Post implements RequestMethod
-{
- /**
- * URL for reCAPTCHA siteverify API
- * @var string
- */
- private $siteVerifyUrl;
-
- /**
- * Only needed if you want to override the defaults
- *
- * @param string $siteVerifyUrl URL for reCAPTCHA siteverify API
- */
- public function __construct($siteVerifyUrl = null)
- {
- $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
- }
-
- /**
- * Submit the POST request with the specified parameters.
- *
- * @param RequestParameters $params Request parameters
- * @return string Body of the reCAPTCHA response
- */
- public function submit(RequestParameters $params)
- {
- $options = array(
- 'http' => array(
- 'header' => "Content-type: application/x-www-form-urlencoded\r\n",
- 'method' => 'POST',
- 'content' => $params->toQueryString(),
- // Force the peer to validate (not needed in 5.6.0+, but still works)
- 'verify_peer' => true,
- ),
- );
- $context = stream_context_create($options);
- $response = file_get_contents($this->siteVerifyUrl, false, $context);
-
- if ($response !== false) {
- return $response;
- }
-
- return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
- }
-}
\ No newline at end of file
diff --git a/Sources/ReCaptcha/RequestMethod/Socket.php b/Sources/ReCaptcha/RequestMethod/Socket.php
deleted file mode 100644
index 236bd5f5dd..0000000000
--- a/Sources/ReCaptcha/RequestMethod/Socket.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-/**
- * Convenience wrapper around native socket and file functions to allow for
- * mocking.
- */
-class Socket
-{
- private $handle = null;
-
- /**
- * fsockopen
- *
- * @see http://php.net/fsockopen
- * @param string $hostname
- * @param int $port
- * @param int $errno
- * @param string $errstr
- * @param float $timeout
- * @return resource
- */
- public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
- {
- $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
-
- if ($this->handle != false && $errno === 0 && $errstr === '') {
- return $this->handle;
- }
- return false;
- }
-
- /**
- * fwrite
- *
- * @see http://php.net/fwrite
- * @param string $string
- * @param int $length
- * @return int | bool
- */
- public function fwrite($string, $length = null)
- {
- return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
- }
-
- /**
- * fgets
- *
- * @see http://php.net/fgets
- * @param int $length
- * @return string
- */
- public function fgets($length = null)
- {
- return fgets($this->handle, $length);
- }
-
- /**
- * feof
- *
- * @see http://php.net/feof
- * @return bool
- */
- public function feof()
- {
- return feof($this->handle);
- }
-
- /**
- * fclose
- *
- * @see http://php.net/fclose
- * @return bool
- */
- public function fclose()
- {
- return fclose($this->handle);
- }
-}
diff --git a/Sources/ReCaptcha/RequestMethod/SocketPost.php b/Sources/ReCaptcha/RequestMethod/SocketPost.php
deleted file mode 100644
index 464bc28d42..0000000000
--- a/Sources/ReCaptcha/RequestMethod/SocketPost.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\ReCaptcha;
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends a POST request to the reCAPTCHA service, but makes use of fsockopen()
- * instead of get_file_contents(). This is to account for people who may be on
- * servers where allow_url_open is disabled.
- */
-class SocketPost implements RequestMethod
-{
- /**
- * Socket to the reCAPTCHA service
- * @var Socket
- */
- private $socket;
-
- /**
- * Only needed if you want to override the defaults
- *
- * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
- * @param string $siteVerifyUrl URL for reCAPTCHA siteverify API
- */
- public function __construct(Socket $socket = null, $siteVerifyUrl = null)
- {
- $this->socket = (is_null($socket)) ? new Socket() : $socket;
- $this->siteVerifyUrl = (is_null($siteVerifyUrl)) ? ReCaptcha::SITE_VERIFY_URL : $siteVerifyUrl;
- }
-
- /**
- * Submit the POST request with the specified parameters.
- *
- * @param RequestParameters $params Request parameters
- * @return string Body of the reCAPTCHA response
- */
- public function submit(RequestParameters $params)
- {
- $errno = 0;
- $errstr = '';
- $urlParsed = parse_url($this->siteVerifyUrl);
-
- if (false === $this->socket->fsockopen('ssl://' . $urlParsed['host'], 443, $errno, $errstr, 30)) {
- return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
- }
-
- $content = $params->toQueryString();
-
- $request = "POST " . $urlParsed['path'] . " HTTP/1.0\r\n";
- $request .= "Host: " . $urlParsed['host'] . "\r\n";
- $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
- $request .= "Content-length: " . strlen($content) . "\r\n";
- $request .= "Connection: close\r\n\r\n";
- $request .= $content . "\r\n\r\n";
-
- $this->socket->fwrite($request);
- $response = '';
-
- while (!$this->socket->feof()) {
- $response .= $this->socket->fgets(4096);
- }
-
- $this->socket->fclose();
-
- if (0 !== strpos($response, 'HTTP/1.0 200 OK')) {
- return '{"success": false, "error-codes": ["'.ReCaptcha::E_BAD_RESPONSE.'"]}';
- }
-
- $parts = preg_split("#\n\s*\n#Uis", $response);
-
- return $parts[1];
- }
-}
diff --git a/Sources/ReCaptcha/RequestParameters.php b/Sources/ReCaptcha/RequestParameters.php
deleted file mode 100644
index e9ba45354f..0000000000
--- a/Sources/ReCaptcha/RequestParameters.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha;
-
-/**
- * Stores and formats the parameters for the request to the reCAPTCHA service.
- */
-class RequestParameters
-{
- /**
- * The shared key between your site and reCAPTCHA.
- * @var string
- */
- private $secret;
-
- /**
- * The user response token provided by reCAPTCHA, verifying the user on your site.
- * @var string
- */
- private $response;
-
- /**
- * Remote user's IP address.
- * @var string
- */
- private $remoteIp;
-
- /**
- * Client version.
- * @var string
- */
- private $version;
-
- /**
- * Initialise parameters.
- *
- * @param string $secret Site secret.
- * @param string $response Value from g-captcha-response form field.
- * @param string $remoteIp User's IP address.
- * @param string $version Version of this client library.
- */
- public function __construct($secret, $response, $remoteIp = null, $version = null)
- {
- $this->secret = $secret;
- $this->response = $response;
- $this->remoteIp = $remoteIp;
- $this->version = $version;
- }
-
- /**
- * Array representation.
- *
- * @return array Array formatted parameters.
- */
- public function toArray()
- {
- $params = array('secret' => $this->secret, 'response' => $this->response);
-
- if (!is_null($this->remoteIp)) {
- $params['remoteip'] = $this->remoteIp;
- }
-
- if (!is_null($this->version)) {
- $params['version'] = $this->version;
- }
-
- return $params;
- }
-
- /**
- * Query string representation for HTTP request.
- *
- * @return string Query string formatted parameters.
- */
- public function toQueryString()
- {
- return http_build_query($this->toArray(), '', '&');
- }
-}
diff --git a/Sources/ReCaptcha/Response.php b/Sources/ReCaptcha/Response.php
deleted file mode 100644
index 55838c0742..0000000000
--- a/Sources/ReCaptcha/Response.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * BSD 3-Clause License
- * @copyright (c) 2019, Google Inc.
- * @link https://www.google.com/recaptcha
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace ReCaptcha;
-
-/**
- * The response returned from the service.
- */
-class Response
-{
- /**
- * Success or failure.
- * @var boolean
- */
- private $success = false;
-
- /**
- * Error code strings.
- * @var array
- */
- private $errorCodes = array();
-
- /**
- * The hostname of the site where the reCAPTCHA was solved.
- * @var string
- */
- private $hostname;
-
- /**
- * Timestamp of the challenge load (ISO format yyyy-MM-dd'T'HH:mm:ssZZ)
- * @var string
- */
- private $challengeTs;
-
- /**
- * APK package name
- * @var string
- */
- private $apkPackageName;
-
- /**
- * Score assigned to the request
- * @var float
- */
- private $score;
-
- /**
- * Action as specified by the page
- * @var string
- */
- private $action;
-
- /**
- * Build the response from the expected JSON returned by the service.
- *
- * @param string $json
- * @return \ReCaptcha\Response
- */
- public static function fromJson($json)
- {
- $responseData = json_decode($json, true);
-
- if (!$responseData) {
- return new Response(false, array(ReCaptcha::E_INVALID_JSON));
- }
-
- $hostname = isset($responseData['hostname']) ? $responseData['hostname'] : null;
- $challengeTs = isset($responseData['challenge_ts']) ? $responseData['challenge_ts'] : null;
- $apkPackageName = isset($responseData['apk_package_name']) ? $responseData['apk_package_name'] : null;
- $score = isset($responseData['score']) ? floatval($responseData['score']) : null;
- $action = isset($responseData['action']) ? $responseData['action'] : null;
-
- if (isset($responseData['success']) && $responseData['success'] == true) {
- return new Response(true, array(), $hostname, $challengeTs, $apkPackageName, $score, $action);
- }
-
- if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
- return new Response(false, $responseData['error-codes'], $hostname, $challengeTs, $apkPackageName, $score, $action);
- }
-
- return new Response(false, array(ReCaptcha::E_UNKNOWN_ERROR), $hostname, $challengeTs, $apkPackageName, $score, $action);
- }
-
- /**
- * Constructor.
- *
- * @param boolean $success
- * @param string $hostname
- * @param string $challengeTs
- * @param string $apkPackageName
- * @param float $score
- * @param string $action
- * @param array $errorCodes
- */
- public function __construct($success, array $errorCodes = array(), $hostname = null, $challengeTs = null, $apkPackageName = null, $score = null, $action = null)
- {
- $this->success = $success;
- $this->hostname = $hostname;
- $this->challengeTs = $challengeTs;
- $this->apkPackageName = $apkPackageName;
- $this->score = $score;
- $this->action = $action;
- $this->errorCodes = $errorCodes;
- }
-
- /**
- * Is success?
- *
- * @return boolean
- */
- public function isSuccess()
- {
- return $this->success;
- }
-
- /**
- * Get error codes.
- *
- * @return array
- */
- public function getErrorCodes()
- {
- return $this->errorCodes;
- }
-
- /**
- * Get hostname.
- *
- * @return string
- */
- public function getHostname()
- {
- return $this->hostname;
- }
-
- /**
- * Get challenge timestamp
- *
- * @return string
- */
- public function getChallengeTs()
- {
- return $this->challengeTs;
- }
-
- /**
- * Get APK package name
- *
- * @return string
- */
- public function getApkPackageName()
- {
- return $this->apkPackageName;
- }
- /**
- * Get score
- *
- * @return float
- */
- public function getScore()
- {
- return $this->score;
- }
-
- /**
- * Get action
- *
- * @return string
- */
- public function getAction()
- {
- return $this->action;
- }
-
- public function toArray()
- {
- return array(
- 'success' => $this->isSuccess(),
- 'hostname' => $this->getHostname(),
- 'challenge_ts' => $this->getChallengeTs(),
- 'apk_package_name' => $this->getApkPackageName(),
- 'score' => $this->getScore(),
- 'action' => $this->getAction(),
- 'error-codes' => $this->getErrorCodes(),
- );
- }
-}
diff --git a/Sources/Tasks/ExportProfileData.php b/Sources/Tasks/ExportProfileData.php
index fa2913645b..5cf87e1577 100644
--- a/Sources/Tasks/ExportProfileData.php
+++ b/Sources/Tasks/ExportProfileData.php
@@ -1676,7 +1676,7 @@ protected function loadCssJs(): void
}
// Autoloading is unavailable for background tasks, so we have to do things the hard way...
else {
- if (!empty(Config::$modSettings['minimize_files']) && (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS'))) {
+ if (!empty(Config::$modSettings['minimize_files']) && (!class_exists('SMF\\Minify\\CSS') || !class_exists('SMF\\Minify\\JS'))) {
// Include, not require, because minimization is nice to have but not vital here.
include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exception.php']);
@@ -1694,7 +1694,7 @@ protected function loadCssJs(): void
include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'JS.php']);
- if (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS')) {
+ if (!class_exists('SMF\\Minify\\CSS') || !class_exists('SMF\\Minify\\JS')) {
Config::$modSettings['minimize_files'] = false;
}
}
diff --git a/Sources/Theme.php b/Sources/Theme.php
index 10f885bb37..4cec38aa96 100644
--- a/Sources/Theme.php
+++ b/Sources/Theme.php
@@ -1705,7 +1705,7 @@ function ($file) {
}
// No namespaces, sorry!
- $classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
+ $classType = 'SMF\\Minify\\' . strtoupper($type);
$minifier = new $classType();
diff --git a/Sources/composer.json b/Sources/composer.json
new file mode 100644
index 0000000000..1ea4dd075c
--- /dev/null
+++ b/Sources/composer.json
@@ -0,0 +1,12 @@
+{
+ "require": {
+ "google/recaptcha": "^1.3",
+ "matthiasmullie/minify": "^1.3"
+ },
+ "config": {
+ "vendor-dir": "Libs",
+ "optimize-autoloader": true,
+ "preferred-install": "dist",
+ "sort-packages": true
+ }
+}
diff --git a/Sources/minify/data/index.php b/Sources/minify/data/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/data/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/data/js/index.php b/Sources/minify/data/js/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/data/js/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/data/js/keywords_after.txt b/Sources/minify/data/js/keywords_after.txt
deleted file mode 100644
index 5c8cba7f35..0000000000
--- a/Sources/minify/data/js/keywords_after.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-in
-public
-extends
-private
-protected
-implements
-instanceof
\ No newline at end of file
diff --git a/Sources/minify/data/js/keywords_before.txt b/Sources/minify/data/js/keywords_before.txt
deleted file mode 100644
index 40b4ec00ca..0000000000
--- a/Sources/minify/data/js/keywords_before.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-do
-in
-let
-new
-var
-case
-else
-enum
-void
-with
-class
-const
-yield
-delete
-export
-import
-public
-static
-typeof
-extends
-package
-private
-continue
-function
-protected
-implements
-instanceof
\ No newline at end of file
diff --git a/Sources/minify/data/js/keywords_reserved.txt b/Sources/minify/data/js/keywords_reserved.txt
deleted file mode 100644
index 2a3ad3c0eb..0000000000
--- a/Sources/minify/data/js/keywords_reserved.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-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/Sources/minify/data/js/operators.txt b/Sources/minify/data/js/operators.txt
deleted file mode 100644
index e66229ae1c..0000000000
--- a/Sources/minify/data/js/operators.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-+
--
-*
-/
-%
-=
-+=
--=
-*=
-/=
-%=
-<<=
->>=
->>>=
-&=
-^=
-|=
-&
-|
-^
-~
-<<
->>
->>>
-==
-===
-!=
-!==
->
-<
->=
-<=
-&&
-||
-!
-.
-[
-]
-?
-:
-,
-;
-(
-)
-{
-}
\ No newline at end of file
diff --git a/Sources/minify/data/js/operators_after.txt b/Sources/minify/data/js/operators_after.txt
deleted file mode 100644
index 75926569a6..0000000000
--- a/Sources/minify/data/js/operators_after.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-+
--
-*
-/
-%
-=
-+=
--=
-*=
-/=
-%=
-<<=
->>=
->>>=
-&=
-^=
-|=
-&
-|
-^
-~
-<<
->>
->>>
-==
-===
-!=
-!==
->
-<
->=
-<=
-&&
-||
-.
-[
-]
-?
-:
-,
-;
-(
-)
-}
\ No newline at end of file
diff --git a/Sources/minify/data/js/operators_before.txt b/Sources/minify/data/js/operators_before.txt
deleted file mode 100644
index ff50d87033..0000000000
--- a/Sources/minify/data/js/operators_before.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-+
--
-*
-/
-%
-=
-+=
--=
-*=
-/=
-%=
-<<=
->>=
->>>=
-&=
-^=
-|=
-&
-|
-^
-~
-<<
->>
->>>
-==
-===
-!=
-!==
->
-<
->=
-<=
-&&
-||
-!
-.
-[
-?
-:
-,
-;
-(
-{
diff --git a/Sources/minify/index.php b/Sources/minify/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/path-converter/index.php b/Sources/minify/path-converter/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/path-converter/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/path-converter/src/Converter.php b/Sources/minify/path-converter/src/Converter.php
deleted file mode 100644
index 80cf269b94..0000000000
--- a/Sources/minify/path-converter/src/Converter.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-namespace MatthiasMullie\PathConverter;
-
-/**
- * Convert paths relative from 1 file to another.
- *
- * E.g.
- * ../../images/icon.jpg relative to /css/imports/icons.css
- * becomes
- * ../images/icon.jpg relative to /css/minified.css
- *
- * Please report bugs on https://github.com/matthiasmullie/path-converter/issues
- *
- * @author Matthias Mullie <pathconverter@mullie.eu>
- * @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!)
- * @param string $root Root directory (defaults to `getcwd`)
- */
- public function __construct($from, $to, $root = '')
- {
- $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
- $root = $root ?: getcwd();
- $from = strpos($from, $root) === 0 ? $from : preg_replace('/\/+/', '/', $root.'/'.$from);
- $to = strpos($to, $root) === 0 ? $to : preg_replace('/\/+/', '/', $root.'/'.$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), '/');
-
- // remove leading current directory.
- if (substr($path, 0, 2) === './') {
- $path = substr($path, 2);
- }
-
- // remove references to current directory in the path.
- $path = str_replace('/./', '/', $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('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
- } while ($count);
-
- return $path;
- }
-
- /**
- * Figure out the shared path of 2 locations.
- *
- * Example:
- * /home/forkcms/frontend/core/layout/images/img.gif
- * and
- * /home/forkcms/frontend/cache/minified_css
- * share
- * /home/forkcms/frontend
- *
- * @param string $path1
- * @param string $path2
- *
- * @return string
- */
- protected function shared($path1, $path2)
- {
- // $path could theoretically be empty (e.g. no path is given), in which
- // case it shouldn't expand to array(''), which would compare to one's
- // root /
- $path1 = $path1 ? explode('/', $path1) : array();
- $path2 = $path2 ? explode('/', $path2) : array();
-
- $shared = array();
-
- // compare paths & strip identical ancestors
- foreach ($path1 as $i => $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('../', count(array_filter(explode('/', $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/Sources/minify/path-converter/src/ConverterInterface.php b/Sources/minify/path-converter/src/ConverterInterface.php
deleted file mode 100644
index dc1b765737..0000000000
--- a/Sources/minify/path-converter/src/ConverterInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace MatthiasMullie\PathConverter;
-
-/**
- * Convert file paths.
- *
- * Please report bugs on https://github.com/matthiasmullie/path-converter/issues
- *
- * @author Matthias Mullie <pathconverter@mullie.eu>
- * @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/Sources/minify/path-converter/src/NoConverter.php b/Sources/minify/path-converter/src/NoConverter.php
deleted file mode 100644
index 2fcfd0f204..0000000000
--- a/Sources/minify/path-converter/src/NoConverter.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace MatthiasMullie\PathConverter;
-
-/**
- * Don't convert paths.
- *
- * Please report bugs on https://github.com/matthiasmullie/path-converter/issues
- *
- * @author Matthias Mullie <pathconverter@mullie.eu>
- * @copyright Copyright (c) 2015, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-class NoConverter implements ConverterInterface
-{
- /**
- * {@inheritdoc}
- */
- public function convert($path)
- {
- return $path;
- }
-}
diff --git a/Sources/minify/path-converter/src/index.php b/Sources/minify/path-converter/src/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/path-converter/src/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/src/CSS.php b/Sources/minify/src/CSS.php
deleted file mode 100644
index dd31f980bd..0000000000
--- a/Sources/minify/src/CSS.php
+++ /dev/null
@@ -1,779 +0,0 @@
-<?php
-
-/**
- * CSS Minifier.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-
-namespace MatthiasMullie\Minify;
-
-use MatthiasMullie\Minify\Exceptions\FileImportException;
-use MatthiasMullie\PathConverter\Converter;
-use MatthiasMullie\PathConverter\ConverterInterface;
-
-/**
- * CSS minifier.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @author Tijs Verkoyen <minify@verkoyen.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-class CSS extends Minify
-{
- /**
- * @var int maximum import 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',
- 'woff2' => 'data:application/x-font-woff2',
- 'avif' => 'data:image/avif',
- 'apng' => 'data:image/apng',
- 'webp' => 'data:image/webp',
- '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 (?<url>url\()?(?P<quotes>["\']?).+?(?P=quotes)(?(url)\)));?/', $content, $matches)) {
- // remove from content
- foreach ($matches[0] as $import) {
- $content = str_replace($import, '', $content);
- }
-
- // add to top
- $content = implode(';', $matches[2]) . ';' . trim($content, ';');
- }
-
- return $content;
- }
-
- /**
- * Combine CSS from import statements.
- *
- * Import statements will be loaded and their content merged into the original
- * file, to save HTTP requests.
- *
- * @param string $source The file to combine imports for
- * @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<quotes>["\']?)
-
- # fetch path
- (?P<path>.+?)
-
- # (optional) close path enclosure
- (?P=quotes)
-
- # close url()
- \)
-
- # (optional) trailing whitespace
- \s*
-
- # (optional) media statement(s)
- (?P<media>[^;]*)
-
- # (optional) trailing whitespace
- \s*
-
- # (optional) closing semi-colon
- ;?
-
- /ix',
-
- // @import 'xxx'
- '/
-
- # import statement
- @import
-
- # whitespace
- \s+
-
- # open path enclosure
- (?P<quotes>["\'])
-
- # fetch path
- (?P<path>.+?)
-
- # close path enclosure
- (?P=quotes)
-
- # (optional) trailing whitespace
- \s*
-
- # (optional) media statement(s)
- (?P<media>[^;]*)
-
- # (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 self($importPath);
- $minifier->setMaxImportSize($this->maxImportSize);
- $minifier->setImportExtensions($this->importExtensions);
- $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();
- $this->extractMath();
- $this->extractCustomProperties();
- $css = $this->replace($css);
-
- $css = $this->stripWhitespace($css);
- $css = $this->shortenColors($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<quotes>["\'])?
-
- # fetch path
- (?P<path>.+?)
-
- # 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<quotes>["\'])
-
- # fetch path
- (?P<path>.+?)
-
- # 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 shortenColors($content)
- {
- $content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?:([0-9a-z])\\4)?(?=[; }])/i', '#$1$2$3$4', $content);
-
- // remove alpha channel if it's pointless...
- $content = preg_replace('/(?<=[: ])#([0-9a-z]{6})ff?(?=[; }])/i', '#$1', $content);
- $content = preg_replace('/(?<=[: ])#([0-9a-z]{3})f?(?=[; }])/i', '#$1', $content);
-
- $colors = array(
- // we can shorten some even more by replacing them with their color name
- '#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',
- // or the other way around
- 'WHITE' => '#fff',
- 'BLACK' => '#000',
- );
-
- 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)
- {
- // we don't want to strip units in `calc()` expressions:
- // `5px - 0px` is valid, but `5px - 0` is not
- // `10px * 0` is valid (equates to 0), and so is `10 * 0px`, but
- // `10 * 0` is invalid
- // we've extracted calcs earlier, so we don't need to worry about this
-
- // 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);
-
- // IE doesn't seem to understand a unitless flex-basis value (correct -
- // it goes against the spec), so let's add it in again (make it `%`,
- // which is only 1 char: 0%, 0px, 0 anything, it's all just the same)
- // @see https://developer.mozilla.org/nl/docs/Web/CSS/flex
- $content = preg_replace('/flex:([0-9]+\s[0-9]+\s)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)
- {
- $content = preg_replace('/(?<=^)[^\{\};]+\{\s*\}/', '', $content);
- $content = preg_replace('/(?<=(\}|;))[^\{\};]+\{\s*\}/', '', $content);
-
- return $content;
- }
-
- /**
- * Strip comments from source code.
- */
- protected function stripComments()
- {
- $this->stripMultilineComments();
- }
-
- /**
- * 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);
- }
-
- /**
- * Replace all occurrences of functions that may contain math, where
- * whitespace around operators needs to be preserved (e.g. calc, clamp).
- */
- protected function extractMath()
- {
- $functions = array('calc', 'clamp', 'min', 'max');
- $pattern = '/\b(' . implode('|', $functions) . ')(\(.+?)(?=$|;|})/m';
-
- // PHP only supports $this inside anonymous functions since 5.4
- $minifier = $this;
- $callback = function ($match) use ($minifier, $pattern, &$callback) {
- $function = $match[1];
- $length = strlen($match[2]);
- $expr = '';
- $opened = 0;
-
- // the regular expression for extracting math has 1 significant problem:
- // it can't determine the correct closing parenthesis...
- // instead, it'll match a larger portion of code to where it's certain that
- // the calc() musts have ended, and we'll figure out which is the correct
- // closing parenthesis here, by counting how many have opened
- for ($i = 0; $i < $length; ++$i) {
- $char = $match[2][$i];
- $expr .= $char;
- if ($char === '(') {
- ++$opened;
- } elseif ($char === ')' && --$opened === 0) {
- break;
- }
- }
-
- // now that we've figured out where the calc() starts and ends, extract it
- $count = count($minifier->extracted);
- $placeholder = 'math(' . $count . ')';
- $minifier->extracted[$placeholder] = $function . '(' . trim(substr($expr, 1, -1)) . ')';
-
- // and since we've captured more code than required, we may have some leftover
- // calc() in here too - go recursive on the remaining but of code to go figure
- // that out and extract what is needed
- $rest = $minifier->str_replace_first($function . $expr, '', $match[0]);
- $rest = preg_replace_callback($pattern, $callback, $rest);
-
- return $placeholder . $rest;
- };
-
- $this->registerPattern($pattern, $callback);
- }
-
- /**
- * Replace custom properties, whose values may be used in scenarios where
- * we wouldn't want them to be minified (e.g. inside calc).
- */
- protected function extractCustomProperties()
- {
- // PHP only supports $this inside anonymous functions since 5.4
- $minifier = $this;
- $this->registerPattern(
- '/(?<=^|[;}{])\s*(--[^:;{}"\'\s]+)\s*:([^;{}]+)/m',
- function ($match) use ($minifier) {
- $placeholder = '--custom-' . count($minifier->extracted) . ':0';
- $minifier->extracted[$placeholder] = $match[1] . ':' . trim($match[2]);
-
- return $placeholder;
- }
- );
- }
-
- /**
- * 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/Sources/minify/src/Exception.php b/Sources/minify/src/Exception.php
deleted file mode 100644
index 1c947a945b..0000000000
--- a/Sources/minify/src/Exception.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Base Exception.
- *
- * @deprecated Use Exceptions\BasicException instead
- *
- * @author Matthias Mullie <minify@mullie.eu>
- */
-
-namespace MatthiasMullie\Minify;
-
-/**
- * Base Exception Class.
- *
- * @deprecated Use Exceptions\BasicException instead
- *
- * @author Matthias Mullie <minify@mullie.eu>
- */
-abstract class Exception extends \Exception
-{
-}
diff --git a/Sources/minify/src/Exceptions/BasicException.php b/Sources/minify/src/Exceptions/BasicException.php
deleted file mode 100644
index 78fbb21fd4..0000000000
--- a/Sources/minify/src/Exceptions/BasicException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Basic exception.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-
-namespace MatthiasMullie\Minify\Exceptions;
-
-use MatthiasMullie\Minify\Exception;
-
-/**
- * Basic Exception Class.
- *
- * @author Matthias Mullie <minify@mullie.eu>
- */
-abstract class BasicException extends Exception
-{
-}
diff --git a/Sources/minify/src/Exceptions/FileImportException.php b/Sources/minify/src/Exceptions/FileImportException.php
deleted file mode 100644
index 36d0fca318..0000000000
--- a/Sources/minify/src/Exceptions/FileImportException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * File Import Exception.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-
-namespace MatthiasMullie\Minify\Exceptions;
-
-/**
- * File Import Exception Class.
- *
- * @author Matthias Mullie <minify@mullie.eu>
- */
-class FileImportException extends BasicException
-{
-}
diff --git a/Sources/minify/src/Exceptions/IOException.php b/Sources/minify/src/Exceptions/IOException.php
deleted file mode 100644
index 12fb01ec29..0000000000
--- a/Sources/minify/src/Exceptions/IOException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * IO Exception.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-
-namespace MatthiasMullie\Minify\Exceptions;
-
-/**
- * IO Exception Class.
- *
- * @author Matthias Mullie <minify@mullie.eu>
- */
-class IOException extends BasicException
-{
-}
diff --git a/Sources/minify/src/Exceptions/index.php b/Sources/minify/src/Exceptions/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/src/Exceptions/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/Sources/minify/src/JS.php b/Sources/minify/src/JS.php
deleted file mode 100644
index 6ef9cd72af..0000000000
--- a/Sources/minify/src/JS.php
+++ /dev/null
@@ -1,621 +0,0 @@
-<?php
-
-/**
- * JavaScript minifier.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @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
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @author Tijs Verkoyen <minify@verkoyen.eu>
- * @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved
- * @license MIT License
- */
-class JS extends Minify
-{
- /**
- * Var-matching regex based on https://stackoverflow.com/a/9337047/802993.
- *
- * Note that regular expressions using that bit must have the PCRE_UTF8
- * pattern modifier (/u) set.
- *
- * @internal
- *
- * @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 <variable, value, ...>
- * 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 <variable, value, ...>
- * 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 <variable, value, ...> 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 <variable, value, ...> 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();
-
- /**
- * {@inheritdoc}
- */
- public function __construct()
- {
- call_user_func_array(array('\\MatthiasMullie\Minify\\Minify', '__construct'), func_get_args());
-
- $dataDir = __DIR__ . '/../data/js/';
- $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
- $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options);
- $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options);
- $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options);
- $this->operators = file($dataDir . 'operators.txt', $options);
- $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
- $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
- }
-
- /**
- * 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 = '';
-
- /*
- * 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();
-
- // loop files
- foreach ($this->data as $source => $js) {
- // take out strings, comments & regex (for which we've registered
- // the regexes just a few lines earlier)
- $js = $this->replace($js);
-
- $js = $this->propertyNotation($js);
- $js = $this->shortenBools($js);
- $js = $this->stripWhitespace($js);
-
- // combine js: separating the scripts by a ;
- $content .= $js . ';';
- }
-
- // clean up leftover `;`s from the combination of multiple scripts
- $content = ltrim($content, ';');
- $content = (string) substr($content, 0, -1);
-
- /*
- * 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.
- */
- protected function stripComments()
- {
- $this->stripMultilineComments();
-
- // single-line comments
- $this->registerPattern('/\/\/.*$/m', '');
- }
-
- /**
- * 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[0];
-
- return $placeholder;
- };
-
- // match all chars except `/` and `\`
- // `\` is allowed though, along with whatever char follows (which is the
- // one being escaped)
- // this should allow all chars, except for an unescaped `/` (= the one
- // closing the regex)
- // then also ignore bare `/` inside `[]`, where they don't need to be
- // escaped: anything inside `[]` can be ignored safely
- $pattern = '\\/(?!\*)(?:[^\\[\\/\\\\\n\r]++|(?:\\\\.)++|(?:\\[(?:[^\\]\\\\\n\r]++|(?:\\\\.)++)++\\])++)++\\/[gimuy]*';
-
- // a regular expression can only be followed by a few operators or some
- // of the RegExp methods (a `\` followed by a variable or value is
- // likely part of a division, not a regex)
- $keywords = array('do', 'in', 'new', 'else', 'throw', 'yield', 'delete', 'return', 'typeof');
- $before = '(^|[=:,;\+\-\*\?\/\}\(\{\[&\|!]|' . implode('|', $keywords) . ')\s*';
- $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 = '(?=\s*([\.,;:\)\}&\|+]|\/\/|$|\.(' . implode('|', $propertiesAndMethods) . ')))';
- $this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);
-
- // regular expressions following a `)` are rather annoying to detect...
- // quite often, `/` after `)` is a division operator & if it happens to
- // be followed by another one (or a comment), it is likely to be
- // confused for a regular expression
- // however, it's perfectly possible for a regex to follow a `)`: after
- // a single-line `if()`, `while()`, ... statement, for example
- // since, when they occur like that, they're always the start of a
- // statement, there's only a limited amount of ways they can be useful:
- // by calling the regex methods directly
- // if a regex following `)` is not followed by `.<property or method>`,
- // it's quite likely not a regex
- $before = '\)\s*';
- $after = '(?=\s*\.(' . implode('|', $propertiesAndMethods) . '))';
- $this->registerPattern('/' . $before . '\K' . $pattern . $after . '/', $callback);
-
- // 1 more edge case: a regex can be followed by a lot more operators or
- // 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 = '(?=\s*\n\s*(' . implode('|', $operators) . '))';
- $this->registerPattern('/' . $pattern . $after . '/', $callback);
- }
-
- /**
- * 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(
- '/(?<![\+\-])\s*([\+\-])(?![\+\-])/',
- '/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
- ),
- '\\1',
- $content
- );
-
- // collapse whitespace around reserved words into single space
- $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $keywordsBefore) . ')\s+/', '\\2 ', $content);
- $content = preg_replace('/\s+(' . implode('|', $keywordsAfter) . ')(?=([;\{\s]|$))/', ' \\1', $content);
-
- /*
- * We didn't strip whitespace after a couple of operators because they
- * could be used in different contexts and we can't be sure it's ok to
- * strip the newlines. However, we can safely strip any non-line feed
- * whitespace that follows them.
- */
- $operatorsDiffBefore = array_diff($operators, $operatorsBefore);
- $operatorsDiffAfter = array_diff($operators, $operatorsAfter);
- $content = preg_replace('/(' . implode('|', $operatorsDiffBefore) . ')[^\S\n]+/', '\\1', $content);
- $content = preg_replace('/[^\S\n]+(' . implode('|', $operatorsDiffAfter) . ')/', '\\1', $content);
-
- /*
- * Whitespace after `return` can be omitted in a few occasions
- * (such as when followed by a string or regex)
- * Same for whitespace in between `)` and `{`, or between `{` and some
- * keywords.
- */
- $content = preg_replace('/\breturn\s+(["\'\/\+\-])/', 'return$1', $content);
- $content = preg_replace('/\)\s+\{/', '){', $content);
- $content = preg_replace('/}\n(else|catch|finally)\b/', '}$1', $content);
-
- /*
- * Get rid of double semicolons, except where they can be used like:
- * "for(v=1,_=b;;)", "for(v=1;;v++)" or "for(;;ja||(ja=true))".
- * I'll safeguard these double semicolons inside for-loops by
- * temporarily replacing them with an invalid condition: they won't have
- * a double semicolon and will be easy to spot to restore afterwards.
- */
- $content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content);
- $content = preg_replace('/;+/', ';', $content);
- $content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content);
-
- /*
- * Next, we'll be removing all semicolons where ASI kicks in.
- * for-loops however, can have an empty body (ending in only a
- * semicolon), like: `for(i=1;i<3;i++);`, of `for(i in list);`
- * Here, nothing happens during the loop; it's just used to keep
- * increasing `i`. With that ; omitted, the next line would be expected
- * to be the for-loop's body... Same goes for while loops.
- * I'm going to double that semicolon (if any) so after the next line,
- * which strips semicolons here & there, we're still left with this one.
- * Note the special recursive construct in the three inner parts of the for:
- * (\{([^\{\}]*(?-2))*[^\{\}]*\})? - it is intended to match inline
- * functions bodies, e.g.: i<arr.map(function(e){return e}).length.
- * Also note that the construct is applied only once and multiplied
- * for each part of the for, otherwise it risks a catastrophic backtracking.
- * The limitation is that it will not allow closures in more than one
- * of the three parts for a specific for() case.
- * REGEX throwing catastrophic backtracking: $content = preg_replace('/(for\([^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*;[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*;[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*\));(\}|$)/s', '\\1;;\\8', $content);
- */
- $content = preg_replace('/(for\((?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*);[^;\{]*;[^;\{]*\));(\}|$)/s', '\\1;;\\4', $content);
- $content = preg_replace('/(for\([^;\{]*;(?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*);[^;\{]*\));(\}|$)/s', '\\1;;\\4', $content);
- $content = preg_replace('/(for\([^;\{]*;[^;\{]*;(?:[^;\{]*|[^;\{]*function[^;\{]*(\{([^\{\}]*(?-2))*[^\{\}]*\})?[^;\{]*)\));(\}|$)/s', '\\1;;\\4', $content);
-
- $content = preg_replace('/(for\([^;\{]+\s+in\s+[^;\{]+\));(\}|$)/s', '\\1;;\\2', $content);
-
- /*
- * Do the same for the if's that don't have a body but are followed by ;}
- */
- $content = preg_replace('/(\bif\s*\([^{;]*\));\}/s', '\\1;;}', $content);
-
- /*
- * Below will also keep `;` after a `do{}while();` along with `while();`
- * While these could be stripped after do-while, detecting this
- * distinction is cumbersome, so I'll play it safe and make sure `;`
- * after any kind of `while` is kept.
- */
- $content = preg_replace('/(while\([^;\{]+\));(\}|$)/s', '\\1;;\\2', $content);
-
- /*
- * We also can't strip empty else-statements. Even though they're
- * useless and probably shouldn't be in the code in the first place, we
- * shouldn't be stripping the `;` that follows it as it breaks the code.
- * We can just remove those useless else-statements completely.
- *
- * @see https://github.com/matthiasmullie/minify/issues/91
- */
- $content = preg_replace('/else;/s', '', $content);
-
- /*
- * We also don't really want to terminate statements followed by closing
- * curly braces (which we've ignored completely up until now) or end-of-
- * script: ASI will kick in here & we're all about minifying.
- * Semicolons at beginning of the file don't make any sense either.
- */
- $content = preg_replace('/;(\}|$)/s', '\\1', $content);
- $content = ltrim($content, ';');
-
- // get rid of remaining whitespace af beginning/end
- return trim($content);
- }
-
- /**
- * We'll strip whitespace around certain operators with regular expressions.
- * This will prepare the given array by escaping all characters.
- *
- * @param string[] $operators
- * @param string $delimiter
- *
- * @return string[]
- */
- protected function getOperatorsForRegex(array $operators, $delimiter = '/')
- {
- // escape operators for use in regex
- $delimiters = array_fill(0, count($operators), $delimiter);
- $escaped = array_map('preg_quote', $operators, $delimiters);
-
- $operators = array_combine($operators, $escaped);
-
- // ignore + & - for now, they'll get special treatment
- unset($operators['+'], $operators['-']);
-
- // dot can not just immediately follow a number; it can be confused for
- // decimal point, or calling a method on it, e.g. 42 .toString()
- $operators['.'] = '(?<![0-9]\s)\.';
-
- // don't confuse = with other assignment shortcuts (e.g. +=)
- $chars = preg_quote('+-*\=<>%&|', $delimiter);
- $operators['='] = '(?<![' . $chars . '])\=';
-
- return $operators;
- }
-
- /**
- * We'll strip whitespace around certain keywords with regular expressions.
- * This will prepare the given array by escaping all characters.
- *
- * @param string[] $keywords
- * @param string $delimiter
- *
- * @return string[]
- */
- protected function getKeywordsForRegex(array $keywords, $delimiter = '/')
- {
- // escape keywords for use in regex
- $delimiter = array_fill(0, count($keywords), $delimiter);
- $escaped = array_map('preg_quote', $keywords, $delimiter);
-
- // add word boundaries
- array_walk($keywords, function ($value) {
- return '\b' . $value . '\b';
- });
-
- $keywords = array_combine($keywords, $escaped);
-
- return $keywords;
- }
-
- /**
- * Replaces all occurrences of array['key'] by array.key.
- *
- * @param string $content
- *
- * @return string
- */
- protected function propertyNotation($content)
- {
- // PHP only supports $this inside anonymous functions since 5.4
- $minifier = $this;
- $keywords = $this->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 = '(?<!' . implode(')(?<!', $keywords) . ')';
-
- return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
- }
-
- /**
- * Replaces true & false by !0 and !1.
- *
- * @param string $content
- *
- * @return string
- */
- protected function shortenBools($content)
- {
- /*
- * 'true' or 'false' could be used as property names (which may be
- * followed by whitespace) - we must not replace those!
- * Since PHP doesn't allow variable-length (to account for the
- * whitespace) lookbehind assertions, I need to capture the leading
- * character and check if it's a `.`
- */
- $callback = function ($match) {
- if (trim($match[1]) === '.') {
- return $match[0];
- }
-
- return $match[1] . ($match[2] === 'true' ? '!0' : '!1');
- };
- $content = preg_replace_callback('/(^|.\s*)\b(true|false)\b(?!:)/', $callback, $content);
-
- // for(;;) is exactly the same as while(true), but shorter :)
- $content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content);
-
- // now make sure we didn't turn any do ... while(true) into do ... for(;;)
- preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-
- // go backward to make sure positional offsets aren't altered when $content changes
- $dos = array_reverse($dos);
- foreach ($dos as $do) {
- $offsetDo = $do[0][1];
-
- // find all `while` (now `for`) following `do`: one of those must be
- // associated with the `do` and be turned back into `while`
- preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo);
- foreach ($whiles as $while) {
- $offsetWhile = $while[0][1];
-
- $open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo);
- $close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo);
- if ($open === $close) {
- // only restore `while` if amount of `{` and `}` are the same;
- // otherwise, that `for` isn't associated with this `do`
- $content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
- break;
- }
- }
- }
-
- return $content;
- }
-}
diff --git a/Sources/minify/src/Minify.php b/Sources/minify/src/Minify.php
deleted file mode 100644
index d17cf8b16e..0000000000
--- a/Sources/minify/src/Minify.php
+++ /dev/null
@@ -1,557 +0,0 @@
-<?php
-
-/**
- * Abstract minifier class.
- *
- * Please report bugs on https://github.com/matthiasmullie/minify/issues
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @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
- *
- * @author Matthias Mullie <minify@mullie.eu>
- * @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.
- *
- * @internal
- *
- * @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;
- }
-
- /**
- * Add a file to be minified.
- *
- * @param string|string[] $data
- *
- * @return static
- *
- * @throws IOException
- */
- public function addFile($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 $path) {
- if (is_array($path)) {
- call_user_func_array(array($this, 'addFile'), $path);
- continue;
- }
-
- // redefine var
- $path = (string) $path;
-
- // check if we can read the file
- if (!$this->canImportFile($path)) {
- throw new IOException('The file "' . $path . '" could not be opened for reading. Check if PHP has enough permissions.');
- }
-
- $this->add($path);
- }
-
- 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);
-
- // These are not the droids you're looking for
- $content = "/* Any changes to this file will be overwritten. To change the content\nof this file, edit the source files from which it was compiled. */\n" . $content;
-
- // 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.
- *
- * If $replacement is a string, it must be plain text. Placeholders like $1 or \2 don't work.
- * If you need that functionality, use a callback instead.
- *
- * @param string $pattern PCRE pattern
- * @param string|callable $replacement Replacement value for matched pattern
- */
- protected function registerPattern($pattern, $replacement = '')
- {
- // study the pattern, we'll execute it more than once
- $pattern .= 'S';
-
- $this->patterns[] = array($pattern, $replacement);
- }
-
- /**
- * Both JS and CSS use the same form of multi-line comment, so putting the common code here.
- */
- protected function stripMultilineComments()
- {
- // First extract comments we want to keep, so they can be restored later
- // PHP only supports $this inside anonymous functions since 5.4
- $minifier = $this;
- $callback = function ($match) use ($minifier) {
- $count = count($minifier->extracted);
- $placeholder = '/*'.$count.'*/';
- $minifier->extracted[$placeholder] = $match[0];
-
- return $placeholder;
- };
- $this->registerPattern('/
- # optional newline
- \n?
-
- # start comment
- \/\*
-
- # comment content
- (?:
- # either starts with an !
- !
- |
- # or, after some number of characters which do not end the comment
- (?:(?!\*\/).)*?
-
- # there is either a @license or @preserve tag
- @(?:license|preserve)
- )
-
- # then match to the end of the comment
- .*?\*\/\n?
-
- /ixs', $callback);
-
- // Then strip all other comments
- $this->registerPattern('/\/\*.*?\*\//s', '');
- }
-
- /**
- * 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)
- {
- $contentLength = strlen($content);
- $output = '';
- $processedOffset = 0;
- $positions = array_fill(0, count($this->patterns), -1);
- $matches = array();
-
- while ($processedOffset < $contentLength) {
- // find first match for all patterns
- foreach ($this->patterns as $i => $pattern) {
- list($pattern, $replacement) = $pattern;
-
- // we can safely ignore patterns for positions we've unset earlier,
- // because we know these won't show up anymore
- if (array_key_exists($i, $positions) == false) {
- continue;
- }
-
- // no need to re-run matches that are still in the part of the
- // content that hasn't been processed
- if ($positions[$i] >= $processedOffset) {
- continue;
- }
-
- $match = null;
- if (preg_match($pattern, $content, $match, PREG_OFFSET_CAPTURE, $processedOffset)) {
- $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] = $match[0][1];
- } 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]);
- }
- }
-
- // no more matches to find: everything's been processed, break out
- if (!$matches) {
- // output the remaining content
- $output .= substr($content, $processedOffset);
- 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)
- $matchOffset = min($positions);
- $firstPattern = array_search($matchOffset, $positions);
- $match = $matches[$firstPattern];
-
- // execute the pattern that matches earliest in the content string
- list(, $replacement) = $this->patterns[$firstPattern];
-
- // add the part of the input between $processedOffset and the first match;
- // that content wasn't matched by anything
- $output .= substr($content, $processedOffset, $matchOffset - $processedOffset);
- // add the replacement for the match
- $output .= $this->executeReplacement($replacement, $match);
- // advance $processedOffset past the match
- $processedOffset = $matchOffset + strlen($match[0][0]);
- }
-
- return $output;
- }
-
- /**
- * If $replacement is a callback, execute it, passing in the match data.
- * If it's a string, just pass it through.
- *
- * @param string|callable $replacement Replacement value
- * @param array $match Match data, in PREG_OFFSET_CAPTURE form
- *
- * @return string
- */
- protected function executeReplacement($replacement, $match)
- {
- if (!is_callable($replacement)) {
- return $replacement;
- }
- // convert $match from the PREG_OFFSET_CAPTURE form to the form the callback expects
- foreach ($match as &$matchItem) {
- $matchItem = $matchItem[0];
- }
-
- return $replacement($match);
- }
-
- /**
- * 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 . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
- }
-
- /**
- * This method will restore all extracted data (strings, regexes) that were
- * replaced with placeholder text in extract*(). The original content was
- * saved in $this->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)
- {
- $parsed = parse_url($path);
- if (
- // file is elsewhere
- isset($parsed['host']) ||
- // file responds to queries (may change, or need to bypass cache)
- isset($parsed['query'])
- ) {
- return false;
- }
-
- 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 ($path === '' || ($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 (
- !is_resource($handler) ||
- ($result = @fwrite($handler, $content)) === false ||
- ($result < strlen($content))
- ) {
- throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.');
- }
- }
-
- protected static function str_replace_first($search, $replace, $subject)
- {
- $pos = strpos($subject, $search);
- if ($pos !== false) {
- return substr_replace($subject, $replace, $pos, strlen($search));
- }
-
- return $subject;
- }
-}
diff --git a/Sources/minify/src/index.php b/Sources/minify/src/index.php
deleted file mode 100644
index 976d292448..0000000000
--- a/Sources/minify/src/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php'))
- include (dirname(__DIR__) . '/index.php');
-else
- exit;
-
-?>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 0b2bb25ea3..f5c640963f 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
"friendsofphp/php-cs-fixer": "^3.40"
},
"scripts": {
+ "post-update-cmd": "cd Sources && composer update --no-dev -o",
"lint": "php-cs-fixer --quiet check --config .php-cs-fixer.dist.php --path-mode=intersection $(git diff --name-only \"*.php\") || php-cs-fixer check --diff --config .php-cs-fixer.dist.php --path-mode=intersection $(git diff --name-only \"*.php\")",
"lint-fix": "php-cs-fixer fix -v --config .php-cs-fixer.dist.php --path-mode=intersection $(git diff --name-only \"*.php\")"
},