Skip to content

Commit

Permalink
Updated Rector to commit cbefb24
Browse files Browse the repository at this point in the history
rectorphp/rector-src@cbefb24 [TypeDeclaration] Avoid adding param type in case of different default type (#1956)
  • Loading branch information
TomasVotruba committed Mar 23, 2022
1 parent 65f6a3f commit 9728a66
Show file tree
Hide file tree
Showing 1,991 changed files with 13,241 additions and 13,224 deletions.
2 changes: 1 addition & 1 deletion bin/rector
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env php
<?php
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

require_once __DIR__ . '/rector.php';
22 changes: 11 additions & 11 deletions bin/rector.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php

declare (strict_types=1);
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

use RectorPrefix20220322\Nette\Utils\Json;
use RectorPrefix20220323\Nette\Utils\Json;
use Rector\ChangesReporting\Output\JsonOutputFormatter;
use Rector\Core\Bootstrap\RectorConfigsResolver;
use Rector\Core\Configuration\Option;
use Rector\Core\Console\ConsoleApplication;
use Rector\Core\Console\Style\RectorConsoleOutputStyleFactory;
use Rector\Core\DependencyInjection\RectorContainerFactory;
use Rector\Core\Kernel\RectorKernel;
use RectorPrefix20220322\Symfony\Component\Console\Command\Command;
use RectorPrefix20220322\Symfony\Component\Console\Input\ArgvInput;
use RectorPrefix20220322\Symplify\PackageBuilder\Reflection\PrivatesCaller;
use RectorPrefix20220323\Symfony\Component\Console\Command\Command;
use RectorPrefix20220323\Symfony\Component\Console\Input\ArgvInput;
use RectorPrefix20220323\Symplify\PackageBuilder\Reflection\PrivatesCaller;
// @ intentionally: continue anyway
@\ini_set('memory_limit', '-1');
// Performance boost
Expand All @@ -22,7 +22,7 @@
\gc_disable();
\define('__RECTOR_RUNNING__', \true);
// Require Composer autoload.php
$autoloadIncluder = new \RectorPrefix20220322\AutoloadIncluder();
$autoloadIncluder = new \RectorPrefix20220323\AutoloadIncluder();
$autoloadIncluder->includeDependencyOrRepositoryVendorAutoloadIfExists();
if (\file_exists(__DIR__ . '/../preload.php') && \is_dir(__DIR__ . '/../vendor')) {
require_once __DIR__ . '/../preload.php';
Expand All @@ -39,18 +39,18 @@
$container = $rectorContainerFactory->createFromBootstrapConfigs($bootstrapConfigs);
} catch (\Throwable $throwable) {
// for json output
$argvInput = new \RectorPrefix20220322\Symfony\Component\Console\Input\ArgvInput();
$argvInput = new \RectorPrefix20220323\Symfony\Component\Console\Input\ArgvInput();
$outputFormat = $argvInput->getParameterOption('--' . \Rector\Core\Configuration\Option::OUTPUT_FORMAT);
// report fatal error in json format
if ($outputFormat === \Rector\ChangesReporting\Output\JsonOutputFormatter::NAME) {
echo \RectorPrefix20220322\Nette\Utils\Json::encode(['fatal_errors' => [$throwable->getMessage()]]);
echo \RectorPrefix20220323\Nette\Utils\Json::encode(['fatal_errors' => [$throwable->getMessage()]]);
} else {
// report fatal errors in console format
$rectorConsoleOutputStyleFactory = new \Rector\Core\Console\Style\RectorConsoleOutputStyleFactory(new \RectorPrefix20220322\Symplify\PackageBuilder\Reflection\PrivatesCaller());
$rectorConsoleOutputStyleFactory = new \Rector\Core\Console\Style\RectorConsoleOutputStyleFactory(new \RectorPrefix20220323\Symplify\PackageBuilder\Reflection\PrivatesCaller());
$rectorConsoleOutputStyle = $rectorConsoleOutputStyleFactory->create();
$rectorConsoleOutputStyle->error($throwable->getMessage());
}
exit(\RectorPrefix20220322\Symfony\Component\Console\Command\Command::FAILURE);
exit(\RectorPrefix20220323\Symfony\Component\Console\Command\Command::FAILURE);
}
/** @var ConsoleApplication $application */
$application = $container->get(\Rector\Core\Console\ConsoleApplication::class);
Expand Down Expand Up @@ -117,4 +117,4 @@ public function loadIfExistsAndNotLoadedYet(string $filePath) : void
require_once $filePath;
}
}
\class_alias('RectorPrefix20220322\\AutoloadIncluder', 'AutoloadIncluder', \false);
\class_alias('RectorPrefix20220323\\AutoloadIncluder', 'AutoloadIncluder', \false);
2 changes: 1 addition & 1 deletion config/config.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

