Merge branch '2.8' into 3.4
* 2.8: Add color support for Hyper terminal . [HttpFoundation] Fix tests: new message for status 425 [Doctrine Bridge] Fixed usage of wrong variable when tagged subscriber is invalid
This commit is contained in:
commit
771c22b7a5
@ -68,7 +68,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
|
|||||||
$connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);
|
$connections = isset($tag['connection']) ? array($tag['connection']) : array_keys($this->connections);
|
||||||
foreach ($connections as $con) {
|
foreach ($connections as $con) {
|
||||||
if (!isset($this->connections[$con])) {
|
if (!isset($this->connections[$con])) {
|
||||||
throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $taggedSubscriber, implode(', ', array_keys($this->connections))));
|
throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', array(new Reference($id)));
|
$this->getEventManagerDef($container, $con)->addMethodCall('addEventSubscriber', array(new Reference($id)));
|
||||||
|
@ -316,7 +316,8 @@ class DeprecationErrorHandler
|
|||||||
&& sapi_windows_vt100_support(STDOUT))
|
&& sapi_windows_vt100_support(STDOUT))
|
||||||
|| false !== getenv('ANSICON')
|
|| false !== getenv('ANSICON')
|
||||||
|| 'ON' === getenv('ConEmuANSI')
|
|| 'ON' === getenv('ConEmuANSI')
|
||||||
|| 'xterm' === getenv('TERM');
|
|| 'xterm' === getenv('TERM')
|
||||||
|
|| 'Hyper' === getenv('TERM_PROGRAM');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (function_exists('stream_isatty')) {
|
if (function_exists('stream_isatty')) {
|
||||||
|
@ -98,7 +98,8 @@ class StreamOutput extends Output
|
|||||||
&& @sapi_windows_vt100_support($this->stream))
|
&& @sapi_windows_vt100_support($this->stream))
|
||||||
|| false !== getenv('ANSICON')
|
|| false !== getenv('ANSICON')
|
||||||
|| 'ON' === getenv('ConEmuANSI')
|
|| 'ON' === getenv('ConEmuANSI')
|
||||||
|| 'xterm' === getenv('TERM');
|
|| 'xterm' === getenv('TERM')
|
||||||
|
|| 'Hyper' === getenv('TERM_PROGRAM');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (function_exists('stream_isatty')) {
|
if (function_exists('stream_isatty')) {
|
||||||
|
@ -269,7 +269,7 @@ class SymfonyStyle extends OutputStyle
|
|||||||
{
|
{
|
||||||
$progressBar = parent::createProgressBar($max);
|
$progressBar = parent::createProgressBar($max);
|
||||||
|
|
||||||
if ('\\' !== DIRECTORY_SEPARATOR) {
|
if ('\\' !== DIRECTORY_SEPARATOR || 'Hyper' === getenv('TERM_PROGRAM')) {
|
||||||
$progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
|
$progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
|
||||||
$progressBar->setProgressCharacter('');
|
$progressBar->setProgressCharacter('');
|
||||||
$progressBar->setBarCharacter('▓'); // dark shade character \u2593
|
$progressBar->setBarCharacter('▓'); // dark shade character \u2593
|
||||||
|
@ -64,7 +64,12 @@ class Response
|
|||||||
const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918
|
const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918
|
||||||
const HTTP_LOCKED = 423; // RFC4918
|
const HTTP_LOCKED = 423; // RFC4918
|
||||||
const HTTP_FAILED_DEPENDENCY = 424; // RFC4918
|
const HTTP_FAILED_DEPENDENCY = 424; // RFC4918
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
*/
|
||||||
const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; // RFC2817
|
const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; // RFC2817
|
||||||
|
const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04
|
||||||
const HTTP_UPGRADE_REQUIRED = 426; // RFC2817
|
const HTTP_UPGRADE_REQUIRED = 426; // RFC2817
|
||||||
const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585
|
const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585
|
||||||
const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585
|
const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585
|
||||||
@ -169,7 +174,7 @@ class Response
|
|||||||
422 => 'Unprocessable Entity', // RFC4918
|
422 => 'Unprocessable Entity', // RFC4918
|
||||||
423 => 'Locked', // RFC4918
|
423 => 'Locked', // RFC4918
|
||||||
424 => 'Failed Dependency', // RFC4918
|
424 => 'Failed Dependency', // RFC4918
|
||||||
425 => 'Reserved for WebDAV advanced collections expired proposal', // RFC2817
|
425 => 'Too Early', // RFC-ietf-httpbis-replay-04
|
||||||
426 => 'Upgrade Required', // RFC2817
|
426 => 'Upgrade Required', // RFC2817
|
||||||
428 => 'Precondition Required', // RFC6585
|
428 => 'Precondition Required', // RFC6585
|
||||||
429 => 'Too Many Requests', // RFC6585
|
429 => 'Too Many Requests', // RFC6585
|
||||||
|
@ -546,7 +546,8 @@ class CliDumper extends AbstractDumper
|
|||||||
&& @sapi_windows_vt100_support($stream))
|
&& @sapi_windows_vt100_support($stream))
|
||||||
|| false !== getenv('ANSICON')
|
|| false !== getenv('ANSICON')
|
||||||
|| 'ON' === getenv('ConEmuANSI')
|
|| 'ON' === getenv('ConEmuANSI')
|
||||||
|| 'xterm' === getenv('TERM');
|
|| 'xterm' === getenv('TERM')
|
||||||
|
|| 'Hyper' === getenv('TERM_PROGRAM');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (function_exists('stream_isatty')) {
|
if (function_exists('stream_isatty')) {
|
||||||
@ -575,7 +576,8 @@ class CliDumper extends AbstractDumper
|
|||||||
{
|
{
|
||||||
$result = 183 <= getenv('ANSICON_VER')
|
$result = 183 <= getenv('ANSICON_VER')
|
||||||
|| 'ON' === getenv('ConEmuANSI')
|
|| 'ON' === getenv('ConEmuANSI')
|
||||||
|| 'xterm' === getenv('TERM');
|
|| 'xterm' === getenv('TERM')
|
||||||
|
|| 'Hyper' === getenv('TERM_PROGRAM');
|
||||||
|
|
||||||
if (!$result && PHP_VERSION_ID >= 70200) {
|
if (!$result && PHP_VERSION_ID >= 70200) {
|
||||||
$version = sprintf(
|
$version = sprintf(
|
||||||
|
Reference in New Issue
Block a user