octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-07 11:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 25ac38e726

Browse Source 
25ac38e726 [DX] add link to first line of diff (#771)
This commit is contained in:
Tomas Votruba 2021-08-26 12:11:00 +00:00
parent c65dc5320c
commit 101d911aaa
7 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/ChangesReporting/Output/ConsoleOutputFormatter.php
View File

@ -71,6 +71,11 @@ final class ConsoleOutputFormatter implements \Rector\ChangesReporting\Contract\
$i = 0;
foreach ($fileDiffs as $fileDiff) {
$relativeFilePath = $fileDiff->getRelativeFilePath();
// append line number for faster file jump in diff
$firstLineNumber = $fileDiff->getFirstLineNumber();
if ($firstLineNumber !== null) {
$relativeFilePath .= ':' . $firstLineNumber;
}
$message = \sprintf('<options=bold>%d) %s</>', ++$i, $relativeFilePath);
$this->outputStyle->writeln($message);
$this->outputStyle->newLine();

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'f39c01e545962d543bfb1fa9ef6bca2aaa4c80c9';
public const PACKAGE_VERSION = '25ac38e726e006fa272da7f38bfa94e625ab1818';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-26 18:42:20';
public const RELEASE_DATE = '2021-08-26 11:57:55';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210826\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

19
src/ValueObject/Reporting/FileDiff.php
View File

@ -3,11 +3,21 @@
declare (strict_types=1);
namespace Rector\Core\ValueObject\Reporting;
use RectorPrefix20210826\Nette\Utils\Strings;
use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
use Rector\Core\Contract\Rector\RectorInterface;
use Symplify\SmartFileSystem\SmartFileInfo;
final class FileDiff
{
/**
* @var string
* @se https://regex101.com/r/AUPIX4/1
*/
private const FIRST_LINE_REGEX = '#@@(.*?)(?<' . self::FIRST_LINE_KEY . '>\\d+)(.*?)@@#';
/**
* @var string
*/
private const FIRST_LINE_KEY = 'first_line';
/**
* @var \Symplify\SmartFileSystem\SmartFileInfo
*/
@ -68,6 +78,15 @@ final class FileDiff
}
return $this->sortClasses($rectorClasses);
}
public function getFirstLineNumber() : ?int
{
$match = \RectorPrefix20210826\Nette\Utils\Strings::match($this->diff, self::FIRST_LINE_REGEX);
// probably some error in diff
if (!isset($match[self::FIRST_LINE_KEY])) {
return null;
}
return (int) $match[self::FIRST_LINE_KEY] - 1;
}
/**
* @template TType as object
* @param array<class-string<TType>> $rectorClasses

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059
class ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1', '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\ComposerStaticInit8a632974ae4f26ec12eea9ab31b16059::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit7484f6ea5b57cb6be3d75d39dfb821a1::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit8a632974ae4f26ec12eea9ab31b16059::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit7484f6ea5b57cb6be3d75d39dfb821a1::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire8a632974ae4f26ec12eea9ab31b16059($fileIdentifier, $file);
composerRequire7484f6ea5b57cb6be3d75d39dfb821a1($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire8a632974ae4f26ec12eea9ab31b16059($fileIdentifier, $file)
function composerRequire7484f6ea5b57cb6be3d75d39dfb821a1($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

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

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210826\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059', false) && !interface_exists('ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059', false) && !trait_exists('ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059', false)) {
spl_autoload_call('RectorPrefix20210826\ComposerAutoloaderInit8a632974ae4f26ec12eea9ab31b16059');
if (!class_exists('ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1', false) && !interface_exists('ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1', false) && !trait_exists('ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1', false)) {
spl_autoload_call('RectorPrefix20210826\ComposerAutoloaderInit7484f6ea5b57cb6be3d75d39dfb821a1');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20210826\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3311,9 +3311,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210826\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire8a632974ae4f26ec12eea9ab31b16059')) {
function composerRequire8a632974ae4f26ec12eea9ab31b16059() {
return \RectorPrefix20210826\composerRequire8a632974ae4f26ec12eea9ab31b16059(...func_get_args());
if (!function_exists('composerRequire7484f6ea5b57cb6be3d75d39dfb821a1')) {
function composerRequire7484f6ea5b57cb6be3d75d39dfb821a1() {
return \RectorPrefix20210826\composerRequire7484f6ea5b57cb6be3d75d39dfb821a1(...func_get_args());
}
}
if (!function_exists('parseArgs')) {