declare (strict_types=1);
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

use Rector\Core\Bootstrap\ExtensionConfigResolver;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
Expand Down
6 changes: 3 additions & 3 deletions config/parameters.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

declare (strict_types=1);
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

use RectorPrefix20220322\OndraM\CiDetector\CiDetector;
use RectorPrefix20220323\OndraM\CiDetector\CiDetector;
use Rector\Caching\ValueObject\Storage\MemoryCacheStorage;
use Rector\Core\Configuration\Option;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
Expand Down Expand Up @@ -32,7 +32,7 @@
$parameters->set(\Rector\Core\Configuration\Option::CACHE_DIR, \sys_get_temp_dir() . '/rector_cached_files');
// use faster in-memory cache in CI.
// CI always starts from scratch, therefore IO intensive caching is not worth it
$ciDetector = new \RectorPrefix20220322\OndraM\CiDetector\CiDetector();
$ciDetector = new \RectorPrefix20220323\OndraM\CiDetector\CiDetector();
if ($ciDetector->isCiDetected()) {
$parameters->set(\Rector\Core\Configuration\Option::CACHE_CLASS, \Rector\Caching\ValueObject\Storage\MemoryCacheStorage::class);
}
Expand Down
10 changes: 5 additions & 5 deletions config/services-packages.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

declare (strict_types=1);
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use RectorPrefix20220322\Symplify\EasyParallel\ValueObject\EasyParallelConfig;
use RectorPrefix20220322\Symplify\PackageBuilder\Yaml\ParametersMerger;
use RectorPrefix20220323\Symplify\EasyParallel\ValueObject\EasyParallelConfig;
use RectorPrefix20220323\Symplify\PackageBuilder\Yaml\ParametersMerger;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
// make use of https://github.com/symplify/easy-parallel
$containerConfigurator->import(\RectorPrefix20220322\Symplify\EasyParallel\ValueObject\EasyParallelConfig::FILE_PATH);
$containerConfigurator->import(\RectorPrefix20220323\Symplify\EasyParallel\ValueObject\EasyParallelConfig::FILE_PATH);
$services = $containerConfigurator->services();
$services->defaults()->public()->autowire()->autoconfigure();
$services->load('Rector\\', __DIR__ . '/../packages')->exclude([
Expand All @@ -23,5 +23,5 @@
__DIR__ . '/../packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php',
]);
// parallel
$services->set(\RectorPrefix20220322\Symplify\PackageBuilder\Yaml\ParametersMerger::class);
$services->set(\RectorPrefix20220323\Symplify\PackageBuilder\Yaml\ParametersMerger::class);
};
2 changes: 1 addition & 1 deletion config/services-rules.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

declare (strict_types=1);
namespace RectorPrefix20220322;
namespace RectorPrefix20220323;

use Rector\PSR4\Composer\PSR4NamespaceMatcher;
use Rector\PSR4\Contract\PSR4AutoloadNamespaceMatcherInterface;
Expand Down
Loading

0 comments on commit 9728a66

Please sign in to comment.