Fix deprecated ref() to service() function, skip empty file (#5112)

* composer: bump to symfony/dependency-injection 5.1, required as minimum by other deps anyway

* use service() over deprecated ref()

* skip empty files

* skip just created props

composer.json

@@ -28,7 +28,7 @@
         "sebastian/diff": "^4.0",
         "symfony/cache": "^4.4.8|^5.1",
         "symfony/console": "^4.4.8|^5.1",
-        "symfony/dependency-injection": "^4.4.8|^5.1",
+        "symfony/dependency-injection": "^5.1",
         "symfony/finder": "^4.4.8|^5.1",
         "symfony/http-kernel": "^4.4.8|^5.1",
         "symplify/autowire-array-parameter": "^9.0.21",

config/services.php

@@ -20,7 +20,7 @@ use Symfony\Component\Console\Application as SymfonyApplication;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use Symfony\Component\Filesystem\Filesystem;
 use Symplify\PackageBuilder\Console\Command\CommandNaming;
 use Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
@@ -65,10 +65,10 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->set(NodeFinder::class);
 
     $services->set(Parser::class)
-        ->factory([ref(NikicPhpParserFactory::class), 'create']);
+        ->factory([service(NikicPhpParserFactory::class), 'create']);
 
     $services->set(Lexer::class)
-        ->factory([ref(PhpParserLexerFactory::class), 'create']);
+        ->factory([service(PhpParserLexerFactory::class), 'create']);
 
     // symplify/package-builder
     $services->set(Filesystem::class);
@@ -78,10 +78,10 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->set(FileSystemFilter::class);
     $services->set(ParameterProvider::class);
     $services->set(ParameterProvider::class)
-        ->arg('$container', ref('service_container'));
+        ->arg('$container', service('service_container'));
 
     $services->set(RectorClassesProvider::class)
-        ->arg('$container', ref('service_container'));
+        ->arg('$container', service('service_container'));
 
     $services->set(CommandNaming::class);
 
@@ -91,12 +91,12 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->set(SymfonyStyleFactory::class);
     $services->set(SymfonyStyle::class)
-        ->factory([ref(SymfonyStyleFactory::class), 'create']);
+        ->factory([service(SymfonyStyleFactory::class), 'create']);
 
     $services->set(InflectorFactory::class);
 
     $services->set(Inflector::class)
-        ->factory([ref(InflectorFactory::class), 'build']);
+        ->factory([service(InflectorFactory::class), 'build']);
 
     $services->set(VersionParser::class);
 };

packages/caching/config/config.php

@@ -14,7 +14,7 @@ use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
 use Symfony\Component\Cache\Psr16Cache;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $parameters = $containerConfigurator->parameters();
