Updated Rector to commit ac302b5284

ac302b5284 Fixing build (#25)
This commit is contained in:
Tomas Votruba 2021-05-12 13:38:19 +00:00
parent 84df6b9445
commit 3cb3586f15
27 changed files with 226 additions and 190 deletions

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c::getLoader();
return ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01::getLoader();

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c
class ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit459aff2108f59b89e82f513385877f1c::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticIniteec3f53a678521849d9ec3027d7cad01::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit459aff2108f59b89e82f513385877f1c::$files;
$includeFiles = Composer\Autoload\ComposerStaticIniteec3f53a678521849d9ec3027d7cad01::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire459aff2108f59b89e82f513385877f1c($fileIdentifier, $file);
composerRequireeec3f53a678521849d9ec3027d7cad01($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire459aff2108f59b89e82f513385877f1c($fileIdentifier, $file)
function composerRequireeec3f53a678521849d9ec3027d7cad01($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit459aff2108f59b89e82f513385877f1c
class ComposerStaticIniteec3f53a678521849d9ec3027d7cad01
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3464,9 +3464,9 @@ class ComposerStaticInit459aff2108f59b89e82f513385877f1c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit459aff2108f59b89e82f513385877f1c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit459aff2108f59b89e82f513385877f1c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit459aff2108f59b89e82f513385877f1c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticIniteec3f53a678521849d9ec3027d7cad01::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticIniteec3f53a678521849d9ec3027d7cad01::$prefixDirsPsr4;
$loader->classMap = ComposerStaticIniteec3f53a678521849d9ec3027d7cad01::$classMap;
}, null, ClassLoader::class);
}

View File

