diff --git a/composer.json b/composer.json index ef4622d89..9c85ceb1d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "combodo/tcpdf": "6.3.5", "nikic/php-parser": "^4.12.0", "pear/archive_tar": "1.4.13", - "pelago/emogrifier": "2.1.0", + "pelago/emogrifier": "3.1.0", "scssphp/scssphp": "1.0.6", "swiftmailer/swiftmailer": "5.4.12", "symfony/console": "3.4.*", diff --git a/composer.lock b/composer.lock index 5ea702aec..91c751e5e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "75f17b71005971207815906ec7e9cf67", + "content-hash": "fb56686981ee4945791fe5b93735b022", "packages": [ { "name": "combodo/tcpdf", @@ -411,34 +411,34 @@ }, { "name": "pelago/emogrifier", - "version": "v2.1.0", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f" + "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/40c3d4f475d44ffc7265a760d1dd0e81f579f96f", - "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8", + "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", - "symfony/css-selector": "^3.4.0 || ^4.0.0" + "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4", + "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.2.0", - "phpmd/phpmd": "^2.6.0", - "phpunit/phpunit": "^4.8.0", - "squizlabs/php_codesniffer": "^3.3.2" + "friendsofphp/php-cs-fixer": "^2.15.3", + "phpmd/phpmd": "^2.7.0", + "phpunit/phpunit": "^5.7.27", + "squizlabs/php_codesniffer": "^3.5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -451,16 +451,6 @@ "MIT" ], "authors": [ - { - "name": "John Reeve", - "email": "jreeve@pelagodesign.com" - }, - { - "name": "Cameron Brooks" - }, - { - "name": "Jaime Prado" - }, { "name": "Oliver Klee", "email": "github@oliverklee.de" @@ -469,9 +459,19 @@ "name": "Zoli Szabó", "email": "zoli.szabo+github@gmail.com" }, + { + "name": "John Reeve", + "email": "jreeve@pelagodesign.com" + }, { "name": "Jake Hotson", "email": "jake@qzdesign.co.uk" + }, + { + "name": "Cameron Brooks" + }, + { + "name": "Jaime Prado" } ], "description": "Converts CSS styles into inline style attributes in your HTML code", @@ -481,7 +481,11 @@ "email", "pre-processing" ], - "time": "2018-12-08T13:55:46+00:00" + "support": { + "issues": "https://github.com/MyIntervals/emogrifier/issues", + "source": "https://github.com/MyIntervals/emogrifier" + }, + "time": "2019-12-26T19:37:31+00:00" }, { "name": "psr/cache", @@ -2609,7 +2613,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1.3", + "php": ">=7.1.3 <8.0.0", "ext-ctype": "*", "ext-dom": "*", "ext-gd": "*", @@ -2620,7 +2624,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.2.0" + "php": "7.1.3" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/core/email.class.inc.php b/core/email.class.inc.php index 4600f916f..d265dc97e 100644 --- a/core/email.class.inc.php +++ b/core/email.class.inc.php @@ -24,6 +24,10 @@ * @license http://opensource.org/licenses/AGPL-3.0 */ +use Pelago\Emogrifier\CssInliner; +use Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter; +use Pelago\Emogrifier\HtmlProcessor\HtmlPruner; + Swift_Preferences::getInstance()->setCharset('UTF-8'); @@ -335,8 +339,9 @@ class EMail { if (($sMimeType === 'text/html') && ($sCustomStyles !== null)) { - $emogrifier = new \Pelago\Emogrifier($sBody, $sCustomStyles); - $sBody = $emogrifier->emogrify(); // Adds html/body tags if not already present + $oDomDocument = CssInliner::fromHtml($sBody)->inlineCss($sCustomStyles)->getDomDocument(); + HtmlPruner::fromDomDocument($oDomDocument)->removeElementsWithDisplayNone(); + $sBody = CssToAttributeConverter::fromDomDocument($oDomDocument)->convertCssToVisualAttributes()->render(); // Adds html/body tags if not already present } $this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType); $this->m_oMessage->setBody($sBody, $sMimeType); diff --git a/lib/composer/ClassLoader.php b/lib/composer/ClassLoader.php index 1a58957d2..6d0c3f2d0 100644 --- a/lib/composer/ClassLoader.php +++ b/lib/composer/ClassLoader.php @@ -42,6 +42,8 @@ namespace Composer\Autoload; */ class ClassLoader { + private $vendorDir; + // PSR-4 private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); @@ -57,6 +59,13 @@ class ClassLoader private $missingClasses = array(); private $apcuPrefix; + private static $registeredLoaders = array(); + + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + } + public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -300,6 +309,17 @@ class ClassLoader public function register($prepend = false) { spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } } /** @@ -308,13 +328,17 @@ class ClassLoader public function unregister() { spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } } /** * Loads the given class or interface. * * @param string $class The name of the class - * @return bool|null True if loaded, null otherwise + * @return true|null True if loaded, null otherwise */ public function loadClass($class) { @@ -323,6 +347,8 @@ class ClassLoader return true; } + + return null; } /** @@ -367,6 +393,16 @@ class ClassLoader return $file; } + /** + * Returns the currently registered loaders indexed by their corresponding vendor directories. + * + * @return self[] + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + private function findFileWithExtension($class, $ext) { // PSR-4 lookup diff --git a/lib/composer/InstalledVersions.php b/lib/composer/InstalledVersions.php index 53b8db9bb..b3a4e1611 100644 --- a/lib/composer/InstalledVersions.php +++ b/lib/composer/InstalledVersions.php @@ -1,705 +1,337 @@ + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Composer; use Composer\Autoload\ClassLoader; use Composer\Semver\VersionParser; - - - - - - - +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require it's presence, you can require `composer-runtime-api ^2.0` + */ class InstalledVersions { -private static $installed = array ( - 'root' => - array ( - 'pretty_version' => 'dev-develop', - 'version' => 'dev-develop', - 'aliases' => - array ( - ), - 'reference' => 'c8dd8c3806d92e19b5a67c16be9d64ceaa2e0524', - 'name' => '__root__', - ), - 'versions' => - array ( - '__root__' => - array ( - 'pretty_version' => 'dev-develop', - 'version' => 'dev-develop', - 'aliases' => - array ( - ), - 'reference' => 'c8dd8c3806d92e19b5a67c16be9d64ceaa2e0524', - ), - 'combodo/tcpdf' => - array ( - 'pretty_version' => '6.3.5', - 'version' => '6.3.5.0', - 'aliases' => - array ( - ), - 'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94', - ), - 'nikic/php-parser' => - array ( - 'pretty_version' => 'v4.12.0', - 'version' => '4.12.0.0', - 'aliases' => - array ( - ), - 'reference' => '6608f01670c3cc5079e18c1dab1104e002579143', - ), - 'paragonie/random_compat' => - array ( - 'pretty_version' => 'v2.0.18', - 'version' => '2.0.18.0', - 'aliases' => - array ( - ), - 'reference' => '0a58ef6e3146256cc3dc7cc393927bcc7d1b72db', - ), - 'pear/archive_tar' => - array ( - 'pretty_version' => '1.4.13', - 'version' => '1.4.13.0', - 'aliases' => - array ( - ), - 'reference' => '19bb8e95490d3e3ad92fcac95500ca80bdcc7495', - ), - 'pear/console_getopt' => - array ( - 'pretty_version' => 'v1.4.3', - 'version' => '1.4.3.0', - 'aliases' => - array ( - ), - 'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0', - ), - 'pear/pear-core-minimal' => - array ( - 'pretty_version' => 'v1.10.10', - 'version' => '1.10.10.0', - 'aliases' => - array ( - ), - 'reference' => '625a3c429d9b2c1546438679074cac1b089116a7', - ), - 'pear/pear_exception' => - array ( - 'pretty_version' => 'v1.0.2', - 'version' => '1.0.2.0', - 'aliases' => - array ( - ), - 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', - ), - 'pelago/emogrifier' => - array ( - 'pretty_version' => 'v2.1.0', - 'version' => '2.1.0.0', - 'aliases' => - array ( - ), - 'reference' => '40c3d4f475d44ffc7265a760d1dd0e81f579f96f', - ), - 'psr/cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8', - ), - 'psr/cache-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/container' => - array ( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f', - ), - 'psr/container-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/log' => - array ( - 'pretty_version' => '1.1.2', - 'version' => '1.1.2.0', - 'aliases' => - array ( - ), - 'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801', - ), - 'psr/log-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/simple-cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b', - ), - 'psr/simple-cache-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'rsky/pear-core-min' => - array ( - 'replaced' => - array ( - 0 => 'v1.10.10', - ), - ), - 'scssphp/scssphp' => - array ( - 'pretty_version' => '1.0.6', - 'version' => '1.0.6.0', - 'aliases' => - array ( - ), - 'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c', - ), - 'swiftmailer/swiftmailer' => - array ( - 'pretty_version' => 'v5.4.12', - 'version' => '5.4.12.0', - 'aliases' => - array ( - ), - 'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950', - ), - 'symfony/cache' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3', - ), - 'symfony/class-loader' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'e212b06996819a2bce026a63da03b7182d05a690', - ), - 'symfony/config' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'a599a867d0e4a07c342b5f1e656b3915a540ddbe', - ), - 'symfony/console' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '1ee23b3b659b06c622f2bd2492a229e416eb4586', - ), - 'symfony/css-selector' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f819f71ae3ba6f396b4c015bd5895de7d2f1f85f', - ), - 'symfony/debug' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f72e33fdb1170b326e72c3157f0cd456351dd086', - ), - 'symfony/dependency-injection' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '0d201916bfb3af939fec3c0c8815ea16c60ac1a2', - ), - 'symfony/dotenv' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'c7e8e471fea74e868ae797970b383dea89ae548a', - ), - 'symfony/event-dispatcher' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f9031c22ec127d4a2450760f81a8677fe8a10177', - ), - 'symfony/filesystem' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '00cdad0936d06fab136944bc2342b762b1c3a4a2', - ), - 'symfony/finder' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '290ae21279b37bfd287cdcce640d51204e84afdf', - ), - 'symfony/framework-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '0d61117c7a770da0bd8bbe7ccfa34d8063f272ea', - ), - 'symfony/http-foundation' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'd2d0cfe8e319d9df44c4cca570710fcf221d4593', - ), - 'symfony/http-kernel' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'c42c8339acb28cfff0fb1786948db4d23d609ff7', - ), - 'symfony/polyfill-apcu' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'a8e961c841b9ec52927a87914f8820a1ad8f8116', - ), - 'symfony/polyfill-ctype' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'f8f0b461be3385e56d6de3dbb5a0df24c0c275e3', - ), - 'symfony/polyfill-mbstring' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '7b4aab9743c30be783b73de055d24a39cf4b954f', - ), - 'symfony/polyfill-php56' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '53dd1cdf3cb986893ccf2b96665b25b3abb384f4', - ), - 'symfony/polyfill-php70' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'af23c7bb26a73b850840823662dda371484926c4', - ), - 'symfony/polyfill-util' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '964a67f293b66b95883a5ed918a65354fcd2258f', - ), - 'symfony/routing' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'b689ccd48e234ea404806d94b07eeb45f9f6f06a', - ), - 'symfony/stopwatch' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'efe0af281ad336bc3b10375c88b117499f1d8494', - ), - 'symfony/twig-bridge' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '49b824ddc7f2d250a1f172349cd9a111d63287c0', - ), - 'symfony/twig-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'd39ed8f5df62aeeeb27a6f3bf7f58a6c02a58ea9', - ), - 'symfony/var-dumper' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '569e261461600810845a8305ca3f64abd3e712c0', - ), - 'symfony/web-profiler-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '3ae27cf1b2776cd68aa15fdb57089970f78bcf11', - ), - 'symfony/yaml' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'dab657db15207879217fc81df4f875947bf68804', - ), - 'tecnickcom/tcpdf' => - array ( - 'replaced' => - array ( - 0 => '6.3.5', - ), - ), - 'twig/twig' => - array ( - 'pretty_version' => 'v1.42.4', - 'version' => '1.42.4.0', - 'aliases' => - array ( - ), - 'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152', - ), - ), -); -private static $canGetVendors; -private static $installedByVendor = array(); + private static $installed; + private static $canGetVendors; + private static $installedByVendor = array(); + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + if (1 === \count($packages)) { + return $packages[0]; + } + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + return $packagesByType; + } -public static function getInstalledPackages() -{ -$packages = array(); -foreach (self::getInstalled() as $installed) { -$packages[] = array_keys($installed['versions']); -} - -if (1 === \count($packages)) { -return $packages[0]; -} - -return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); -} - - - - - - - - - -public static function isInstalled($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (isset($installed['versions'][$packageName])) { -return true; -} -} - -return false; -} - - - - - - - - - - - - - - -public static function satisfies(VersionParser $parser, $packageName, $constraint) -{ -$constraint = $parser->parseConstraints($constraint); -$provided = $parser->parseConstraints(self::getVersionRanges($packageName)); - -return $provided->matches($constraint); -} - - - - - - - - - - -public static function getVersionRanges($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -$ranges = array(); -if (isset($installed['versions'][$packageName]['pretty_version'])) { -$ranges[] = $installed['versions'][$packageName]['pretty_version']; -} -if (array_key_exists('aliases', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); -} -if (array_key_exists('replaced', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); -} -if (array_key_exists('provided', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); -} - -return implode(' || ', $ranges); -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getVersion($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['version'])) { -return null; -} - -return $installed['versions'][$packageName]['version']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getPrettyVersion($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['pretty_version'])) { -return null; -} - -return $installed['versions'][$packageName]['pretty_version']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getReference($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['reference'])) { -return null; -} - -return $installed['versions'][$packageName]['reference']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getRootPackage() -{ -$installed = self::getInstalled(); - -return $installed[0]['root']; -} - - - - - - - -public static function getRawData() -{ -return self::$installed; -} - - - - - - - - - - - - - - - - - - - -public static function reload($data) -{ -self::$installed = $data; -self::$installedByVendor = array(); -} - - - - - -private static function getInstalled() -{ -if (null === self::$canGetVendors) { -self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); -} - -$installed = array(); - -if (self::$canGetVendors) { -foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { -if (isset(self::$installedByVendor[$vendorDir])) { -$installed[] = self::$installedByVendor[$vendorDir]; -} elseif (is_file($vendorDir.'/composer/installed.php')) { -$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; -} -} -} - -$installed[] = self::$installed; - -return $installed; -} + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints($constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + + if (self::$canGetVendors) { + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $installed[count($installed) - 1]; + } + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = require __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + $installed[] = self::$installed; + + return $installed; + } } diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 228ab4e03..cc609d0f7 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -36,7 +36,6 @@ return array( 'AttributeBoolean' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeCaseLog' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeClass' => $baseDir . '/core/attributedef.class.inc.php', - 'AttributeClassAttCodeSet' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeClassState' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeCustomFields' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeDBField' => $baseDir . '/core/attributedef.class.inc.php', @@ -51,7 +50,6 @@ return array( 'AttributeEmailAddress' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeEncryptedString' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeEnum' => $baseDir . '/core/attributedef.class.inc.php', - 'AttributeEnumSet' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeExternalField' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeExternalKey' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeFinalClass' => $baseDir . '/core/attributedef.class.inc.php', @@ -74,14 +72,12 @@ return array( 'AttributePercentage' => $baseDir . '/core/attributedef.class.inc.php', 'AttributePhoneNumber' => $baseDir . '/core/attributedef.class.inc.php', 'AttributePropertySet' => $baseDir . '/core/attributedef.class.inc.php', - 'AttributeQueryAttCodeSet' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeRedundancySettings' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeSet' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeStopWatch' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeString' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeSubItem' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeTable' => $baseDir . '/core/attributedef.class.inc.php', - 'AttributeTagSet' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeTemplateHTML' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeTemplateString' => $baseDir . '/core/attributedef.class.inc.php', 'AttributeTemplateText' => $baseDir . '/core/attributedef.class.inc.php', @@ -388,17 +384,9 @@ return array( 'DashboardMenuNode' => $baseDir . '/application/menunode.class.inc.php', 'Dashlet' => $baseDir . '/application/dashlet.class.inc.php', 'DashletBadge' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletEmptyCell' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletGroupBy' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletGroupByBars' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletGroupByPie' => $baseDir . '/application/dashlet.class.inc.php', 'DashletGroupByTable' => $baseDir . '/application/dashlet.class.inc.php', 'DashletHeaderDynamic' => $baseDir . '/application/dashlet.class.inc.php', 'DashletHeaderStatic' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletObjectList' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletPlainText' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletProxy' => $baseDir . '/application/dashlet.class.inc.php', - 'DashletUnknown' => $baseDir . '/application/dashlet.class.inc.php', 'DataTable' => $baseDir . '/application/datatable.class.inc.php', 'DataTableConfig' => $baseDir . '/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => $vendorDir . '/combodo/tcpdf/include/barcodes/datamatrix.php', @@ -410,21 +398,9 @@ return array( 'DeleteException' => $baseDir . '/application/exceptions/DeleteException.php', 'DeletionPlan' => $baseDir . '/core/deletionplan.class.inc.php', 'DeprecatedCallsLog' => $baseDir . '/core/log.class.inc.php', - 'DesignerBooleanField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerComboField' => $baseDir . '/application/forms.class.inc.php', 'DesignerForm' => $baseDir . '/application/forms.class.inc.php', - 'DesignerFormField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerFormSelectorField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerHiddenField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerIconSelectionField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerIntegerField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerLabelField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerLongTextField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerSortableField' => $baseDir . '/application/forms.class.inc.php', 'DesignerStaticTextField' => $baseDir . '/application/forms.class.inc.php', 'DesignerSubFormField' => $baseDir . '/application/forms.class.inc.php', - 'DesignerTabularForm' => $baseDir . '/application/forms.class.inc.php', - 'DesignerTextField' => $baseDir . '/application/forms.class.inc.php', 'Dict' => $baseDir . '/core/dict.class.inc.php', 'DictException' => $baseDir . '/application/exceptions/dict/DictException.php', 'DictExceptionMissingString' => $baseDir . '/application/exceptions/dict/DictExceptionMissingString.php', @@ -451,6 +427,7 @@ return array( 'EventWebService' => $baseDir . '/core/event.class.inc.php', 'ExcelBulkExport' => $baseDir . '/core/excelbulkexport.class.inc.php', 'ExcelExporter' => $baseDir . '/application/excelexporter.class.inc.php', + 'ExceptionLog' => $baseDir . '/core/log.class.inc.php', 'ExecAsyncTask' => $baseDir . '/core/asynctask.class.inc.php', 'ExecutionKPI' => $baseDir . '/core/kpi.class.inc.php', 'Expression' => $baseDir . '/core/oql/expression.class.inc.php', @@ -569,11 +546,13 @@ return array( 'Page' => $baseDir . '/sources/application/WebPage/Page.php', 'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', 'Pelago\\Emogrifier' => $vendorDir . '/pelago/emogrifier/src/Emogrifier.php', - 'Pelago\\Emogrifier\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/CssConcatenator.php', 'Pelago\\Emogrifier\\CssInliner' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/CssInliner.php', 'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php', 'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php', 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php', + 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php', + 'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php', + 'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php', 'PhpParser\\Builder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder.php', 'PhpParser\\BuilderFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php', 'PhpParser\\BuilderHelpers' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php', @@ -864,8 +843,6 @@ return array( 'RowStatus_Modify' => $baseDir . '/core/bulkchange.class.inc.php', 'RowStatus_NewObj' => $baseDir . '/core/bulkchange.class.inc.php', 'RowStatus_NoChange' => $baseDir . '/core/bulkchange.class.inc.php', - 'RunTimeIconSelectionField' => $baseDir . '/application/forms.class.inc.php', - 'RuntimeDashboard' => $baseDir . '/application/dashboard.class.inc.php', 'SQLExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'SQLObjectQuery' => $baseDir . '/core/sqlobjectquery.class.inc.php', 'SQLObjectQueryBuilder' => $baseDir . '/core/sqlobjectquerybuilder.class.inc.php', diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php index 4f1c7e5ca..12edd1dd2 100644 --- a/lib/composer/autoload_real.php +++ b/lib/composer/autoload_real.php @@ -22,10 +22,8 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b return self::$loader; } - require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); spl_autoload_unregister(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 5f86f7e85..4fc12c125 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -266,7 +266,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'AttributeBoolean' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeCaseLog' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeClass' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', - 'AttributeClassAttCodeSet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeClassState' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeCustomFields' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeDBField' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', @@ -281,7 +280,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'AttributeEmailAddress' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeEncryptedString' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeEnum' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', - 'AttributeEnumSet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeExternalField' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeExternalKey' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeFinalClass' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', @@ -304,14 +302,12 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'AttributePercentage' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributePhoneNumber' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributePropertySet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', - 'AttributeQueryAttCodeSet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeRedundancySettings' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeSet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeStopWatch' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeString' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeSubItem' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeTable' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', - 'AttributeTagSet' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeTemplateHTML' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeTemplateString' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', 'AttributeTemplateText' => __DIR__ . '/../..' . '/core/attributedef.class.inc.php', @@ -618,17 +614,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'DashboardMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php', 'Dashlet' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletBadge' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletEmptyCell' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletGroupBy' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletGroupByBars' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletGroupByPie' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletGroupByTable' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletHeaderDynamic' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletHeaderStatic' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletObjectList' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletPlainText' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletProxy' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', - 'DashletUnknown' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DataTable' => __DIR__ . '/../..' . '/application/datatable.class.inc.php', 'DataTableConfig' => __DIR__ . '/../..' . '/sources/application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/datamatrix.php', @@ -640,21 +628,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'DeleteException' => __DIR__ . '/../..' . '/application/exceptions/DeleteException.php', 'DeletionPlan' => __DIR__ . '/../..' . '/core/deletionplan.class.inc.php', 'DeprecatedCallsLog' => __DIR__ . '/../..' . '/core/log.class.inc.php', - 'DesignerBooleanField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerComboField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', 'DesignerForm' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerFormField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerFormSelectorField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerHiddenField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerIconSelectionField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerIntegerField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerLabelField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerLongTextField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerSortableField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', 'DesignerStaticTextField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', 'DesignerSubFormField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerTabularForm' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'DesignerTextField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', 'Dict' => __DIR__ . '/../..' . '/core/dict.class.inc.php', 'DictException' => __DIR__ . '/../..' . '/application/exceptions/dict/DictException.php', 'DictExceptionMissingString' => __DIR__ . '/../..' . '/application/exceptions/dict/DictExceptionMissingString.php', @@ -681,6 +657,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'EventWebService' => __DIR__ . '/../..' . '/core/event.class.inc.php', 'ExcelBulkExport' => __DIR__ . '/../..' . '/core/excelbulkexport.class.inc.php', 'ExcelExporter' => __DIR__ . '/../..' . '/application/excelexporter.class.inc.php', + 'ExceptionLog' => __DIR__ . '/../..' . '/core/log.class.inc.php', 'ExecAsyncTask' => __DIR__ . '/../..' . '/core/asynctask.class.inc.php', 'ExecutionKPI' => __DIR__ . '/../..' . '/core/kpi.class.inc.php', 'Expression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', @@ -799,11 +776,13 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Page' => __DIR__ . '/../..' . '/sources/application/WebPage/Page.php', 'ParseError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', 'Pelago\\Emogrifier' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier.php', - 'Pelago\\Emogrifier\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/CssConcatenator.php', 'Pelago\\Emogrifier\\CssInliner' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/CssInliner.php', 'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php', 'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php', 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php', + 'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php', + 'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php', + 'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php', 'PhpParser\\Builder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder.php', 'PhpParser\\BuilderFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php', 'PhpParser\\BuilderHelpers' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php', @@ -1094,8 +1073,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'RowStatus_Modify' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', 'RowStatus_NewObj' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', 'RowStatus_NoChange' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php', - 'RunTimeIconSelectionField' => __DIR__ . '/../..' . '/application/forms.class.inc.php', - 'RuntimeDashboard' => __DIR__ . '/../..' . '/application/dashboard.class.inc.php', 'SQLExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'SQLObjectQuery' => __DIR__ . '/../..' . '/core/sqlobjectquery.class.inc.php', 'SQLObjectQueryBuilder' => __DIR__ . '/../..' . '/core/sqlobjectquerybuilder.class.inc.php', diff --git a/lib/composer/installed.json b/lib/composer/installed.json index 77b2b3667..919ad6609 100644 --- a/lib/composer/installed.json +++ b/lib/composer/installed.json @@ -418,36 +418,36 @@ }, { "name": "pelago/emogrifier", - "version": "v2.1.0", - "version_normalized": "2.1.0.0", + "version": "v3.1.0", + "version_normalized": "3.1.0.0", "source": { "type": "git", "url": "https://github.com/MyIntervals/emogrifier.git", - "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f" + "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/40c3d4f475d44ffc7265a760d1dd0e81f579f96f", - "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f", + "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8", + "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", - "symfony/css-selector": "^3.4.0 || ^4.0.0" + "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4", + "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.2.0", - "phpmd/phpmd": "^2.6.0", - "phpunit/phpunit": "^4.8.0", - "squizlabs/php_codesniffer": "^3.3.2" + "friendsofphp/php-cs-fixer": "^2.15.3", + "phpmd/phpmd": "^2.7.0", + "phpunit/phpunit": "^5.7.27", + "squizlabs/php_codesniffer": "^3.5.0" }, - "time": "2018-12-08T13:55:46+00:00", + "time": "2019-12-26T19:37:31+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "4.0.x-dev" } }, "installation-source": "dist", @@ -461,16 +461,6 @@ "MIT" ], "authors": [ - { - "name": "John Reeve", - "email": "jreeve@pelagodesign.com" - }, - { - "name": "Cameron Brooks" - }, - { - "name": "Jaime Prado" - }, { "name": "Oliver Klee", "email": "github@oliverklee.de" @@ -479,9 +469,19 @@ "name": "Zoli Szabó", "email": "zoli.szabo+github@gmail.com" }, + { + "name": "John Reeve", + "email": "jreeve@pelagodesign.com" + }, { "name": "Jake Hotson", "email": "jake@qzdesign.co.uk" + }, + { + "name": "Cameron Brooks" + }, + { + "name": "Jaime Prado" } ], "description": "Converts CSS styles into inline style attributes in your HTML code", @@ -491,6 +491,10 @@ "email", "pre-processing" ], + "support": { + "issues": "https://github.com/MyIntervals/emogrifier/issues", + "source": "https://github.com/MyIntervals/emogrifier" + }, "install-path": "../pelago/emogrifier" }, { diff --git a/lib/composer/installed.php b/lib/composer/installed.php index 22fdb170c..b30535f21 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -1,444 +1,437 @@ - - array ( - 'pretty_version' => 'dev-develop', - 'version' => 'dev-develop', - 'aliases' => - array ( + array( + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', + 'type' => 'project', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'reference' => 'd9ccac3aeaa3cb91f0e1b78b091f496b7c689166', + 'name' => '__root__', + 'dev' => true, ), - 'reference' => 'c8dd8c3806d92e19b5a67c16be9d64ceaa2e0524', - 'name' => '__root__', - ), - 'versions' => - array ( - '__root__' => - array ( - 'pretty_version' => 'dev-develop', - 'version' => 'dev-develop', - 'aliases' => - array ( - ), - 'reference' => 'c8dd8c3806d92e19b5a67c16be9d64ceaa2e0524', + 'versions' => array( + '__root__' => array( + 'pretty_version' => 'dev-develop', + 'version' => 'dev-develop', + 'type' => 'project', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'reference' => 'd9ccac3aeaa3cb91f0e1b78b091f496b7c689166', + 'dev_requirement' => false, + ), + 'combodo/tcpdf' => array( + 'pretty_version' => '6.3.5', + 'version' => '6.3.5.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../combodo/tcpdf', + 'aliases' => array(), + 'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94', + 'dev_requirement' => false, + ), + 'nikic/php-parser' => array( + 'pretty_version' => 'v4.12.0', + 'version' => '4.12.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../nikic/php-parser', + 'aliases' => array(), + 'reference' => '6608f01670c3cc5079e18c1dab1104e002579143', + 'dev_requirement' => false, + ), + 'paragonie/random_compat' => array( + 'pretty_version' => 'v2.0.18', + 'version' => '2.0.18.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../paragonie/random_compat', + 'aliases' => array(), + 'reference' => '0a58ef6e3146256cc3dc7cc393927bcc7d1b72db', + 'dev_requirement' => false, + ), + 'pear/archive_tar' => array( + 'pretty_version' => '1.4.13', + 'version' => '1.4.13.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pear/archive_tar', + 'aliases' => array(), + 'reference' => '19bb8e95490d3e3ad92fcac95500ca80bdcc7495', + 'dev_requirement' => false, + ), + 'pear/console_getopt' => array( + 'pretty_version' => 'v1.4.3', + 'version' => '1.4.3.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pear/console_getopt', + 'aliases' => array(), + 'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0', + 'dev_requirement' => false, + ), + 'pear/pear-core-minimal' => array( + 'pretty_version' => 'v1.10.10', + 'version' => '1.10.10.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pear/pear-core-minimal', + 'aliases' => array(), + 'reference' => '625a3c429d9b2c1546438679074cac1b089116a7', + 'dev_requirement' => false, + ), + 'pear/pear_exception' => array( + 'pretty_version' => 'v1.0.2', + 'version' => '1.0.2.0', + 'type' => 'class', + 'install_path' => __DIR__ . '/../pear/pear_exception', + 'aliases' => array(), + 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', + 'dev_requirement' => false, + ), + 'pelago/emogrifier' => array( + 'pretty_version' => 'v3.1.0', + 'version' => '3.1.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pelago/emogrifier', + 'aliases' => array(), + 'reference' => 'f6a5c7d44612d86c3901c93f1592f5440e6b2cd8', + 'dev_requirement' => false, + ), + 'psr/cache' => array( + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/cache', + 'aliases' => array(), + 'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8', + 'dev_requirement' => false, + ), + 'psr/cache-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'psr/container' => array( + 'pretty_version' => '1.0.0', + 'version' => '1.0.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/container', + 'aliases' => array(), + 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f', + 'dev_requirement' => false, + ), + 'psr/container-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'psr/log' => array( + 'pretty_version' => '1.1.2', + 'version' => '1.1.2.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/log', + 'aliases' => array(), + 'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801', + 'dev_requirement' => false, + ), + 'psr/log-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'psr/simple-cache' => array( + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/simple-cache', + 'aliases' => array(), + 'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b', + 'dev_requirement' => false, + ), + 'psr/simple-cache-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'rsky/pear-core-min' => array( + 'dev_requirement' => false, + 'replaced' => array( + 0 => 'v1.10.10', + ), + ), + 'scssphp/scssphp' => array( + 'pretty_version' => '1.0.6', + 'version' => '1.0.6.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../scssphp/scssphp', + 'aliases' => array(), + 'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c', + 'dev_requirement' => false, + ), + 'swiftmailer/swiftmailer' => array( + 'pretty_version' => 'v5.4.12', + 'version' => '5.4.12.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../swiftmailer/swiftmailer', + 'aliases' => array(), + 'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950', + 'dev_requirement' => false, + ), + 'symfony/cache' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/cache', + 'aliases' => array(), + 'reference' => '3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3', + 'dev_requirement' => false, + ), + 'symfony/class-loader' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/class-loader', + 'aliases' => array(), + 'reference' => 'e212b06996819a2bce026a63da03b7182d05a690', + 'dev_requirement' => false, + ), + 'symfony/config' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/config', + 'aliases' => array(), + 'reference' => 'a599a867d0e4a07c342b5f1e656b3915a540ddbe', + 'dev_requirement' => false, + ), + 'symfony/console' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/console', + 'aliases' => array(), + 'reference' => '1ee23b3b659b06c622f2bd2492a229e416eb4586', + 'dev_requirement' => false, + ), + 'symfony/css-selector' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/css-selector', + 'aliases' => array(), + 'reference' => 'f819f71ae3ba6f396b4c015bd5895de7d2f1f85f', + 'dev_requirement' => false, + ), + 'symfony/debug' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/debug', + 'aliases' => array(), + 'reference' => 'f72e33fdb1170b326e72c3157f0cd456351dd086', + 'dev_requirement' => false, + ), + 'symfony/dependency-injection' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/dependency-injection', + 'aliases' => array(), + 'reference' => '0d201916bfb3af939fec3c0c8815ea16c60ac1a2', + 'dev_requirement' => false, + ), + 'symfony/dotenv' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/dotenv', + 'aliases' => array(), + 'reference' => 'c7e8e471fea74e868ae797970b383dea89ae548a', + 'dev_requirement' => false, + ), + 'symfony/event-dispatcher' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/event-dispatcher', + 'aliases' => array(), + 'reference' => 'f9031c22ec127d4a2450760f81a8677fe8a10177', + 'dev_requirement' => false, + ), + 'symfony/filesystem' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/filesystem', + 'aliases' => array(), + 'reference' => '00cdad0936d06fab136944bc2342b762b1c3a4a2', + 'dev_requirement' => false, + ), + 'symfony/finder' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/finder', + 'aliases' => array(), + 'reference' => '290ae21279b37bfd287cdcce640d51204e84afdf', + 'dev_requirement' => false, + ), + 'symfony/framework-bundle' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'symfony-bundle', + 'install_path' => __DIR__ . '/../symfony/framework-bundle', + 'aliases' => array(), + 'reference' => '0d61117c7a770da0bd8bbe7ccfa34d8063f272ea', + 'dev_requirement' => false, + ), + 'symfony/http-foundation' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/http-foundation', + 'aliases' => array(), + 'reference' => 'd2d0cfe8e319d9df44c4cca570710fcf221d4593', + 'dev_requirement' => false, + ), + 'symfony/http-kernel' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/http-kernel', + 'aliases' => array(), + 'reference' => 'c42c8339acb28cfff0fb1786948db4d23d609ff7', + 'dev_requirement' => false, + ), + 'symfony/polyfill-apcu' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-apcu', + 'aliases' => array(), + 'reference' => 'a8e961c841b9ec52927a87914f8820a1ad8f8116', + 'dev_requirement' => false, + ), + 'symfony/polyfill-ctype' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-ctype', + 'aliases' => array(), + 'reference' => 'f8f0b461be3385e56d6de3dbb5a0df24c0c275e3', + 'dev_requirement' => false, + ), + 'symfony/polyfill-mbstring' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', + 'aliases' => array(), + 'reference' => '7b4aab9743c30be783b73de055d24a39cf4b954f', + 'dev_requirement' => false, + ), + 'symfony/polyfill-php56' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-php56', + 'aliases' => array(), + 'reference' => '53dd1cdf3cb986893ccf2b96665b25b3abb384f4', + 'dev_requirement' => false, + ), + 'symfony/polyfill-php70' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-php70', + 'aliases' => array(), + 'reference' => 'af23c7bb26a73b850840823662dda371484926c4', + 'dev_requirement' => false, + ), + 'symfony/polyfill-util' => array( + 'pretty_version' => 'v1.13.1', + 'version' => '1.13.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-util', + 'aliases' => array(), + 'reference' => '964a67f293b66b95883a5ed918a65354fcd2258f', + 'dev_requirement' => false, + ), + 'symfony/routing' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/routing', + 'aliases' => array(), + 'reference' => 'b689ccd48e234ea404806d94b07eeb45f9f6f06a', + 'dev_requirement' => false, + ), + 'symfony/stopwatch' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/stopwatch', + 'aliases' => array(), + 'reference' => 'efe0af281ad336bc3b10375c88b117499f1d8494', + 'dev_requirement' => true, + ), + 'symfony/twig-bridge' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'symfony-bridge', + 'install_path' => __DIR__ . '/../symfony/twig-bridge', + 'aliases' => array(), + 'reference' => '49b824ddc7f2d250a1f172349cd9a111d63287c0', + 'dev_requirement' => false, + ), + 'symfony/twig-bundle' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'symfony-bundle', + 'install_path' => __DIR__ . '/../symfony/twig-bundle', + 'aliases' => array(), + 'reference' => 'd39ed8f5df62aeeeb27a6f3bf7f58a6c02a58ea9', + 'dev_requirement' => false, + ), + 'symfony/var-dumper' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/var-dumper', + 'aliases' => array(), + 'reference' => '569e261461600810845a8305ca3f64abd3e712c0', + 'dev_requirement' => true, + ), + 'symfony/web-profiler-bundle' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'symfony-bundle', + 'install_path' => __DIR__ . '/../symfony/web-profiler-bundle', + 'aliases' => array(), + 'reference' => '3ae27cf1b2776cd68aa15fdb57089970f78bcf11', + 'dev_requirement' => true, + ), + 'symfony/yaml' => array( + 'pretty_version' => 'v3.4.36', + 'version' => '3.4.36.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/yaml', + 'aliases' => array(), + 'reference' => 'dab657db15207879217fc81df4f875947bf68804', + 'dev_requirement' => false, + ), + 'tecnickcom/tcpdf' => array( + 'dev_requirement' => false, + 'replaced' => array( + 0 => '6.3.5', + ), + ), + 'twig/twig' => array( + 'pretty_version' => 'v1.42.4', + 'version' => '1.42.4.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../twig/twig', + 'aliases' => array(), + 'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152', + 'dev_requirement' => false, + ), ), - 'combodo/tcpdf' => - array ( - 'pretty_version' => '6.3.5', - 'version' => '6.3.5.0', - 'aliases' => - array ( - ), - 'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94', - ), - 'nikic/php-parser' => - array ( - 'pretty_version' => 'v4.12.0', - 'version' => '4.12.0.0', - 'aliases' => - array ( - ), - 'reference' => '6608f01670c3cc5079e18c1dab1104e002579143', - ), - 'paragonie/random_compat' => - array ( - 'pretty_version' => 'v2.0.18', - 'version' => '2.0.18.0', - 'aliases' => - array ( - ), - 'reference' => '0a58ef6e3146256cc3dc7cc393927bcc7d1b72db', - ), - 'pear/archive_tar' => - array ( - 'pretty_version' => '1.4.13', - 'version' => '1.4.13.0', - 'aliases' => - array ( - ), - 'reference' => '19bb8e95490d3e3ad92fcac95500ca80bdcc7495', - ), - 'pear/console_getopt' => - array ( - 'pretty_version' => 'v1.4.3', - 'version' => '1.4.3.0', - 'aliases' => - array ( - ), - 'reference' => 'a41f8d3e668987609178c7c4a9fe48fecac53fa0', - ), - 'pear/pear-core-minimal' => - array ( - 'pretty_version' => 'v1.10.10', - 'version' => '1.10.10.0', - 'aliases' => - array ( - ), - 'reference' => '625a3c429d9b2c1546438679074cac1b089116a7', - ), - 'pear/pear_exception' => - array ( - 'pretty_version' => 'v1.0.2', - 'version' => '1.0.2.0', - 'aliases' => - array ( - ), - 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', - ), - 'pelago/emogrifier' => - array ( - 'pretty_version' => 'v2.1.0', - 'version' => '2.1.0.0', - 'aliases' => - array ( - ), - 'reference' => '40c3d4f475d44ffc7265a760d1dd0e81f579f96f', - ), - 'psr/cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8', - ), - 'psr/cache-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/container' => - array ( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f', - ), - 'psr/container-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/log' => - array ( - 'pretty_version' => '1.1.2', - 'version' => '1.1.2.0', - 'aliases' => - array ( - ), - 'reference' => '446d54b4cb6bf489fc9d75f55843658e6f25d801', - ), - 'psr/log-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/simple-cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b', - ), - 'psr/simple-cache-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'rsky/pear-core-min' => - array ( - 'replaced' => - array ( - 0 => 'v1.10.10', - ), - ), - 'scssphp/scssphp' => - array ( - 'pretty_version' => '1.0.6', - 'version' => '1.0.6.0', - 'aliases' => - array ( - ), - 'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c', - ), - 'swiftmailer/swiftmailer' => - array ( - 'pretty_version' => 'v5.4.12', - 'version' => '5.4.12.0', - 'aliases' => - array ( - ), - 'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950', - ), - 'symfony/cache' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3', - ), - 'symfony/class-loader' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'e212b06996819a2bce026a63da03b7182d05a690', - ), - 'symfony/config' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'a599a867d0e4a07c342b5f1e656b3915a540ddbe', - ), - 'symfony/console' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '1ee23b3b659b06c622f2bd2492a229e416eb4586', - ), - 'symfony/css-selector' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f819f71ae3ba6f396b4c015bd5895de7d2f1f85f', - ), - 'symfony/debug' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f72e33fdb1170b326e72c3157f0cd456351dd086', - ), - 'symfony/dependency-injection' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '0d201916bfb3af939fec3c0c8815ea16c60ac1a2', - ), - 'symfony/dotenv' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'c7e8e471fea74e868ae797970b383dea89ae548a', - ), - 'symfony/event-dispatcher' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'f9031c22ec127d4a2450760f81a8677fe8a10177', - ), - 'symfony/filesystem' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '00cdad0936d06fab136944bc2342b762b1c3a4a2', - ), - 'symfony/finder' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '290ae21279b37bfd287cdcce640d51204e84afdf', - ), - 'symfony/framework-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '0d61117c7a770da0bd8bbe7ccfa34d8063f272ea', - ), - 'symfony/http-foundation' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'd2d0cfe8e319d9df44c4cca570710fcf221d4593', - ), - 'symfony/http-kernel' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'c42c8339acb28cfff0fb1786948db4d23d609ff7', - ), - 'symfony/polyfill-apcu' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'a8e961c841b9ec52927a87914f8820a1ad8f8116', - ), - 'symfony/polyfill-ctype' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'f8f0b461be3385e56d6de3dbb5a0df24c0c275e3', - ), - 'symfony/polyfill-mbstring' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '7b4aab9743c30be783b73de055d24a39cf4b954f', - ), - 'symfony/polyfill-php56' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '53dd1cdf3cb986893ccf2b96665b25b3abb384f4', - ), - 'symfony/polyfill-php70' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => 'af23c7bb26a73b850840823662dda371484926c4', - ), - 'symfony/polyfill-util' => - array ( - 'pretty_version' => 'v1.13.1', - 'version' => '1.13.1.0', - 'aliases' => - array ( - ), - 'reference' => '964a67f293b66b95883a5ed918a65354fcd2258f', - ), - 'symfony/routing' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'b689ccd48e234ea404806d94b07eeb45f9f6f06a', - ), - 'symfony/stopwatch' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'efe0af281ad336bc3b10375c88b117499f1d8494', - ), - 'symfony/twig-bridge' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '49b824ddc7f2d250a1f172349cd9a111d63287c0', - ), - 'symfony/twig-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'd39ed8f5df62aeeeb27a6f3bf7f58a6c02a58ea9', - ), - 'symfony/var-dumper' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '569e261461600810845a8305ca3f64abd3e712c0', - ), - 'symfony/web-profiler-bundle' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => '3ae27cf1b2776cd68aa15fdb57089970f78bcf11', - ), - 'symfony/yaml' => - array ( - 'pretty_version' => 'v3.4.36', - 'version' => '3.4.36.0', - 'aliases' => - array ( - ), - 'reference' => 'dab657db15207879217fc81df4f875947bf68804', - ), - 'tecnickcom/tcpdf' => - array ( - 'replaced' => - array ( - 0 => '6.3.5', - ), - ), - 'twig/twig' => - array ( - 'pretty_version' => 'v1.42.4', - 'version' => '1.42.4.0', - 'aliases' => - array ( - ), - 'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152', - ), - ), ); diff --git a/lib/composer/platform_check.php b/lib/composer/platform_check.php deleted file mode 100644 index cd1bd2c5b..000000000 --- a/lib/composer/platform_check.php +++ /dev/null @@ -1,26 +0,0 @@ -= 70103)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.3". You are running ' . PHP_VERSION . '.'; -} - -if ($issues) { - if (!headers_sent()) { - header('HTTP/1.1 500 Internal Server Error'); - } - if (!ini_get('display_errors')) { - if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { - fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); - } elseif (!headers_sent()) { - echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; - } - } - trigger_error( - 'Composer detected issues in your platform: ' . implode(' ', $issues), - E_USER_ERROR - ); -} diff --git a/lib/pelago/emogrifier/.gitignore b/lib/pelago/emogrifier/.gitignore deleted file mode 100644 index 8bfbb851e..000000000 --- a/lib/pelago/emogrifier/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -######################### -# global ignore file -######################## -# ignoring temporary files (left by e.g. vim) -# ignoring by common IDE's used directories/files -# dont ignore .rej and .orig as we want to see/clean files after conflict resolution -# -# for local exclude patterns please edit .git/info/exclude -# -*~ -*.bak -*.idea -*.project -*.swp -.buildpath -.cache -.project -.session -.settings -.TemporaryItems -.webprj -nbproject -/.php_cs.cache -/vendor/ -composer.lock diff --git a/lib/pelago/emogrifier/.travis.yml b/lib/pelago/emogrifier/.travis.yml deleted file mode 100644 index f3a6c22ea..000000000 --- a/lib/pelago/emogrifier/.travis.yml +++ /dev/null @@ -1,65 +0,0 @@ -sudo: false - -language: php - -php: -- 5.5 -- 5.6 -- 7.0 -- 7.1 -- 7.2 -- 7.3 - -cache: - directories: - - vendor - - $HOME/.composer/cache - -env: - matrix: - - DEPENDENCIES_PREFERENCE="--prefer-lowest" - - DEPENDENCIES_PREFERENCE="" - -before_install: -- phpenv config-rm xdebug.ini || echo "xdebug not available" - -install: -- > - export IGNORE_PLATFORM_REQS="$(composer php:version |grep -q '^7.3' && printf -- --ignore-platform-reqs)"; - echo; - echo "Updating the dependencies"; - composer update $IGNORE_PLATFORM_REQS --with-dependencies $DEPENDENCIES_PREFERENCE; - composer show; - -script: -- > - echo; - echo "Validating the composer.json"; - composer validate --no-check-all --no-check-lock --strict; - -- > - echo; - echo "Linting all PHP files"; - composer ci:php:lint; - -- > - echo; - echo "Running the unit tests"; - composer ci:tests:unit; - -- > - echo; - echo "Running PHPMD"; - composer ci:php:md; - -- > - echo; - function version_gte() { test "$(printf '%s\n' "$@" | sort -n -t. -r | head -n 1)" = "$1"; }; - if version_gte $(composer php:version) 7; then - echo "Installing slevomat/coding-standard only for PHP 7.x"; - composer require $IGNORE_PLATFORM_REQS --dev slevomat/coding-standard:^4.0 $DEPENDENCIES_PREFERENCE; - echo "Running PHP_CodeSniffer"; - composer ci:php:sniff; - else - echo "Skipped PHP_CodeSniffer due to insufficient PHP version: $(composer php:version)"; - fi; diff --git a/lib/pelago/emogrifier/CHANGELOG.md b/lib/pelago/emogrifier/CHANGELOG.md index 938e2b511..6ee477312 100644 --- a/lib/pelago/emogrifier/CHANGELOG.md +++ b/lib/pelago/emogrifier/CHANGELOG.md @@ -15,6 +15,200 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Fixed +## 3.1.0 + +### Added +- Add support for PHP 7.4 + ([#821](https://github.com/MyIntervals/emogrifier/pull/821), + [#829](https://github.com/MyIntervals/emogrifier/pull/829)) + +### Changed +- Upgrade to Symfony 5.0 + ([#822](https://github.com/MyIntervals/emogrifier/pull/820) + +## 3.0.0 + +### Added +- Test and document excluding entire subtree with `addExcludedSelector()` + ([#347](https://github.com/MyIntervals/emogrifier/issues/347), + [#768](https://github.com/MyIntervals/emogrifier/pull/768)) +- Test that rules with `:optional` or `:required` are copied to the `