@@ -32,20 +32,20 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->load('Rector\Caching\\', __DIR__ . '/../src');
 
     $services->set(DependencyResolver::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createDependencyResolver']);
+        ->factory([service(PHPStanServicesFactory::class), 'createDependencyResolver']);
 
     $services->set(FileHelper::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createFileHelper']);
+        ->factory([service(PHPStanServicesFactory::class), 'createFileHelper']);
 
     $services->set(Psr16Cache::class);
 
     $services->alias(CacheInterface::class, Psr16Cache::class);
 
     $services->set(FilesystemAdapter::class)
-        ->factory([ref(FilesystemAdapterFactory::class), 'create']);
+        ->factory([service(FilesystemAdapterFactory::class), 'create']);
 
     $services->set(TagAwareAdapter::class)
-        ->arg('$itemsPool', ref(FilesystemAdapter::class));
+        ->arg('$itemsPool', service(FilesystemAdapter::class));
 
     $services->alias(CacheItemPoolInterface::class, FilesystemAdapter::class);
 

packages/console-differ/config/config.php

@@ -9,7 +9,7 @@ use SebastianBergmann\Diff\Differ;
 use SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder;
 use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use Symplify\ConsoleColorDiff\Console\Formatter\ColorConsoleDiffFormatter;
 use Symplify\ConsoleColorDiff\Console\Output\ConsoleDiffer;
 
@@ -24,10 +24,10 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->load('Rector\ConsoleDiffer\\', __DIR__ . '/../src');
 
     $services->set(DifferAndFormatter::class)
-        ->arg('$differ', ref('differ'));
+        ->arg('$differ', service('differ'));
 
     $services->set(MarkdownDifferAndFormatter::class)
-        ->arg('$markdownDiffer', ref('markdownDiffer'));
+        ->arg('$markdownDiffer', service('markdownDiffer'));
 
     $services->set('diffOutputBuilder', StrictUnifiedDiffOutputBuilder::class)
         ->arg('$options', [
@@ -36,13 +36,13 @@ return static function (ContainerConfigurator $containerConfigurator): void {
         ]);
 
     $services->set('differ', Differ::class)
-        ->arg('$outputBuilder', ref('diffOutputBuilder'));
+        ->arg('$outputBuilder', service('diffOutputBuilder'));
 
     $services->set('markdownDiffOutputBuilder', UnifiedDiffOutputBuilder::class)
-        ->factory([ref(CompleteUnifiedDiffOutputBuilderFactory::class), 'create']);
+        ->factory([service(CompleteUnifiedDiffOutputBuilderFactory::class), 'create']);
 
     $services->set('markdownDiffer', Differ::class)
-        ->arg('$outputBuilder', ref('markdownDiffOutputBuilder'));
+        ->arg('$outputBuilder', service('markdownDiffOutputBuilder'));
 
     $services->set(ColorConsoleDiffFormatter::class);
 

packages/node-type-resolver/config/config.php

@@ -14,7 +14,7 @@ use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $parameters = $containerConfigurator->parameters();
@@ -37,16 +37,16 @@ return static function (ContainerConfigurator $containerConfigurator): void {
     $services->set(BetterNodeFinder::class);
 
     $services->set(ReflectionProvider::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createReflectionProvider']);
+        ->factory([service(PHPStanServicesFactory::class), 'createReflectionProvider']);
 
     $services->set(NodeScopeResolver::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createNodeScopeResolver']);
+        ->factory([service(PHPStanServicesFactory::class), 'createNodeScopeResolver']);
 
     $services->set(ScopeFactory::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createScopeFactory']);
+        ->factory([service(PHPStanServicesFactory::class), 'createScopeFactory']);
 
     $services->set(TypeNodeResolver::class)
-        ->factory([ref(PHPStanServicesFactory::class), 'createTypeNodeResolver']);
+        ->factory([service(PHPStanServicesFactory::class), 'createTypeNodeResolver']);
 
     $services->set(NodeConnectingVisitor::class);
 };

packages/rector-generator/config/config.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Rector\RectorGenerator\Rector\Closure\AddNewServiceToSymfonyPhpConfigRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use Symplify\SmartFileSystem\FileSystemGuard;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -14,7 +14,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
         ->public()
         ->autowire()
         ->autoconfigure()
-        ->bind(AddNewServiceToSymfonyPhpConfigRector::class, ref(AddNewServiceToSymfonyPhpConfigRector::class));
+        ->bind(AddNewServiceToSymfonyPhpConfigRector::class, service(AddNewServiceToSymfonyPhpConfigRector::class));
 
     $services->load('Rector\RectorGenerator\\', __DIR__ . '/../src')
         ->exclude([__DIR__ . '/../src/Exception', __DIR__ . '/../src/ValueObject', __DIR__ . '/../src/Rector']);

rules/naming/src/ValueObjectFactory/PropertyRenameFactory.php

@@ -41,12 +41,12 @@ final class PropertyRenameFactory
 
         $propertyClassLike = $property->getAttribute(AttributeKey::CLASS_NODE);
         if ($propertyClassLike === null) {
-            throw new ShouldNotHappenException("There shouldn't be a property without AttributeKey::CLASS_NODE");
+            return null;
         }
 
         $propertyClassLikeName = $property->getAttribute(AttributeKey::CLASS_NAME);
         if ($propertyClassLikeName === null) {
-            throw new ShouldNotHappenException("There shouldn't be a property without AttributeKey::CLASS_NAME");
+            return null;
         }
 
         return new PropertyRename(

src/FileSystem/FilesFinder.php

@@ -124,6 +124,8 @@ final class FilesFinder
         $finder = Finder::create()
             ->followLinks()
             ->files()
+            // skip empty files
+            ->size('> 0')
             ->in($absoluteDirectories)
             ->name($suffixesPattern)
             ->sortByName();