Merge pull request #1642 from mailpoet/vendor-cleanup
Vendor cleanup [MAILPOET-1642]
This commit is contained in:
M. Shull
GitHub
@ -1,3 +1,4 @@
|
||||
**/vendor/**
|
||||
**/vendor-prefixed/**
|
||||
**/testBundles/**
|
||||
assets/js/src/newsletter_editor/tinymce/wplink/plugin.js
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -2,6 +2,7 @@
|
||||
TODO
|
||||
composer.phar
|
||||
/vendor
|
||||
/vendor-prefixed
|
||||
/vendor_backup
|
||||
tests/_output/*
|
||||
tests/_support/_generated/*
|
||||
@ -23,7 +24,6 @@ lang
|
||||
.mp_svn
|
||||
/nbproject/
|
||||
tests/_data/acceptanceGenerated.sql
|
||||
lib/Dependencies
|
||||
lib/DI/CachedContainer.php
|
||||
mozart/Dependencies
|
||||
mozart/Classes
|
||||
|
||||
@ -326,7 +326,7 @@ class RoboFile extends \Robo\Tasks {
|
||||
'./vendor/bin/phpcs '.
|
||||
'--standard=./tasks/code_sniffer/MailPoet '.
|
||||
'--runtime-set testVersion 5.6-7.2 '.
|
||||
'--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,./lib/Dependencies/*,'.
|
||||
'--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'.
|
||||
'./lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '.
|
||||
'lib/ '.
|
||||
$severityFlag
|
||||
|
||||
26
build.sh
26
build.sh
@ -30,6 +30,7 @@ echo '[BUILD] Building DI Container cache'
|
||||
# Production libraries.
|
||||
echo '[BUILD] Fetching production libraries'
|
||||
test -d vendor && rm -rf vendor
|
||||
test -d vendor-prefixed && rm -rf vendor-prefixed
|
||||
./composer.phar install --no-dev --prefer-dist --optimize-autoloader --no-scripts
|
||||
|
||||
echo '[BUILD] Fetching mozart managed production libraries'
|
||||
@ -41,6 +42,7 @@ cp -Rf lang $plugin_name
|
||||
cp -RfL assets $plugin_name
|
||||
cp -Rf lib $plugin_name
|
||||
cp -Rf vendor $plugin_name
|
||||
cp -Rf vendor-prefixed $plugin_name
|
||||
cp -Rf views $plugin_name
|
||||
rm -Rf $plugin_name/assets/css/src
|
||||
rm -Rf $plugin_name/assets/js/src
|
||||
@ -55,22 +57,28 @@ else
|
||||
findPreArgs=''
|
||||
findMidArgs=' -regextype posix-egrep '
|
||||
fi
|
||||
findDestinations="$plugin_name/vendor $plugin_name/vendor-prefixed"
|
||||
|
||||
echo '[BUILD] Removing obsolete files from vendor libraries'
|
||||
find $findPreArgs $plugin_name/vendor -type f $findMidArgs -iregex ".*\/*\.(markdown|md|txt)" -print0 | xargs -0 rm -f
|
||||
find $findPreArgs $plugin_name/vendor -type f $findMidArgs -iregex ".*\/(readme|license|version|changes|changelog)" -print0 | xargs -0 rm -f
|
||||
find $findPreArgs $plugin_name/vendor -type d $findMidArgs -iregex ".*\/(docs?|examples?|\.git)" -print0 | xargs -0 rm -rf
|
||||
find $findPreArgs $findDestinations -type f $findMidArgs -iregex ".*\/*\.(markdown|md|txt)" -print0 | xargs -0 rm -f
|
||||
find $findPreArgs $findDestinations -type f $findMidArgs -iregex ".*\/(readme|license|version|changes|changelog|composer\.json|composer\.lock|phpunit\.xml.*|doxyfile)" -print0 | xargs -0 rm -f
|
||||
find $findPreArgs $findDestinations -type f $findMidArgs -iregex ".*\/(\.editorconfig|\.git.*|\.travis.yml|\.php_cs.*)" -print0 | xargs -0 rm -f
|
||||
find $findPreArgs $findDestinations -type d $findMidArgs -iregex ".*\/(docs?|examples?|\.git)" -print0 | xargs -0 rm -rf
|
||||
|
||||
# Remove unit tests from 3rd party extensions
|
||||
echo '[BUILD] Removing unit tests from vendor libraries'
|
||||
rm -rf $plugin_name/vendor/twig/twig/test
|
||||
rm -rf $plugin_name/vendor/symfony/translation/Tests
|
||||
rm -rf $plugin_name/vendor/phpmailer/phpmailer/test
|
||||
rm -rf $plugin_name/vendor/soundasleep/html2text/tests
|
||||
rm -rf $plugin_name/vendor/mtdowling/cron-expression/tests
|
||||
rm -rf $plugin_name/vendor/swiftmailer/swiftmailer/tests
|
||||
rm -rf $plugin_name/vendor/cerdic/css-tidy/COPYING
|
||||
rm -rf $plugin_name/vendor/cerdic/css-tidy/NEWS
|
||||
rm -rf $plugin_name/vendor/cerdic/css-tidy/testing
|
||||
rm -rf $plugin_name/vendor/mtdowling/cron-expression/tests
|
||||
rm -rf $plugin_name/vendor/nesbot/Carbon/Laravel
|
||||
rm -rf $plugin_name/vendor/phpmailer/phpmailer/test
|
||||
rm -rf $plugin_name/vendor/psr/log/Psr/Log/Test
|
||||
rm -rf $plugin_name/vendor/sabberworm/php-css-parser/tests
|
||||
rm -rf $plugin_name/vendor/soundasleep/html2text/tests
|
||||
rm -rf $plugin_name/vendor/swiftmailer/swiftmailer/tests
|
||||
rm -rf $plugin_name/vendor/symfony/translation/Tests
|
||||
rm -rf $plugin_name/vendor/twig/twig/test
|
||||
|
||||
# Remove risky files from 3rd party extensions
|
||||
echo '[BUILD] Removing risky and demo files from vendor libraries'
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
"soundasleep/html2text": "dev-master",
|
||||
"sabberworm/php-css-parser": "^8.1",
|
||||
"symfony/polyfill-php72": "^1.9",
|
||||
"symfony/polyfill-mbstring": "^1.9",
|
||||
"sensiolabs/security-checker": "^5.0"
|
||||
"symfony/polyfill-mbstring": "^1.9"
|
||||
},
|
||||
"require-dev": {
|
||||
"codeception/aspect-mock": "2.0.1",
|
||||
@ -37,11 +36,13 @@
|
||||
"umpirsky/twig-gettext-extractor": "1.1.*",
|
||||
"kint-php/kint": "^3.0",
|
||||
"squizlabs/php_codesniffer": "^3.3",
|
||||
"phpcompatibility/php-compatibility": "^9.0"
|
||||
"phpcompatibility/php-compatibility": "^9.0",
|
||||
"sensiolabs/security-checker": "^5.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"MailPoet\\": "lib/",
|
||||
"MailPoetVendor\\": "vendor-prefixed/",
|
||||
"Sudzy\\": "lib/Util/Sudzy"
|
||||
}
|
||||
},
|
||||
|
||||
552
composer.lock
generated
552
composer.lock
generated
@ -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": "7e713c50c195e507fc3cd4053d434af0",
|
||||
"content-hash": "3b334a7805276f6f2f7763a53817f914",
|
||||
"packages": [
|
||||
{
|
||||
"name": "cerdic/css-tidy",
|
||||
@ -45,62 +45,6 @@
|
||||
"description": "CSSTidy is a CSS minifier",
|
||||
"time": "2018-09-29T12:26:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
"version": "1.1.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/ca-bundle.git",
|
||||
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
|
||||
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-openssl": "*",
|
||||
"ext-pcre": "*",
|
||||
"php": "^5.3.2 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
|
||||
"psr/log": "^1.0",
|
||||
"symfony/process": "^2.5 || ^3.0 || ^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Composer\\CaBundle\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jordi Boggiano",
|
||||
"email": "j.boggiano@seld.be",
|
||||
"homepage": "http://seld.be"
|
||||
}
|
||||
],
|
||||
"description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
|
||||
"keywords": [
|
||||
"cabundle",
|
||||
"cacert",
|
||||
"certificate",
|
||||
"ssl",
|
||||
"tls"
|
||||
],
|
||||
"time": "2018-10-18T06:09:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "j4mie/idiorm",
|
||||
"version": "v1.5.6",
|
||||
@ -325,53 +269,6 @@
|
||||
],
|
||||
"time": "2018-09-20T19:36:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
"version": "1.0.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/log.git",
|
||||
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
|
||||
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Log\\": "Psr/Log/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "http://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "Common interface for logging libraries",
|
||||
"homepage": "https://github.com/php-fig/log",
|
||||
"keywords": [
|
||||
"log",
|
||||
"psr",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2016-10-10T12:19:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sabberworm/php-css-parser",
|
||||
"version": "8.2.0",
|
||||
@ -416,52 +313,6 @@
|
||||
],
|
||||
"time": "2018-07-13T13:23:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensiolabs/security-checker",
|
||||
"version": "v5.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sensiolabs/security-checker.git",
|
||||
"reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9ea927417c949039a9cfb0d92af76fd1c538d9e9",
|
||||
"reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/ca-bundle": "^1.0",
|
||||
"php": ">=5.5.9",
|
||||
"symfony/console": "~2.7|~3.0|~4.0"
|
||||
},
|
||||
"bin": [
|
||||
"security-checker"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "5.0-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"SensioLabs\\Security\\": "SensioLabs/Security"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien.potencier@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A security checker for your composer.lock",
|
||||
"time": "2018-10-16T10:30:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "soundasleep/html2text",
|
||||
"version": "dev-master",
|
||||
@ -576,131 +427,6 @@
|
||||
},
|
||||
"time": "2018-07-09T16:02:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v3.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
|
||||
"reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"symfony/debug": "~2.8|~3.0|~4.0",
|
||||
"symfony/polyfill-mbstring": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<3.4",
|
||||
"symfony/process": "<3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"symfony/config": "~3.3|~4.0",
|
||||
"symfony/dependency-injection": "~3.4|~4.0",
|
||||
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
|
||||
"symfony/lock": "~3.4|~4.0",
|
||||
"symfony/process": "~3.3|~4.0"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log-implementation": "For using the console logger",
|
||||
"symfony/event-dispatcher": "",
|
||||
"symfony/lock": "",
|
||||
"symfony/process": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Console\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T16:33:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v3.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
"reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
|
||||
"reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/http-kernel": "~2.8|~3.0|~4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Debug\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T16:33:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.9.0",
|
||||
@ -1456,6 +1182,62 @@
|
||||
"description": "BDD assertion library for PHPUnit",
|
||||
"time": "2017-07-12T16:50:18+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
"version": "1.1.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/ca-bundle.git",
|
||||
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
|
||||
"reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-openssl": "*",
|
||||
"ext-pcre": "*",
|
||||
"php": "^5.3.2 || ^7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
|
||||
"psr/log": "^1.0",
|
||||
"symfony/process": "^2.5 || ^3.0 || ^4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Composer\\CaBundle\\": "src"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jordi Boggiano",
|
||||
"email": "j.boggiano@seld.be",
|
||||
"homepage": "http://seld.be"
|
||||
}
|
||||
],
|
||||
"description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
|
||||
"keywords": [
|
||||
"cabundle",
|
||||
"cacert",
|
||||
"certificate",
|
||||
"ssl",
|
||||
"tls"
|
||||
],
|
||||
"time": "2018-10-18T06:09:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/composer",
|
||||
"version": "1.7.2",
|
||||
@ -4613,6 +4395,53 @@
|
||||
],
|
||||
"time": "2016-08-06T14:39:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
"version": "1.0.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/log.git",
|
||||
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
|
||||
"reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Psr\\Log\\": "Psr/Log/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "PHP-FIG",
|
||||
"homepage": "http://www.php-fig.org/"
|
||||
}
|
||||
],
|
||||
"description": "Common interface for logging libraries",
|
||||
"homepage": "https://github.com/php-fig/log",
|
||||
"keywords": [
|
||||
"log",
|
||||
"psr",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2016-10-10T12:19:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "ramsey/array_column",
|
||||
"version": "1.1.3",
|
||||
@ -5313,6 +5142,52 @@
|
||||
],
|
||||
"time": "2015-10-13T18:44:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sensiolabs/security-checker",
|
||||
"version": "v5.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sensiolabs/security-checker.git",
|
||||
"reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9ea927417c949039a9cfb0d92af76fd1c538d9e9",
|
||||
"reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/ca-bundle": "^1.0",
|
||||
"php": ">=5.5.9",
|
||||
"symfony/console": "~2.7|~3.0|~4.0"
|
||||
},
|
||||
"bin": [
|
||||
"security-checker"
|
||||
],
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "5.0-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"SensioLabs\\Security\\": "SensioLabs/Security"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien.potencier@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A security checker for your composer.lock",
|
||||
"time": "2018-10-16T10:30:44+00:00"
|
||||
},
|
||||
{
|
||||
"name": "squizlabs/php_codesniffer",
|
||||
"version": "3.3.2",
|
||||
@ -5485,6 +5360,75 @@
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-09-08T13:15:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v3.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
|
||||
"reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"symfony/debug": "~2.8|~3.0|~4.0",
|
||||
"symfony/polyfill-mbstring": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<3.4",
|
||||
"symfony/process": "<3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
"symfony/config": "~3.3|~4.0",
|
||||
"symfony/dependency-injection": "~3.4|~4.0",
|
||||
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
|
||||
"symfony/lock": "~3.4|~4.0",
|
||||
"symfony/process": "~3.3|~4.0"
|
||||
},
|
||||
"suggest": {
|
||||
"psr/log-implementation": "For using the console logger",
|
||||
"symfony/event-dispatcher": "",
|
||||
"symfony/lock": "",
|
||||
"symfony/process": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Console\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T16:33:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v3.4.17",
|
||||
@ -5538,6 +5482,62 @@
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T16:33:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v3.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
"reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
|
||||
"reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/http-kernel": "~2.8|~3.0|~4.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Debug\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T16:33:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dependency-injection",
|
||||
"version": "v3.4.17",
|
||||
@ -8441,7 +8441,7 @@
|
||||
"prefer-stable": false,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
"php": ">=5.5"
|
||||
"php": ">=5.6"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-overrides": {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
namespace MailPoet\API;
|
||||
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
|
||||
use MailPoet\DI\ContainerFactory;
|
||||
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
namespace MailPoet\API\JSON;
|
||||
|
||||
use MailPoet\Config\AccessControl;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
|
||||
use MailPoet\Models\Setting;
|
||||
use MailPoet\Util\Helpers;
|
||||
use MailPoet\Util\Security;
|
||||
|
||||
@ -4,7 +4,7 @@ namespace MailPoet\Config;
|
||||
|
||||
use MailPoet\API;
|
||||
use MailPoet\Cron\CronTrigger;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\DI\ContainerFactory;
|
||||
use MailPoet\Models\Setting;
|
||||
use MailPoet\Router;
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
namespace MailPoet\DI;
|
||||
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Dumper\PhpDumper;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Reference;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Dumper\PhpDumper;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
class ContainerFactory {
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
namespace MailPoet\Logging;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use MailPoet\Dependencies\Monolog\Handler\AbstractProcessingHandler;
|
||||
use MailPoetVendor\Monolog\Handler\AbstractProcessingHandler;
|
||||
use MailPoet\Models\Log;
|
||||
|
||||
class LogHandler extends AbstractProcessingHandler {
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
namespace MailPoet\Logging;
|
||||
|
||||
use MailPoet\Dependencies\Monolog\Processor\IntrospectionProcessor;
|
||||
use MailPoet\Dependencies\Monolog\Processor\MemoryUsageProcessor;
|
||||
use MailPoet\Dependencies\Monolog\Processor\WebProcessor;
|
||||
use MailPoetVendor\Monolog\Processor\IntrospectionProcessor;
|
||||
use MailPoetVendor\Monolog\Processor\MemoryUsageProcessor;
|
||||
use MailPoetVendor\Monolog\Processor\WebProcessor;
|
||||
use MailPoet\Models\Setting;
|
||||
|
||||
/**
|
||||
@ -24,18 +24,18 @@ use MailPoet\Models\Setting;
|
||||
*/
|
||||
class Logger {
|
||||
|
||||
/** @var \MailPoet\Dependencies\Monolog\Logger[] */
|
||||
/** @var \MailPoetVendor\Monolog\Logger[] */
|
||||
private static $instance = [];
|
||||
|
||||
/**
|
||||
* @param string $name
|
||||
* @param bool $attach_processors
|
||||
*
|
||||
* @return \MailPoet\Dependencies\Monolog\Logger
|
||||
* @return \MailPoetVendor\Monolog\Logger
|
||||
*/
|
||||
public static function getLogger($name = 'MailPoet', $attach_processors = WP_DEBUG) {
|
||||
if(!isset(self::$instance[$name])) {
|
||||
self::$instance[$name] = new \MailPoet\Dependencies\Monolog\Logger($name);
|
||||
self::$instance[$name] = new \MailPoetVendor\Monolog\Logger($name);
|
||||
|
||||
if($attach_processors) {
|
||||
// Adds the line/file/class/method from which the log call originated
|
||||
@ -55,11 +55,11 @@ class Logger {
|
||||
$settings = Setting::getValue('logging', 'errors');
|
||||
switch ($settings) {
|
||||
case 'everything':
|
||||
return \MailPoet\Dependencies\Monolog\Logger::DEBUG;
|
||||
return \MailPoetVendor\Monolog\Logger::DEBUG;
|
||||
case 'nothing':
|
||||
return \MailPoet\Dependencies\Monolog\Logger::EMERGENCY;
|
||||
return \MailPoetVendor\Monolog\Logger::EMERGENCY;
|
||||
default:
|
||||
return \MailPoet\Dependencies\Monolog\Logger::ERROR;
|
||||
return \MailPoetVendor\Monolog\Logger::ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
namespace MailPoet\Router;
|
||||
|
||||
use MailPoet\Config\AccessControl;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\Util\Helpers;
|
||||
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
"require": {
|
||||
"php": ">=5.5",
|
||||
"symfony/dependency-injection": "3.4.17",
|
||||
"symfony/config": "3.4.17",
|
||||
"monolog/monolog": "^1.23",
|
||||
"coenjacobs/mozart": "dev-dependency-tree"
|
||||
},
|
||||
@ -17,21 +16,21 @@
|
||||
"@cleanup",
|
||||
"vendor/bin/mozart compose",
|
||||
"@unwantedDepsRemoval",
|
||||
"mv ./Dependencies ../lib/"
|
||||
"mv ./Dependencies ../vendor-prefixed"
|
||||
],
|
||||
"post-install-cmd": [
|
||||
"@cleanup",
|
||||
"vendor/bin/mozart compose",
|
||||
"@unwantedDepsRemoval",
|
||||
"mv ./Dependencies ../lib/"
|
||||
"mv ./Dependencies ../vendor-prefixed"
|
||||
],
|
||||
"cleanup": "rm -rf vendor/symfony/**/Tests;rm -rf ../lib/Dependencies",
|
||||
"unwantedDepsRemoval": "rm -rf ./Dependencies/Symfony/Debug;rm -rf ./Dependencies/Symfony/Finder;rm -rf ./Dependencies/Symfony/Console"
|
||||
"cleanup": "rm -rf vendor/symfony/**/Tests;rm -rf ../vendor-prefixed",
|
||||
"unwantedDepsRemoval": "rm -rf ./Dependencies/Symfony/Component/Finder"
|
||||
},
|
||||
|
||||
"extra": {
|
||||
"mozart": {
|
||||
"dep_namespace": "MailPoet\\Dependencies\\",
|
||||
"dep_namespace": "MailPoetVendor\\",
|
||||
"dep_directory": "/Dependencies/",
|
||||
"classmap_directory": "/Classes/",
|
||||
"classmap_prefix": "MP_",
|
||||
|
||||
174
mozart/composer.lock
generated
174
mozart/composer.lock
generated
@ -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": "3130435798b03224effafe107537c210",
|
||||
"content-hash": "bd721d4b2eba193c88088baa6b5eef2f",
|
||||
"packages": [
|
||||
{
|
||||
"name": "coenjacobs/mozart",
|
||||
@ -311,70 +311,6 @@
|
||||
],
|
||||
"time": "2016-10-10T12:19:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/config",
|
||||
"version": "v3.4.17",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/config.git",
|
||||
"reference": "e5389132dc6320682de3643091121c048ff796b3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/config/zipball/e5389132dc6320682de3643091121c048ff796b3",
|
||||
"reference": "e5389132dc6320682de3643091121c048ff796b3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"symfony/filesystem": "~2.8|~3.0|~4.0",
|
||||
"symfony/polyfill-ctype": "~1.8"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<3.3",
|
||||
"symfony/finder": "<3.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/dependency-injection": "~3.3|~4.0",
|
||||
"symfony/event-dispatcher": "~3.3|~4.0",
|
||||
"symfony/finder": "~3.3|~4.0",
|
||||
"symfony/yaml": "~3.0|~4.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/yaml": "To use the yaml reference dumper"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Config\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Config Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-09-08T13:15:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v3.4.18",
|
||||
@ -571,56 +507,6 @@
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T12:28:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
"version": "v3.4.18",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/filesystem.git",
|
||||
"reference": "d69930fc337d767607267d57c20a7403d0a822a4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/d69930fc337d767607267d57c20a7403d0a822a4",
|
||||
"reference": "d69930fc337d767607267d57c20a7403d0a822a4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8",
|
||||
"symfony/polyfill-ctype": "~1.8"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Component\\Filesystem\\": ""
|
||||
},
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fabien Potencier",
|
||||
"email": "fabien@symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
}
|
||||
],
|
||||
"description": "Symfony Filesystem Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-02T12:28:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v3.4.18",
|
||||
@ -670,64 +556,6 @@
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-10-03T08:46:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.10.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||
"reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
|
||||
"reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.3"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-ctype": "For best performance"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.9-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Symfony\\Polyfill\\Ctype\\": ""
|
||||
},
|
||||
"files": [
|
||||
"bootstrap.php"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Symfony Community",
|
||||
"homepage": "https://symfony.com/contributors"
|
||||
},
|
||||
{
|
||||
"name": "Gert de Pagter",
|
||||
"email": "BackEndTea@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Symfony polyfill for ctype functions",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"compatibility",
|
||||
"ctype",
|
||||
"polyfill",
|
||||
"portable"
|
||||
],
|
||||
"time": "2018-08-06T14:22:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
"version": "v1.10.0",
|
||||
|
||||
@ -7,5 +7,4 @@ parameters:
|
||||
- '#Access to an undefined static property MailPoet\\Models\\Model::#'
|
||||
- '#Function members_register_.+ not found#'
|
||||
excludes_analyse:
|
||||
- lib/Dependencies
|
||||
- lib/DI/CachedContainer.php
|
||||
|
||||
@ -12,7 +12,7 @@ use MailPoet\API\JSON\SuccessResponse;
|
||||
use MailPoet\API\JSON\v1\APITestNamespacedEndpointStubV1;
|
||||
use MailPoet\API\JSON\v2\APITestNamespacedEndpointStubV2;
|
||||
use MailPoet\Config\AccessControl;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\DI\ContainerFactory;
|
||||
use MailPoet\WP\Hooks;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ class LogHandlerTest extends \MailPoetTest {
|
||||
]);
|
||||
|
||||
$log_handler->handle([
|
||||
'level' => \MailPoet\Dependencies\Monolog\Logger::EMERGENCY,
|
||||
'level' => \MailPoetVendor\Monolog\Logger::EMERGENCY,
|
||||
'extra' => [],
|
||||
'context' => [],
|
||||
'channel' => 'name',
|
||||
@ -47,7 +47,7 @@ class LogHandlerTest extends \MailPoetTest {
|
||||
$log_handler = new LogHandler();
|
||||
$log_handler = Mock::double($log_handler, ['getRandom' => 0]);
|
||||
$log_handler->handle([
|
||||
'level' => \MailPoet\Dependencies\Monolog\Logger::EMERGENCY,
|
||||
'level' => \MailPoetVendor\Monolog\Logger::EMERGENCY,
|
||||
'extra' => [],
|
||||
'context' => [],
|
||||
'channel' => 'name',
|
||||
@ -71,7 +71,7 @@ class LogHandlerTest extends \MailPoetTest {
|
||||
$log_handler = new LogHandler();
|
||||
$log_handler = Mock::double($log_handler, ['getRandom' => 100]);
|
||||
$log_handler->handle([
|
||||
'level' => \MailPoet\Dependencies\Monolog\Logger::EMERGENCY,
|
||||
'level' => \MailPoetVendor\Monolog\Logger::EMERGENCY,
|
||||
'extra' => [],
|
||||
'context' => [],
|
||||
'channel' => 'name',
|
||||
|
||||
@ -8,7 +8,7 @@ class LoggerTest extends \MailPoetTest {
|
||||
|
||||
public function testItCreatesLogger() {
|
||||
$logger = Logger::getLogger('logger-name');
|
||||
expect($logger)->isInstanceOf(\MailPoet\Dependencies\Monolog\Logger::class);
|
||||
expect($logger)->isInstanceOf(\MailPoetVendor\Monolog\Logger::class);
|
||||
}
|
||||
|
||||
public function testItReturnsInstance() {
|
||||
@ -41,28 +41,28 @@ class LoggerTest extends \MailPoetTest {
|
||||
Setting::setValue('logging', null);
|
||||
$logger1 = Logger::getLogger('logger-with-handler');
|
||||
$handlers = $logger1->getHandlers();
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoet\Dependencies\Monolog\Logger::ERROR);
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
|
||||
}
|
||||
|
||||
public function testItSetsLoggingLevelForNothing() {
|
||||
Setting::setValue('logging', 'nothing');
|
||||
$logger1 = Logger::getLogger('logger-for-nothing');
|
||||
$handlers = $logger1->getHandlers();
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoet\Dependencies\Monolog\Logger::EMERGENCY);
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::EMERGENCY);
|
||||
}
|
||||
|
||||
public function testItSetsLoggingLevelForErrors() {
|
||||
Setting::setValue('logging', 'errors');
|
||||
$logger1 = Logger::getLogger('logger-for-errors');
|
||||
$handlers = $logger1->getHandlers();
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoet\Dependencies\Monolog\Logger::ERROR);
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
|
||||
}
|
||||
|
||||
public function testItSetsLoggingLevelForEverything() {
|
||||
Setting::setValue('logging', 'everything');
|
||||
$logger1 = Logger::getLogger('logger-for-everything');
|
||||
$handlers = $logger1->getHandlers();
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoet\Dependencies\Monolog\Logger::DEBUG);
|
||||
expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::DEBUG);
|
||||
}
|
||||
|
||||
}
|
||||
@ -5,7 +5,7 @@ namespace MailPoet\Test\Router;
|
||||
use Codeception\Stub;
|
||||
use Codeception\Stub\Expected;
|
||||
use MailPoet\Config\AccessControl;
|
||||
use MailPoet\Dependencies\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
|
||||
use MailPoet\DI\ContainerFactory;
|
||||
use MailPoet\Router\Endpoints\RouterTestMockEndpoint;
|
||||
use MailPoet\Router\Router;
|
||||
|
||||
Reference in New Issue
Block a user