@ -1859,17 +1859,17 @@
},
{
"name": "symfony\/config",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/config.git",
"reference": "3817662ada105c8c4d1afdb4ec003003efd1d8d8"
"reference": "8dfa5f8adea9cd5155920069224beb04f11d6b7e"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/config\/zipball\/3817662ada105c8c4d1afdb4ec003003efd1d8d8",
"reference": "3817662ada105c8c4d1afdb4ec003003efd1d8d8",
"url": "https:\/\/api.github.com\/repos\/symfony\/config\/zipball\/8dfa5f8adea9cd5155920069224beb04f11d6b7e",
"reference": "8dfa5f8adea9cd5155920069224beb04f11d6b7e",
"shasum": ""
},
"require": {
@ -1892,7 +1892,7 @@
"suggest": {
"symfony\/yaml": "To use the yaml reference dumper"
},
"time": "2021-04-07T16:07:52+00:00",
"time": "2021-05-07T13:41:16+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -1920,7 +1920,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/config\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/config\/tree\/v5.2.8"
},
"funding": [
{
@ -1940,17 +1940,17 @@
},
{
"name": "symfony\/console",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/console.git",
"reference": "90374b8ed059325b49a29b55b3f8bb4062c87629"
"reference": "864568fdc0208b3eba3638b6000b69d2386e6768"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/console\/zipball\/90374b8ed059325b49a29b55b3f8bb4062c87629",
"reference": "90374b8ed059325b49a29b55b3f8bb4062c87629",
"url": "https:\/\/api.github.com\/repos\/symfony\/console\/zipball\/864568fdc0208b3eba3638b6000b69d2386e6768",
"reference": "864568fdc0208b3eba3638b6000b69d2386e6768",
"shasum": ""
},
"require": {
@ -1986,7 +1986,7 @@
"symfony\/lock": "",
"symfony\/process": ""
},
"time": "2021-04-19T14:07:32+00:00",
"time": "2021-05-11T15:45:21+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2020,7 +2020,7 @@
"terminal"
],
"support": {
"source": "https:\/\/github.com\/symfony\/console\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/console\/tree\/v5.2.8"
},
"funding": [
{
@ -2040,17 +2040,17 @@
},
{
"name": "symfony\/dependency-injection",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/dependency-injection.git",
"reference": "6ca378b99e3c9ba6127eb43b68389fb2b7348577"
"reference": "024e929da5a994cbab0ce2291d332f7edf926acf"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/dependency-injection\/zipball\/6ca378b99e3c9ba6127eb43b68389fb2b7348577",
"reference": "6ca378b99e3c9ba6127eb43b68389fb2b7348577",
"url": "https:\/\/api.github.com\/repos\/symfony\/dependency-injection\/zipball\/024e929da5a994cbab0ce2291d332f7edf926acf",
"reference": "024e929da5a994cbab0ce2291d332f7edf926acf",
"shasum": ""
},
"require": {
@ -2082,7 +2082,7 @@
"symfony\/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony\/yaml": ""
},
"time": "2021-04-24T14:32:26+00:00",
"time": "2021-05-11T16:07:35+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2110,7 +2110,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/dependency-injection\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/dependency-injection\/tree\/v5.2.8"
},
"funding": [
{
@ -2200,17 +2200,17 @@
},
{
"name": "symfony\/error-handler",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/error-handler.git",
"reference": "ea3ddbf67615e883ca7c33a4de61213789846782"
"reference": "1416bc16317a8188aabde251afef7618bf4687ac"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/error-handler\/zipball\/ea3ddbf67615e883ca7c33a4de61213789846782",
"reference": "ea3ddbf67615e883ca7c33a4de61213789846782",
"url": "https:\/\/api.github.com\/repos\/symfony\/error-handler\/zipball\/1416bc16317a8188aabde251afef7618bf4687ac",
"reference": "1416bc16317a8188aabde251afef7618bf4687ac",
"shasum": ""
},
"require": {
@ -2224,7 +2224,7 @@
"symfony\/http-kernel": "^4.4|^5.0",
"symfony\/serializer": "^4.4|^5.0"
},
"time": "2021-04-07T15:57:33+00:00",
"time": "2021-05-07T13:42:21+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2252,7 +2252,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/error-handler\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/error-handler\/tree\/v5.2.8"
},
"funding": [
{
@ -2507,23 +2507,23 @@
},
{
"name": "symfony\/finder",
"version": "v5.2.4",
"version_normalized": "5.2.4.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/finder.git",
"reference": "0d639a0943822626290d169965804f79400e6a04"
"reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/finder\/zipball\/0d639a0943822626290d169965804f79400e6a04",
"reference": "0d639a0943822626290d169965804f79400e6a04",
"url": "https:\/\/api.github.com\/repos\/symfony\/finder\/zipball\/eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
"reference": "eccb8be70d7a6a2230d05f6ecede40f3fdd9e252",
"shasum": ""
},
"require": {
"php": ">=7.2.5"
},
"time": "2021-02-15T18:55:04+00:00",
"time": "2021-05-10T14:39:23+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2551,7 +2551,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/finder\/tree\/v5.2.4"
"source": "https:\/\/github.com\/symfony\/finder\/tree\/v5.2.8"
},
"funding": [
{
@ -2652,17 +2652,17 @@
},
{
"name": "symfony\/http-foundation",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/http-foundation.git",
"reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f"
"reference": "e8fbbab7c4a71592985019477532629cb2e142dc"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/http-foundation\/zipball\/a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
"reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
"url": "https:\/\/api.github.com\/repos\/symfony\/http-foundation\/zipball\/e8fbbab7c4a71592985019477532629cb2e142dc",
"reference": "e8fbbab7c4a71592985019477532629cb2e142dc",
"shasum": ""
},
"require": {
@ -2680,7 +2680,7 @@
"suggest": {
"symfony\/mime": "To use the file extension guesser"
},
"time": "2021-05-01T13:46:24+00:00",
"time": "2021-05-07T13:41:16+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2708,7 +2708,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/http-foundation\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/http-foundation\/tree\/v5.2.8"
},
"funding": [
{
@ -2728,17 +2728,17 @@
},
{
"name": "symfony\/http-kernel",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/http-kernel.git",
"reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd"
"reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/http-kernel\/zipball\/1e9f6879f070f718e0055fbac232a56f67b8b6bd",
"reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd",
"url": "https:\/\/api.github.com\/repos\/symfony\/http-kernel\/zipball\/c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
"reference": "c3cb71ee7e2d3eae5fe1001f81780d6a49b37937",
"shasum": ""
},
"require": {
@ -2795,7 +2795,7 @@
"symfony\/console": "",
"symfony\/dependency-injection": ""
},
"time": "2021-05-01T14:53:15+00:00",
"time": "2021-05-12T13:27:53+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -2823,7 +2823,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https:\/\/symfony.com",
"support": {
"source": "https:\/\/github.com\/symfony\/http-kernel\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/http-kernel\/tree\/v5.2.8"
},
"funding": [
{
@ -3429,17 +3429,17 @@
},
{
"name": "symfony\/string",
"version": "v5.2.6",
"version_normalized": "5.2.6.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/string.git",
"reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
"reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/string\/zipball\/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
"reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
"url": "https:\/\/api.github.com\/repos\/symfony\/string\/zipball\/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
"reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db",
"shasum": ""
},
"require": {
@ -3456,7 +3456,7 @@
"symfony\/translation-contracts": "^1.1|^2",
"symfony\/var-exporter": "^4.4|^5.0"
},
"time": "2021-03-17T17:12:15+00:00",
"time": "2021-05-10T14:56:10+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -3495,7 +3495,7 @@
"utf8"
],
"support": {
"source": "https:\/\/github.com\/symfony\/string\/tree\/v5.2.6"
"source": "https:\/\/github.com\/symfony\/string\/tree\/v5.2.8"
},
"funding": [
{
@ -3515,17 +3515,17 @@
},
{
"name": "symfony\/var-dumper",
"version": "v5.2.7",
"version_normalized": "5.2.7.0",
"version": "v5.2.8",
"version_normalized": "5.2.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/symfony\/var-dumper.git",
"reference": "27cb9f7cfa3853c736425c7233a8f68814b19636"
"reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/symfony\/var-dumper\/zipball\/27cb9f7cfa3853c736425c7233a8f68814b19636",
"reference": "27cb9f7cfa3853c736425c7233a8f68814b19636",
"url": "https:\/\/api.github.com\/repos\/symfony\/var-dumper\/zipball\/d693200a73fae179d27f8f1b16b4faf3e8569eba",
"reference": "d693200a73fae179d27f8f1b16b4faf3e8569eba",
"shasum": ""
},
"require": {
@ -3548,7 +3548,7 @@
"ext-intl": "To show region name in time zone dump",
"symfony\/console": "To use the ServerDumpCommand and\/or the bin\/var-dump-server script"
},
"time": "2021-04-19T14:07:32+00:00",
"time": "2021-05-07T13:42:21+00:00",
"bin": [
"Resources\/bin\/var-dump-server"
],
@ -3586,7 +3586,7 @@
"dump"
],
"support": {
"source": "https:\/\/github.com\/symfony\/var-dumper\/tree\/v5.2.7"
"source": "https:\/\/github.com\/symfony\/var-dumper\/tree\/v5.2.8"
},
"funding": [
{

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210512\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c', false) && !interface_exists('ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c', false) && !trait_exists('ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c', false)) {
spl_autoload_call('RectorPrefix20210512\ComposerAutoloaderInit459aff2108f59b89e82f513385877f1c');
if (!class_exists('ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01', false) && !interface_exists('ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01', false) && !trait_exists('ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01', false)) {
spl_autoload_call('RectorPrefix20210512\ComposerAutoloaderIniteec3f53a678521849d9ec3027d7cad01');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210512\Doctrine\Inflector\Inflector');
@ -95,9 +95,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210512\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire459aff2108f59b89e82f513385877f1c')) {
function composerRequire459aff2108f59b89e82f513385877f1c() {
return \RectorPrefix20210512\composerRequire459aff2108f59b89e82f513385877f1c(...func_get_args());
if (!function_exists('composerRequireeec3f53a678521849d9ec3027d7cad01')) {
function composerRequireeec3f53a678521849d9ec3027d7cad01() {
return \RectorPrefix20210512\composerRequireeec3f53a678521849d9ec3027d7cad01(...func_get_args());
}
}
if (!function_exists('parseArgs')) {

View File

@ -67,8 +67,8 @@ abstract class FileLoader extends \RectorPrefix20210512\Symfony\Component\Config
$excluded = [];
foreach ((array) $exclude as $pattern) {
foreach ($this->glob($pattern, \true, $_, \false, \true) as $path => $info) {
// normalize Windows slashes
$excluded[\str_replace('\\', '/', $path)] = \true;
// normalize Windows slashes and remove trailing slashes
$excluded[\rtrim(\str_replace('\\', '/', $path), '/')] = \true;
}
}
$ret = [];

View File

@ -101,7 +101,7 @@ class TextDescriptor extends \RectorPrefix20210512\Symfony\Component\Console\Des
$laterOptions = [];
$this->writeText('<comment>Options:</comment>', $options);
foreach ($definition->getOptions() as $option) {
if (\strlen($option->getShortcut()) > 1) {
if (\strlen($option->getShortcut() ?? '') > 1) {
$laterOptions[] = $option;
continue;
}

View File

@ -163,7 +163,7 @@ class XmlDescriptor extends \RectorPrefix20210512\Symfony\Component\Console\Desc
$dom = new \DOMDocument('1.0', 'UTF-8');
$dom->appendChild($objectXML = $dom->createElement('option'));
$objectXML->setAttribute('name', '--' . $option->getName());
$pos = \strpos($option->getShortcut(), '|');
$pos = \strpos($option->getShortcut() ?? '', '|');
if (\false !== $pos) {
$objectXML->setAttribute('shortcut', '-' . \substr($option->getShortcut(), 0, $pos));
$objectXML->setAttribute('shortcuts', '-' . \str_replace('|', '|-', $option->getShortcut()));

View File

@ -154,7 +154,7 @@ class ProgressIndicator
return $formatter($this);
}
return $matches[0];
}, $this->format));
}, $this->format ?? ''));
}
private function determineBestFormat() : string
{

View File

@ -95,10 +95,6 @@ class QuestionHelper extends \RectorPrefix20210512\Symfony\Component\Console\Hel
$this->writePrompt($output, $question);
$inputStream = $this->inputStream ?: \STDIN;
$autocomplete = $question->getAutocompleterCallback();
if (\function_exists('sapi_windows_cp_set')) {
// Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
@\sapi_windows_cp_set(1252);
}
if (null === $autocomplete || !self::$stty || !\RectorPrefix20210512\Symfony\Component\Console\Terminal::hasSttyAvailable()) {
$ret = \false;
if ($question->isHidden()) {
@ -427,20 +423,54 @@ class QuestionHelper extends \RectorPrefix20210512\Symfony\Component\Console\Hel
private function readInput($inputStream, \RectorPrefix20210512\Symfony\Component\Console\Question\Question $question)
{
if (!$question->isMultiline()) {
return \fgets($inputStream, 4096);
$cp = $this->setIOCodepage();
$ret = \fgets($inputStream, 4096);
return $this->resetIOCodepage($cp, $ret);
}
$multiLineStreamReader = $this->cloneInputStream($inputStream);
if (null === $multiLineStreamReader) {
return \false;
}
$ret = '';
$cp = $this->setIOCodepage();
while (\false !== ($char = \fgetc($multiLineStreamReader))) {
if (\PHP_EOL === "{$ret}{$char}") {
break;
}
$ret .= $char;
}
return $ret;
return $this->resetIOCodepage($cp, $ret);
}
/**
* Sets console I/O to the host code page.
*
* @return int Previous code page in IBM/EBCDIC format
*/
private function setIOCodepage() : int
{
if (\function_exists('sapi_windows_cp_set')) {
$cp = \sapi_windows_cp_get();
\sapi_windows_cp_set(\sapi_windows_cp_get('oem'));
return $cp;
}
return 0;
}
/**
* Sets console I/O to the specified code page and converts the user input.
*
* @param string|false $input
*
* @return string|false
*/
private function resetIOCodepage(int $cp, $input)
{
if (0 !== $cp) {
\sapi_windows_cp_set($cp);
if (\false !== $input && '' !== $input) {
$input = \sapi_windows_cp_conv(\sapi_windows_cp_get('oem'), $cp, $input);
}
}
return $input;
}
/**
* Clones an input stream in order to act on one instance of the same

View File

@ -491,7 +491,7 @@ class Table
if (isset($this->columnMaxWidths[$column]) && \RectorPrefix20210512\Symfony\Component\Console\Helper\Helper::strlenWithoutDecoration($formatter, $cell) > $this->columnMaxWidths[$column]) {
$cell = $formatter->formatAndWrap($cell, $this->columnMaxWidths[$column] * $colspan);
}
if (!\strstr($cell, "\n")) {
if (!\strstr($cell ?? '', "\n")) {
continue;
}
$escaped = \implode("\n", \array_map([\RectorPrefix20210512\Symfony\Component\Console\Formatter\OutputFormatter::class, 'escapeTrailingBackslash'], \explode("\n", $cell)));

View File

@ -237,9 +237,6 @@ class XmlDumper extends \RectorPrefix20210512\Symfony\Component\DependencyInject
if ($withKeys) {
$element->setAttribute($keyAttribute, $key);
}
if ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument) {
$value = $value->getValues()[0];
}
if (\is_array($tag = $value)) {
$element->setAttribute('type', 'collection');
$this->convertParameters($value, $type, $element, 'key');
@ -261,8 +258,12 @@ class XmlDumper extends \RectorPrefix20210512\Symfony\Component\DependencyInject
} elseif ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument) {
$element->setAttribute('type', 'service_locator');
$this->convertParameters($value->getValues(), $type, $element, 'key');
} elseif ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Reference) {
} elseif ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Reference || $value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument) {
$element->setAttribute('type', 'service');
if ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument) {
$element->setAttribute('type', 'service_closure');
$value = $value->getValues()[0];
}
$element->setAttribute('id', (string) $value);
$behavior = $value->getInvalidBehavior();
if (\RectorPrefix20210512\Symfony\Component\DependencyInjection\ContainerInterface::NULL_ON_INVALID_REFERENCE == $behavior) {

View File

@ -212,6 +212,7 @@ class YamlDumper extends \RectorPrefix20210512\Symfony\Component\DependencyInjec
{
if ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument) {
$value = $value->getValues()[0];
return new \RectorPrefix20210512\Symfony\Component\Yaml\Tag\TaggedValue('service_closure', $this->getServiceCall((string) $value, $value));
}
if ($value instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ArgumentInterface) {
$tag = $value;

View File

@ -142,8 +142,8 @@ abstract class FileLoader extends \RectorPrefix20210512\Symfony\Component\Config
if (null === $excludePrefix) {
$excludePrefix = $resource->getPrefix();
}
// normalize Windows slashes
$excludePaths[\str_replace('\\', '/', $path)] = \true;
// normalize Windows slashes and remove trailing slashes
$excludePaths[\rtrim(\str_replace('\\', '/', $path), '/')] = \true;
}
}
$pattern = $parameterBag->unescapeValue($parameterBag->resolveValue($pattern));

View File

@ -15,6 +15,7 @@ use RectorPrefix20210512\Symfony\Component\DependencyInjection\Alias;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\BoundArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\ChildDefinition;
@ -409,6 +410,12 @@ class XmlFileLoader extends \RectorPrefix20210512\Symfony\Component\DependencyIn
throw new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException(\sprintf('Tag "<%s>" with type="iterator" only accepts collections of type="service" references in "%s".', $name, $file));
}
break;
case 'service_closure':
if ('' === $arg->getAttribute('id')) {
throw new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException(\sprintf('Tag "<%s>" with type="service_closure" has no or empty "id" attribute in "%s".', $name, $file));
}
$arguments[$key] = new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument(new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Reference($arg->getAttribute('id'), $invalidBehavior));
break;
case 'service_locator':
$arg = $this->getArgumentsAsPhp($arg, $name, $file);
try {

View File

@ -15,6 +15,7 @@ use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\Abstract
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\BoundArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
use RectorPrefix20210512\Symfony\Component\DependencyInjection\ChildDefinition;
@ -598,6 +599,13 @@ class YamlFileLoader extends \RectorPrefix20210512\Symfony\Component\DependencyI
throw new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException(\sprintf('"!iterator" tag only accepts arrays of "@service" references in "%s".', $file));
}
}
if ('service_closure' === $value->getTag()) {
$argument = $this->resolveServices($argument, $file, $isParameter);
if (!$argument instanceof \RectorPrefix20210512\Symfony\Component\DependencyInjection\Reference) {
throw new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException(\sprintf('"!service_closure" tag only accepts service references in "%s".', $file));
}
return new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument($argument);
}
if ('service_locator' === $value->getTag()) {
if (!\is_array($argument)) {
throw new \RectorPrefix20210512\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException(\sprintf('"!service_locator" tag only accepts maps in "%s".', $file));

View File

@ -291,6 +291,7 @@
<xsd:enumeration value="constant" />
<xsd:enumeration value="binary" />
<xsd:enumeration value="iterator" />
<xsd:enumeration value="service_closure" />
<xsd:enumeration value="service_locator" />
<!-- "tagged" is an alias of "tagged_iterator", using "tagged_iterator" is preferred. -->
<xsd:enumeration value="tagged" />

View File

@ -10,6 +10,7 @@
*/
namespace RectorPrefix20210512\Symfony\Component\ErrorHandler;
use RectorPrefix20210512\Composer\InstalledVersions;
use RectorPrefix20210512\Doctrine\Common\Persistence\Proxy as LegacyProxy;
use RectorPrefix20210512\Doctrine\Persistence\Proxy;
use RectorPrefix20210512\Mockery\MockInterface;
@ -314,6 +315,10 @@ class DebugClassLoader
self::$method[$class] = self::$method[$use];
}
} elseif (!$refl->isInterface()) {
if (!\strncmp($vendor, \str_replace('_', '\\', $use), $vendorLen) && 0 === \strpos($className, 'Symfony\\') && (!\class_exists(\RectorPrefix20210512\Composer\InstalledVersions::class) || 'symfony/symfony' !== \RectorPrefix20210512\Composer\InstalledVersions::getRootPackage()['name'])) {
// skip "same vendor" @method deprecations for Symfony\* classes unless symfony/symfony is being tested
continue;
}
$hasCall = $refl->hasMethod('__call');
$hasStaticCall = $refl->hasMethod('__callStatic');
foreach (self::$method[$use] as $method) {

View File

@ -283,7 +283,6 @@ class FlattenException
return ['array', '*SKIPPED over 10000 entries*'];
}
if ($value instanceof \__PHP_Incomplete_Class) {
// is_object() returns false on PHP<=7.1
$result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
} elseif (\is_object($value)) {
$result[$key] = ['object', \get_class($value)];

View File

@ -13,6 +13,7 @@ namespace RectorPrefix20210512\Symfony\Component\Finder;
/**
* Gitignore matches against text.
*
* @author Michael Voříšek <vorismi3@fel.cvut.cz>
* @author Ahmed Abdou <mail@ahmd.io>
*/
class Gitignore
@ -20,98 +21,56 @@ class Gitignore
/**
* Returns a regexp which is the equivalent of the gitignore pattern.
*
* @return string The regexp
* Format specification: https://git-scm.com/docs/gitignore#_pattern_format
*/
public static function toRegex(string $gitignoreFileContent) : string
{
$gitignoreFileContent = \preg_replace('/^[^\\\\r\\n]*#.*/m', '', $gitignoreFileContent);
$gitignoreLines = \preg_split('/\\r\\n|\\r|\\n/', $gitignoreFileContent);
$positives = [];
$negatives = [];
$gitignoreFileContent = \preg_replace('~(?<!\\\\)#[^\\n\\r]*~', '', $gitignoreFileContent);
$gitignoreLines = \preg_split('~\\r\\n?|\\n~', $gitignoreFileContent);
$res = self::lineToRegex('');
foreach ($gitignoreLines as $i => $line) {
$line = \trim($line);
if ('' === $line) {
continue;
$line = \preg_replace('~(?<!\\\\)[ \\t]+$~', '', $line);
if ('!' === \substr($line, 0, 1)) {
$line = \substr($line, 1);
$isNegative = \true;
} else {
$isNegative = \false;
}
if (1 === \preg_match('/^!/', $line)) {
$positives[$i] = null;
$negatives[$i] = self::getRegexFromGitignore(\preg_replace('/^!(.*)/', '${1}', $line), \true);
continue;
if ('' !== $line) {
if ($isNegative) {
$res = '(?!' . self::lineToRegex($line) . '$)' . $res;
} else {
$res = '(?:' . $res . '|' . self::lineToRegex($line) . ')';
}
}
$negatives[$i] = null;
$positives[$i] = self::getRegexFromGitignore($line);
}
$index = 0;
$patterns = [];
foreach ($positives as $pattern) {
if (null === $pattern) {
continue;
}
$negativesAfter = \array_filter(\array_slice($negatives, ++$index));
if ([] !== $negativesAfter) {
$pattern .= \sprintf('(?<!%s)', \implode('|', $negativesAfter));
}
$patterns[] = $pattern;
}
return \sprintf('/^((%s))$/', \implode(')|(', $patterns));
return '~^(?:' . $res . ')~s';
}
private static function getRegexFromGitignore(string $gitignorePattern, bool $negative = \false) : string
private static function lineToRegex(string $gitignoreLine) : string
{
$regex = '';
$isRelativePath = \false;
// If there is a separator at the beginning or middle (or both) of the pattern, then the pattern is relative to the directory level of the particular .gitignore file itself
$slashPosition = \strpos($gitignorePattern, '/');
if (\false !== $slashPosition && \strlen($gitignorePattern) - 1 !== $slashPosition) {
if (0 === $slashPosition) {
$gitignorePattern = \substr($gitignorePattern, 1);
}
$isRelativePath = \true;
$regex .= '^';
if ('' === $gitignoreLine) {
return '$f';
// always false
}
if ('/' === $gitignorePattern[\strlen($gitignorePattern) - 1]) {
$gitignorePattern = \substr($gitignorePattern, 0, -1);
$slashPos = \strpos($gitignoreLine, '/');
if (\false !== $slashPos && \strlen($gitignoreLine) - 1 !== $slashPos) {
if (0 === $slashPos) {
$gitignoreLine = \substr($gitignoreLine, 1);
}
$isAbsolute = \true;
} else {
$isAbsolute = \false;
}
$iMax = \strlen($gitignorePattern);
for ($i = 0; $i < $iMax; ++$i) {
$tripleChars = \substr($gitignorePattern, $i, 3);
if ('**/' === $tripleChars || '/**' === $tripleChars) {
$regex .= '.*';
$i += 2;
continue;
}
$doubleChars = \substr($gitignorePattern, $i, 2);
if ('**' === $doubleChars) {
$regex .= '.*';
++$i;
continue;
}
if ('*/' === $doubleChars) {
$regex .= '[^\\/]*\\/?[^\\/]*';
++$i;
continue;
}
$c = $gitignorePattern[$i];
switch ($c) {
case '*':
$regex .= $isRelativePath ? '[^\\/]*' : '[^\\/]*\\/?[^\\/]*';
break;
case '/':
case '.':
case ':':
case '(':
case ')':
case '{':
case '}':
$regex .= '\\' . $c;
break;
default:
$regex .= $c;
}
}
if ($negative) {
// a lookbehind assertion has to be a fixed width (it can not have nested '|' statements)
return \sprintf('%s$|%s\\/$', $regex, $regex);
}
return '(?>' . $regex . '($|\\/.*))';
$parts = \array_map(function (string $v) : string {
$v = \preg_quote(\str_replace('\\', '', $v), '~');
$v = \preg_replace_callback('~\\\\\\[([^\\[\\]]*)\\\\\\]~', function (array $matches) : string {
return '[' . \str_replace('\\-', '-', $matches[1]) . ']';
}, $v);
$v = \preg_replace('~\\\\\\*\\\\\\*~', '[^/]+(?:/[^/]+)*', $v);
$v = \preg_replace('~\\\\\\*~', '[^/]*', $v);
$v = \preg_replace('~\\\\\\?~', '[^/]', $v);
return $v;
}, \explode('/', $gitignoreLine));
return ($isAbsolute ? '' : '(?:[^/]+/)*') . \implode('/', $parts) . ('' !== \end($parts) ? '(?:$|/)' : '');
}
}

View File

@ -1284,7 +1284,7 @@ class Request
* if the proxy is trusted (see "setTrustedProxies()"), otherwise it returns
* the latter (from the "SERVER_PROTOCOL" server parameter).
*
* @return string
* @return string|null
*/
public function getProtocolVersion()
{

View File

@ -67,11 +67,11 @@ abstract class Kernel implements \RectorPrefix20210512\Symfony\Component\HttpKer
private $requestStackSize = 0;
private $resetServices = \false;
private static $freshCache = [];
public const VERSION = '5.2.7';
public const VERSION_ID = 50207;
public const VERSION = '5.2.8';
public const VERSION_ID = 50208;
public const MAJOR_VERSION = 5;
public const MINOR_VERSION = 2;
public const RELEASE_VERSION = 7;
public const RELEASE_VERSION = 8;
public const EXTRA_VERSION = '';
public const END_OF_MAINTENANCE = '07/2021';
public const END_OF_LIFE = '07/2021';

View File

@ -47,6 +47,8 @@ final class EnglishInflector implements \RectorPrefix20210512\Symfony\Component\
['seifles', 7, \true, \true, 'selfie'],
// movies (movie)
['seivom', 6, \true, \true, 'movie'],
// conspectuses (conspectus), prospectuses (prospectus)
['sesutcep', 8, \true, \true, 'pectus'],
// feet (foot)
['teef', 4, \true, \true, 'foot'],
// geese (goose)
@ -86,6 +88,8 @@ final class EnglishInflector implements \RectorPrefix20210512\Symfony\Component\
['suae', 4, \false, \true, 'eau'],
// fees (fee), trees (tree), employees (employee)
['see', 3, \true, \true, 'ee'],
// edges (edge)
['segd', 4, \true, \true, 'dge'],
// roses (rose), garages (garage), cassettes (cassette),
// waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
// shoes (shoe)
@ -188,6 +192,8 @@ final class EnglishInflector implements \RectorPrefix20210512\Symfony\Component\
['sub', 3, \true, \true, 'buses'],
// circuses (circus)
['suc', 3, \true, \true, 'cuses'],
// conspectuses (conspectus), prospectuses (prospectus)
['sutcep', 6, \true, \true, 'pectuses'],
// fungi (fungus), alumni (alumnus), syllabi (syllabus), radii (radius)
['su', 2, \true, \true, 'i'],
// news (news)
@ -218,7 +224,27 @@ final class EnglishInflector implements \RectorPrefix20210512\Symfony\Component\
/**
* A list of words which should not be inflected, reversed.
*/
private const UNINFLECTED = ['', 'atad', 'reed', 'kcabdeef', 'hsif', 'ofni', 'esoom', 'seires', 'peehs', 'seiceps'];
private const UNINFLECTED = [
'',
// data
'atad',
// deer
'reed',
// feedback
'kcabdeef',
// fish
'hsif',
// info
'ofni',
// moose
'esoom',
// series
'seires',
// sheep
'peehs',
// species
'seiceps',
];
/**
* {@inheritdoc}
*/

View File

@ -172,7 +172,6 @@ class VarCloner extends \RectorPrefix20210512\Symfony\Component\VarDumper\Cloner
}
break;
case \is_object($v):
case $v instanceof \__PHP_Incomplete_Class:
if (empty($objRefs[$h = \spl_object_id($v)])) {
$stub = new \RectorPrefix20210512\Symfony\Component\VarDumper\Cloner\Stub();
$stub->type = \RectorPrefix20210512\Symfony\Component\VarDumper\Cloner\Stub::TYPE_OBJECT;