Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rector/rector from 0.17.2 to 0.17.6 #104

Merged
merged 2 commits into from
Jul 16, 2023
Merged

Bump rector/rector from 0.17.2 to 0.17.6 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5350c99
Bump rector/rector from 0.17.2 to 0.17.6
dependabot[bot] Jul 16, 2023
a7e0dcf
update vendors
staabm Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": ">=7.4",
"rector/rector": "0.17.2",
"rector/rector": "0.17.6",
"friendsofphp/php-cs-fixer": "3.19.2",
"redaxo/php-cs-fixer-config": "^1.0"
},
Expand Down
24 changes: 12 additions & 12 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions vendor/composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,17 +538,17 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.22",
"version_normalized": "1.10.22.0",
"version": "1.10.25",
"version_normalized": "1.10.25.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287"
"reference": "578f4e70d117f9a90699324c555922800ac38d8c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/97d694dfd4ceb57bcce4e3b38548f13ea62e4287",
"reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c",
"reference": "578f4e70d117f9a90699324c555922800ac38d8c",
"shasum": ""
},
"require": {
Expand All @@ -557,7 +557,7 @@
"conflict": {
"phpstan/phpstan-shim": "*"
},
"time": "2023-06-30T20:04:11+00:00",
"time": "2023-07-06T12:11:37+00:00",
"bin": [
"phpstan",
"phpstan.phar"
Expand Down Expand Up @@ -812,17 +812,17 @@
},
{
"name": "rector/rector",
"version": "0.17.2",
"version_normalized": "0.17.2.0",
"version": "0.17.6",
"version_normalized": "0.17.6.0",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
"reference": "b8f72ff7e4914bb1d1557cc5c6d33898f7fd2bfb"
"reference": "ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/b8f72ff7e4914bb1d1557cc5c6d33898f7fd2bfb",
"reference": "b8f72ff7e4914bb1d1557cc5c6d33898f7fd2bfb",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21",
"reference": "ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21",
"shasum": ""
},
"require": {
Expand All @@ -835,7 +835,7 @@
"rector/rector-phpunit": "*",
"rector/rector-symfony": "*"
},
"time": "2023-06-29T10:03:28+00:00",
"time": "2023-07-14T09:54:15+00:00",
"bin": [
"bin/rector"
],
Expand Down Expand Up @@ -864,7 +864,7 @@
],
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/0.17.2"
"source": "https://github.com/rectorphp/rector/tree/0.17.6"
},
"funding": [
{
Expand Down
16 changes: 8 additions & 8 deletions vendor/composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'c327eda9b337b1fb1da0b8920cc7dd81ffabac26',
'reference' => '5350c997582d6e9b7f8e106762a899d244fa8c4e',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'c327eda9b337b1fb1da0b8920cc7dd81ffabac26',
'reference' => '5350c997582d6e9b7f8e106762a899d244fa8c4e',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -83,9 +83,9 @@
'dev_requirement' => false,
),
'phpstan/phpstan' => array(
'pretty_version' => '1.10.22',
'version' => '1.10.22.0',
'reference' => '97d694dfd4ceb57bcce4e3b38548f13ea62e4287',
'pretty_version' => '1.10.25',
'version' => '1.10.25.0',
'reference' => '578f4e70d117f9a90699324c555922800ac38d8c',
'type' => 'library',
'install_path' => __DIR__ . '/../phpstan/phpstan',
'aliases' => array(),
Expand Down Expand Up @@ -140,9 +140,9 @@
),
),
'rector/rector' => array(
'pretty_version' => '0.17.2',
'version' => '0.17.2.0',
'reference' => 'b8f72ff7e4914bb1d1557cc5c6d33898f7fd2bfb',
'pretty_version' => '0.17.6',
'version' => '0.17.6.0',
'reference' => 'ec40080b9bdaf39eb0c0a9276cd7b4a778c03f21',
'type' => 'library',
'install_path' => __DIR__ . '/../rector/rector',
'aliases' => array(),
Expand Down
Binary file modified vendor/phpstan/phpstan/phpstan.phar
View file
Open in desktop
Binary file not shown.
26 changes: 13 additions & 13 deletions vendor/phpstan/phpstan/phpstan.phar.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmSfNSQACgkQUcZzBf/C
5cA6aQ//b3WfraqV7whXnOMsGgogQWIwv29phncbTZtDhb7qZBeJnVtpbKfCmHkE
JhQJGnpkqc1F+zIMtfp+3I3TKnIoba4Cwx5wIajJxlzVhCLy0armMhFyuZzUl8xu
akgA2thK6ePLiW3++eSDd/Z7ek9bjSraMvOkjF0nUoEwBJ3OW3qPcmFsmWpOC6F0
KJo/C9q1ao6uBFAM5hpOpqmoY2HxeczvIMwTF+/5AC5irBoEaaS7v6MDHS1bAmPC
hl/QlMTfiCrSEzoykJZIN6WDliCcOplKYIWEa+8cnPybcR2XngDURYvLK44lWkhv
IU/CAG2rEB7Fx9SzbDnRGADK+5poSR8x+qEHxceVPxuhrA5IBh0Q/8albAjZAZvA
tpJTTLXIJ0X+Ggln4oBjYUsMpDnJT6fPYf+4aaEnSS+uuI6FLPGyMwJelMMuSMWV
Mp8AUwYZ4GpcA7AbZ2pGpdk5QOWPXILELZiEKbsqbnQ69OqcGJYEY4aeeK4dwCAk
pNDCfHftYyiydptEDR7RB69DuMmuxS9oojbf+9RdUPvYUdh24UX94E1KfCs4lPfx
hVb0qgHIbt8T3ht5vgiYYBhZEuPR/SdSITTFZ6Y2CZX9UmSpORAZqmt1g4M4t/2T
nwjVFKL7MELipF52wRRkUvkTet7GeCtzcQy3qffpUye7vP1+B10=
=sT3J
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmSmr1wACgkQUcZzBf/C
5cD9aw//aNlxvXLBuH+1iir6cwjJU2Ij6BDV5RjRpQHFh0efqELI5h7q+V03cPWV
BhpzfBKvV+au808AOAX9zn7chufyehJ73Fz9qDtqAhZGgB7pklllmY2kRnwb0VsF
r0CqmZ9Or88DC4EirOapCf4VsqQBlGUmz5GiXZZcdi7RpzLlsz0flw9WHTVe/CGl
3WaSxuy6HjwEpLdz+1mrfSaj+dHMZ/1Azg+UKRSIyNwnqJdcu3euk2cp/AQdV2AL
4GkeG2yVN0YmUwcQPxaShVzdaQfGPDuonOs0s7CFTpxDkxoQ/j+OQtC6spYuBAwW
zIsMfdlpPb+NH7R1q35QbMl8m5NyQLjI9LcdQJXssT2OhIcIN5mPpVA9xheVYdtM
wg5TqujGVh6IGkml/7O7OyfRKOmaYxum5p4Eb5A8OUnmTv6aRWrEPMDCy8Gr7MkX
AQ9SJT3qJNa7ViG9wLYgvSLXFTMgf9z0ZfxK5dRYTlNS2cPNtzgz9ySv1rFPqcdc
1sX1ENT5IQHM/+YA98uEWiK9mMKt/MLKYR0DAWCb+dDwMPDYP3nVHI1oXqVsRcxa
nwfq85t+k+L7Nplj/n0/3rHzfM75iMmivEGexe+ZLFIyqoYn+eYsaPU6YwycZi3T
RXbKgLXLCDzVEdbOch9Eg/TlWgNdqpxKlt/x4hK6WLcgzkfga9g=
=5gSM
-----END PGP SIGNATURE-----
2 changes: 1 addition & 1 deletion vendor/rector/rector/bin/rector
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env php
<?php
namespace RectorPrefix202306;
namespace RectorPrefix202307;

require_once __DIR__ . '/rector.php';
8 changes: 4 additions & 4 deletions vendor/rector/rector/bin/rector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

declare (strict_types=1);
namespace RectorPrefix202306;
namespace RectorPrefix202307;

use RectorPrefix202306\Nette\Utils\Json;
use RectorPrefix202307\Nette\Utils\Json;
use Rector\ChangesReporting\Output\JsonOutputFormatter;
use Rector\Core\Bootstrap\RectorConfigsResolver;
use Rector\Core\Configuration\Option;
Expand All @@ -12,8 +12,8 @@
use Rector\Core\DependencyInjection\RectorContainerFactory;
use Rector\Core\Kernel\RectorKernel;
use Rector\Core\Util\Reflection\PrivatesAccessor;
use RectorPrefix202306\Symfony\Component\Console\Command\Command;
use RectorPrefix202306\Symfony\Component\Console\Input\ArgvInput;
use RectorPrefix202307\Symfony\Component\Console\Command\Command;
use RectorPrefix202307\Symfony\Component\Console\Input\ArgvInput;
// @ intentionally: continue anyway
@\ini_set('memory_limit', '-1');
// Performance boost
Expand Down
31 changes: 14 additions & 17 deletions vendor/rector/rector/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?php

declare (strict_types=1);
namespace RectorPrefix202306;
namespace RectorPrefix202307;

use RectorPrefix202306\Composer\Semver\VersionParser;
use RectorPrefix202306\Doctrine\Inflector\Inflector;
use RectorPrefix202306\Doctrine\Inflector\Rules\English\InflectorFactory;
use RectorPrefix202306\OndraM\CiDetector\CiDetector;
use RectorPrefix202307\Composer\Semver\VersionParser;
use RectorPrefix202307\Doctrine\Inflector\Inflector;
use RectorPrefix202307\Doctrine\Inflector\Rules\English\InflectorFactory;
use RectorPrefix202307\OndraM\CiDetector\CiDetector;
use PhpParser\BuilderFactory;
use PhpParser\ConstExprEvaluator;
use PhpParser\Lexer;
use PhpParser\NodeFinder;
use PhpParser\NodeVisitor\CloningVisitor;
use PhpParser\NodeVisitor\ParentConnectingVisitor;
use PHPStan\Analyser\NodeScopeResolver;
use PHPStan\Analyser\ScopeFactory;
use PHPStan\Dependency\DependencyResolver;
Expand Down Expand Up @@ -78,12 +77,13 @@
use Rector\StaticTypeMapper\PhpDoc\PhpDocTypeMapper;
use Rector\Utils\Command\MissingInSetCommand;
use Rector\Utils\Command\OutsideAnySetCommand;
use RectorPrefix202306\Symfony\Component\Console\Application;
use RectorPrefix202306\Symfony\Component\Console\Style\SymfonyStyle;
use function RectorPrefix202306\Symfony\Component\DependencyInjection\Loader\Configurator\service;
use function RectorPrefix202306\Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
use RectorPrefix202306\Symfony\Component\Filesystem\Filesystem;
use RectorPrefix202306\Symplify\EasyParallel\ValueObject\EasyParallelConfig;
use RectorPrefix202307\Symfony\Component\Console\Application;
use RectorPrefix202307\Symfony\Component\Console\Command\Command;
use RectorPrefix202307\Symfony\Component\Console\Style\SymfonyStyle;
use function RectorPrefix202307\Symfony\Component\DependencyInjection\Loader\Configurator\service;
use function RectorPrefix202307\Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
use RectorPrefix202307\Symfony\Component\Filesystem\Filesystem;
use RectorPrefix202307\Symplify\EasyParallel\ValueObject\EasyParallelConfig;
return static function (RectorConfig $rectorConfig) : void {
// make use of https://github.com/symplify/easy-parallel
$rectorConfig->import(EasyParallelConfig::FILE_PATH);
Expand All @@ -98,7 +98,6 @@
$rectorConfig->importShortClasses();
$rectorConfig->indent(' ', 4);
$rectorConfig->fileExtensions(['php']);
$rectorConfig->nestedChainMethodCallLimit(120);
$rectorConfig->cacheDirectory(\sys_get_temp_dir() . '/rector_cached_files');
$rectorConfig->containerCacheDirectory(\sys_get_temp_dir());
$services = $rectorConfig->services();
Expand Down Expand Up @@ -134,13 +133,13 @@
foreach ($extensionConfigFiles as $extensionConfigFile) {
$rectorConfig->import($extensionConfigFile);
}
$services->load('Rector\\Core\\', __DIR__ . '/../src')->exclude([__DIR__ . '/../src/Rector', __DIR__ . '/../src/Console/Style/RectorConsoleOutputStyle.php', __DIR__ . '/../src/Exception', __DIR__ . '/../src/DependencyInjection/CompilerPass', __DIR__ . '/../src/DependencyInjection/Loader', __DIR__ . '/../src/Kernel', __DIR__ . '/../src/ValueObject', __DIR__ . '/../src/Bootstrap', __DIR__ . '/../src/Enum', __DIR__ . '/../src/functions', __DIR__ . '/../src/PhpParser/Node/CustomNode', __DIR__ . '/../src/PhpParser/ValueObject', __DIR__ . '/../src/constants.php']);
$services->load('Rector\\Core\\', __DIR__ . '/../src')->exclude([__DIR__ . '/../src/Rector', __DIR__ . '/../src/Console/Style/RectorConsoleOutputStyle.php', __DIR__ . '/../src/Exception', __DIR__ . '/../src/DependencyInjection/CompilerPass', __DIR__ . '/../src/DependencyInjection/Loader', __DIR__ . '/../src/Kernel', __DIR__ . '/../src/ValueObject', __DIR__ . '/../src/Bootstrap', __DIR__ . '/../src/Enum', __DIR__ . '/../src/functions', __DIR__ . '/../src/PhpParser/Node/CustomNode', __DIR__ . '/../src/PhpParser/ValueObject', __DIR__ . '/../src/PHPStan/NodeVisitor', __DIR__ . '/../src/constants.php']);
$services->set(ConsoleApplication::class)->arg('$commands', tagged_iterator(Command::class));
$services->alias(Application::class, ConsoleApplication::class);
$services->set(EmptyConfigurableRectorCollector::class)->arg('$containerBuilder', service('service_container'));
$services->set(SimpleCallableNodeTraverser::class);
$services->set(BuilderFactory::class);
$services->set(CloningVisitor::class);
$services->set(ParentConnectingVisitor::class);
$services->set(NodeFinder::class);
$services->set(RectorConsoleOutputStyle::class)->factory([service(RectorConsoleOutputStyleFactory::class), 'create']);
$services->set(Parser::class)->factory([service(PHPStanServicesFactory::class), 'createPHPStanParser']);
Expand Down Expand Up @@ -169,12 +168,10 @@
if (\class_exists(MissingInSetCommand::class)) {
$services->set(MissingInSetCommand::class);
$services->set(OutsideAnySetCommand::class);
$services->get(ConsoleApplication::class)->call('add', [service(MissingInSetCommand::class)])->call('add', [service(OutsideAnySetCommand::class)]);
}
if (\class_exists(InitRecipeCommand::class)) {
$services->set(InitRecipeCommand::class);
$services->set(GenerateCommand::class);
$services->get(ConsoleApplication::class)->call('add', [service(InitRecipeCommand::class)])->call('add', [service(GenerateCommand::class)]);
}
// phpdoc parser
$services->set(SmartPhpParser::class)->factory([service(SmartPhpParserFactory::class), 'create']);
Expand Down
5 changes: 0 additions & 5 deletions vendor/rector/rector/config/phpstan/static-reflection.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@ parameters:
featureToggles:
disableRuntimeReflectionProvider: false

conditionalTags:
PhpParser\NodeVisitor\ParentConnectingVisitor:
phpstan.parser.richParserNodeVisitor: true

services:
- Rector\NodeTypeResolver\Reflection\BetterReflection\RectorBetterReflectionSourceLocatorFactory
- Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator
- Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider
- PhpParser\NodeVisitor\ParentConnectingVisitor

# basically decorates native PHPStan source locator with a dynamic source locator that is also available in Rector DI
betterReflectionSourceLocator:
Expand Down
Loading
Loading