octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-28 23:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 6e2915c8346af65687dcadfe6e1c4f4b9de6fa16

Browse Source 
6e2915c834 Cleanup of SmartFileSystem (#2854)
This commit is contained in:
Tomas Votruba 2022-08-29 23:07:20 +00:00
parent c2b6d2f759
commit b6b911feb8
7 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.php
View File

@ -127,8 +127,6 @@ return static function (RectorConfig $rectorConfig) : void {
$services->set(FinderSanitizer::class);
$services->set(FileSystemFilter::class);
$services->set(ParameterProvider::class)->arg('$container', service('service_container'));
$services->set(SmartFileSystem::class);
$services->set(JsonFileSystem::class);
$services->set(InflectorFactory::class);
$services->set(Inflector::class)->factory([service(InflectorFactory::class), 'build']);
$services->set(VersionParser::class);

1
packages/Caching/ValueObject/Storage/FileCacheStorage.php
View File

@ -10,7 +10,6 @@ use Rector\Caching\Contract\ValueObject\Storage\CacheStorageInterface;
use Rector\Caching\ValueObject\CacheFilePaths;
use Rector\Caching\ValueObject\CacheItem;
use Rector\Core\Exception\Cache\CachingException;
use RectorPrefix202208\Symplify\SmartFileSystem\SmartFileSystem;
/**
* Inspired by https://github.com/phpstan/phpstan-src/blob/1e7ceae933f07e5a250b61ed94799e6c2ea8daa2/src/Cache/FileCacheStorage.php
* @see \Rector\Tests\Caching\ValueObject\Storage\FileCacheStorageTest

15
rules/PSR4/Composer/PSR4AutoloadPathsProvider.php
View File

@ -3,23 +3,15 @@
declare (strict_types=1);
namespace Rector\PSR4\Composer;
use RectorPrefix202208\Nette\Utils\FileSystem;
use RectorPrefix202208\Nette\Utils\Json;
use RectorPrefix202208\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonSection;
use RectorPrefix202208\Symplify\SmartFileSystem\Json\JsonFileSystem;
final class PSR4AutoloadPathsProvider
{
/**
* @var array<string, array<string, string>>
*/
private $cachedComposerJsonPSR4AutoloadPaths = [];
/**
* @readonly
* @var \Symplify\SmartFileSystem\Json\JsonFileSystem
*/
private $jsonFileSystem;
public function __construct(JsonFileSystem $jsonFileSystem)
{
$this->jsonFileSystem = $jsonFileSystem;
}
/**
* @return array<string, string|string[]>
*/
@ -28,7 +20,8 @@ final class PSR4AutoloadPathsProvider
if ($this->cachedComposerJsonPSR4AutoloadPaths !== []) {
return $this->cachedComposerJsonPSR4AutoloadPaths;
}
$composerJson = $this->jsonFileSystem->loadFilePathToJson($this->getComposerJsonPath());
$fileContents = FileSystem::read($this->getComposerJsonPath());
$composerJson = Json::decode($fileContents, Json::FORCE_ARRAY);
$psr4Autoloads = \array_merge($composerJson[ComposerJsonSection::AUTOLOAD]['psr-4'] ?? [], $composerJson[ComposerJsonSection::AUTOLOAD_DEV]['psr-4'] ?? []);
$this->cachedComposerJsonPSR4AutoloadPaths = $this->removeEmptyNamespaces($psr4Autoloads);
return $this->cachedComposerJsonPSR4AutoloadPaths;

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '1a7e63bca3c024b25c99cd0d11f2a1eda2dd8609';
public const PACKAGE_VERSION = '6e2915c8346af65687dcadfe6e1c4f4b9de6fa16';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-30 00:38:34';
public const RELEASE_DATE = '2022-08-30 01:03:02';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitb23d7a729708042650a6f0853a19c73a
class ComposerAutoloaderInit3548c7d49b7911f9646a6f24fdd7ef81
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitb23d7a729708042650a6f0853a19c73a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitb23d7a729708042650a6f0853a19c73a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3548c7d49b7911f9646a6f24fdd7ef81', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitb23d7a729708042650a6f0853a19c73a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3548c7d49b7911f9646a6f24fdd7ef81', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitb23d7a729708042650a6f0853a19c73a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit3548c7d49b7911f9646a6f24fdd7ef81::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitb23d7a729708042650a6f0853a19c73a::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit3548c7d49b7911f9646a6f24fdd7ef81::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequireb23d7a729708042650a6f0853a19c73a($fileIdentifier, $file);
composerRequire3548c7d49b7911f9646a6f24fdd7ef81($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitb23d7a729708042650a6f0853a19c73a
* @param string $file
* @return void
*/
function composerRequireb23d7a729708042650a6f0853a19c73a($fileIdentifier, $file)
function composerRequire3548c7d49b7911f9646a6f24fdd7ef81($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

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