Updated Rector to commit 6e31710cca5c1cc0dcc9c5e08de1a0d53281c84b

6e31710cca [e2e][core][Printer] Use more reliable FileDiff instead of empty ->getRectorWithLineChanges() on PhpFileProcessor (#3414)
This commit is contained in:
Tomas Votruba 2023-02-25 17:42:55 +00:00
parent acd9d65c74
commit d785bbe2e0
10 changed files with 48 additions and 44 deletions

View File

@ -170,11 +170,11 @@ final class PhpFileProcessor implements FileProcessorInterface
// only save to string first, no need to print to file when not needed
$newContent = $this->formatPerservingPrinter->printParsedStmstAndTokensToString($file);
/**
* When no Rules applied, the PostRector may still change the content, that's why printing still needed
* When no diff applied, the PostRector may still change the content, that's why printing still needed
* On printing, the space may be wiped, these below check compare with original file content used to verify
* that no diff actually needed
* that no change actually needed
*/
if ($file->getRectorWithLineChanges() === []) {
if (!$file->getFileDiff() instanceof FileDiff) {
/**
* Handle new line or space before <?php or InlineHTML node wiped on print format preserving
* On very first content level

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f60aaa59539dfa31b03085ba0747a73b1815d23e';
public const PACKAGE_VERSION = '6e31710cca5c1cc0dcc9c5e08de1a0d53281c84b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-02-25 12:48:50';
public const RELEASE_DATE = '2023-02-25 17:38:27';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitdbbcf9be257bf52efb0f8ce767c0f8ce::getLoader();
return ComposerAutoloaderInita6e687eda5a904a3fc5f42726b233c7a::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitdbbcf9be257bf52efb0f8ce767c0f8ce
class ComposerAutoloaderInita6e687eda5a904a3fc5f42726b233c7a
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitdbbcf9be257bf52efb0f8ce767c0f8ce
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitdbbcf9be257bf52efb0f8ce767c0f8ce', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita6e687eda5a904a3fc5f42726b233c7a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitdbbcf9be257bf52efb0f8ce767c0f8ce', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita6e687eda5a904a3fc5f42726b233c7a', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce
class ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3125,9 +3125,9 @@ class ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitdbbcf9be257bf52efb0f8ce767c0f8ce::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita6e687eda5a904a3fc5f42726b233c7a::$classMap;
}, null, ClassLoader::class);
}

View File

@ -869,17 +869,17 @@
},
{
"name": "phpstan\/phpstan",
"version": "1.10.2",
"version_normalized": "1.10.2.0",
"version": "1.10.3",
"version_normalized": "1.10.3.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
"reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd"
"reference": "5419375b5891add97dc74be71e6c1c34baaddf64"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/a2ffec7db373d8da4973d1d62add872db5cd22dd",
"reference": "a2ffec7db373d8da4973d1d62add872db5cd22dd",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/5419375b5891add97dc74be71e6c1c34baaddf64",
"reference": "5419375b5891add97dc74be71e6c1c34baaddf64",
"shasum": ""
},
"require": {
@ -888,7 +888,7 @@
"conflict": {
"phpstan\/phpstan-shim": "*"
},
"time": "2023-02-23T14:36:46+00:00",
"time": "2023-02-25T14:47:13+00:00",
"bin": [
"phpstan",
"phpstan.phar"
@ -911,7 +911,7 @@
],
"support": {
"issues": "https:\/\/github.com\/phpstan\/phpstan\/issues",
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.10.2"
"source": "https:\/\/github.com\/phpstan\/phpstan\/tree\/1.10.3"
},
"funding": [
{
@ -931,17 +931,17 @@
},
{
"name": "phpstan\/phpstan-phpunit",
"version": "1.3.7",
"version_normalized": "1.3.7.0",
"version": "1.3.8",
"version_normalized": "1.3.8.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan-phpunit.git",
"reference": "7e43c8f77c7e419730ead01c8dc787c6bcbe0e15"
"reference": "4a19a3cb5b2d28b143f350e45e9f6e17e2cb81b5"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan-phpunit\/zipball\/7e43c8f77c7e419730ead01c8dc787c6bcbe0e15",
"reference": "7e43c8f77c7e419730ead01c8dc787c6bcbe0e15",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan-phpunit\/zipball\/4a19a3cb5b2d28b143f350e45e9f6e17e2cb81b5",
"reference": "4a19a3cb5b2d28b143f350e45e9f6e17e2cb81b5",
"shasum": ""
},
"require": {
@ -957,7 +957,7 @@
"phpstan\/phpstan-strict-rules": "^1.0",
"phpunit\/phpunit": "^9.5"
},
"time": "2023-02-21T18:40:15+00:00",
"time": "2023-02-25T15:14:31+00:00",
"type": "phpstan-extension",
"extra": {
"phpstan": {
@ -980,7 +980,7 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https:\/\/github.com\/phpstan\/phpstan-phpunit\/issues",
"source": "https:\/\/github.com\/phpstan\/phpstan-phpunit\/tree\/1.3.7"
"source": "https:\/\/github.com\/phpstan\/phpstan-phpunit\/tree\/1.3.8"
},
"install-path": "..\/phpstan\/phpstan-phpunit"
},

File diff suppressed because one or more lines are too long

View File

@ -76,7 +76,11 @@ class CoversHelper
if (!isset($method) && $this->reflectionProvider->hasFunction(new Name($covers, []), null)) {
return $errors;
}
$errors[] = RuleErrorBuilder::message(sprintf('@covers value %s references an invalid %s.', $fullName, $isMethod ? 'method' : 'class or function'))->build();
$error = RuleErrorBuilder::message(sprintf('@covers value %s references an invalid %s.', $fullName, $isMethod ? 'method' : 'class or function'));
if (strpos($className, '\\') === \false) {
$error->tip('The @covers annotation requires a fully qualified name.');
}
$errors[] = $error->build();
}
return $errors;
}

Binary file not shown.

View File

@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmP3eecACgkQzxoQjQ56
5yAH6A//R+CaBjUmbQhmamLiYATpskxv25DC/BQQ1+aK5sz8IlKcxPViN3Ke9QAq
qikQQ3ZDcNmBFR+p5ew9WuW4c99B/MX+Pg0Nc47keq/TxU/sslE1G7SuHssSCCxp
o1W3HihbZtDmPWYj3VWSmyEvFAbho/qpTsu9d34qDcryRCZ3A46NZ5zOdNa5uI2R
8hyhuPsWF0fnd3sxYSRCL0fPp6CAEWxIRiG53gmMjTfVdTsZQZVwzgsfiW3GAIRf
J7tYbGcBN3tyrJEFyFJCJkWt2ATla1LzucL6rrDUa9HzNsA5NUTOLj6j6PACQ0Vj
eCMfcDxKj/t6EJlHBpO2A5AiE8DOLs+lWmKiG7DqWOqqOnoYc/Fbv9RL3p25r7N2
gv4hhyEfBE0hoUxKSzsa7M++Ler+Js0Slxc881dpDuqvBEZFyA4M9YJTM4ckK92M
LcFC1RJ5xdHx/COpYVN3w2DvZ9BVk2kvdByJGnyQ9Tp/R8HdW+cv88kYopIXZ0R5
8m7B/zbtxMbtEzEn38JqfTtiQpE6vNH3iaWInIkP/ZZgfetCoHdXUF+NTTpTyUCm
C+NqRlgtA9NyjkdjX/kbohuxAcGsxlZu4/CfYKEIVAeCpM5sdjf4tRmmYn/5wCRF
226D4n9yPZ9YHE7HYLrRcmlx2jzsKH8wv8Z5IZ8KqZK/9tPhHoM=
=aGUS
iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmP6H1oACgkQzxoQjQ56
5yCVhxAAlXqhfvKCITSAJjkaIhncEBHpT5Ogby65BX1O5+SkKyc/OO7JnjlN8cLB
DKbJpdc8P2Dbfo/uBHVR5YiNX5CWYzgdMzCpLQI20Ffa7qkeRbA5ZS2AfdIfLqhD
PswlQIYxg0F3lj0L+joTxfBiHgmR5wnOUx1sLXnEbqGtFzzGstPGDg9gjKKh5EnO
g207jrm1we05+k3kKzr233/ENvQD6bBWLr2yngyMoirOuDpurAuPjkBL7vN6PDbx
DlyGDazsgU/R7aE2FtqmFC8KIU/BgnpbCSWTHBEJAqtncHbwTgneyEm+88lT6cUt
YM72Rh1+QTvS3WgJ/q7AQRik2aE83Kz2rc3XOl1ADd45J3Oan1rqQXdnKtH6qZeT
wMk6PE8SQPJ8NMHy3LT048PfMOakAtgBL5xonbVqX0IFAvKAMRijwBCNKat2yRsB
0VGnoeH7klf1fSSo0xOD20Pd0uIILAWZlBjb2e/1NRytFQkokAr1bsLD/VJHiNYh
lPQ4OztCT/uumJOAgTKm10T56CK1u0VxhIVtQ+/NkTvAwrmpX0KKqbYPP/1hZqVO
vFaWJR4iLFNt+il7dlv56jmTAneUrGrWkQdVFbz5FVpqz7abIo+/cevbSSndFZCI
K1mn42aFdYXSqVTFpkzeOQeJPPysEYDysFk7ClhE+F48HN7WAtw=
=A7BG
-----END PGP SIGNATURE-----