Merge pull request #400 from doctrine/cleanup-code

cleanup code

composer.json

@@ -38,6 +38,7 @@
         "symfony/console": "< 4"
     },
     "require-dev": {
+        "ext-libxml": "*",
         "doctrine/doctrine-bundle": "^2.0.3",
         "doctrine/phpcr-odm": "2.x-dev",
         "doctrine/orm": "^2.0 || ^3.0",

src/Command/PhpcrShellCommand.php

@@ -77,10 +77,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         // If no arguments supplied, launch the shell with the embedded application
         if ($launchShell) {
-            $shell = PhpcrShell::createEmbeddedShell($session);
-            $exitCode = $shell->run();
+            PhpcrShell::createEmbeddedShell($session)->run();
 
-            return $exitCode;
+            return 0;
         }
 
         // else try and run the command using the given input

src/DataCollector/StopWatchLogger.php

@@ -11,11 +11,8 @@
  */
 final class StopWatchLogger implements LoggerInterface
 {
-    private ?Stopwatch $stopwatch;
-
-    public function __construct(?Stopwatch $stopwatch = null)
+    public function __construct(private ?Stopwatch $stopwatch = null)
     {
-        $this->stopwatch = $stopwatch;
     }
 
     public function startCall($method, ?array $params = null, ?array $env = null): void

src/DataFixtures/PHPCRExecutor.php

@@ -14,16 +14,12 @@
  */
 final class PHPCRExecutor extends BasePHPCRExecutor
 {
-    private ?InitializerManager $initializerManager;
-
     public function __construct(
         DocumentManagerInterface $dm,
         ?PHPCRPurger $purger = null,
-        ?InitializerManager $initializerManager = null
+        private ?InitializerManager $initializerManager = null
     ) {
         parent::__construct($dm, $purger);
-
-        $this->initializerManager = $initializerManager;
     }
 
     public function purge(): void

src/DependencyInjection/Configuration.php

@@ -343,7 +343,7 @@ private function getOdmDocumentManagersNode(): NodeDefinition
         return $root;
     }
 
-    private function getOdmCacheDriverNode($name): NodeDefinition
+    private function getOdmCacheDriverNode(string $name): NodeDefinition
     {
         $root = (new TreeBuilder($name))->getRootNode();
 

src/DependencyInjection/DoctrinePHPCRExtension.php

@@ -28,34 +28,25 @@
  */
 final class DoctrinePHPCRExtension extends AbstractDoctrineExtension
 {
-    /**
-     * @var string
-     */
-    private $defaultSession;
+    private string $defaultSession;
 
     /**
      * @var string[]
      */
-    private $sessions = [];
+    private array $sessions = [];
 
-    /**
-     * @var XmlFileLoader
-     */
-    private $loader;
+    private XmlFileLoader $loader;
 
-    /**
-     * @var bool
-     */
-    private $disableProxyWarmer = false;
+    private bool $disableProxyWarmer = false;
 
     /**
      * Whether the schema listener service has been loaded already.
      *
      * This is done the first time a session with jackalope-doctrine-dbal is encountered.
      */
-    private $dbalSchemaListenerLoaded = false;
+    private bool $dbalSchemaListenerLoaded = false;
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = new Configuration();
@@ -107,10 +98,10 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->removeDefinition('doctrine_phpcr.odm.proxy_cache_warmer');
             }
         }
-        $this->loadTypeGuess($config, $container);
+        $this->loadTypeGuess($container);
     }
 
-    private function loadTypeGuess($config, ContainerBuilder $container): void
+    private function loadTypeGuess(ContainerBuilder $container): void
     {
         $types = [];
 
@@ -122,7 +113,7 @@ private function loadTypeGuess($config, ContainerBuilder $container): void
         $container->setParameter('doctrine_phpcr.form.type_guess', $types);
     }
 
-    private function sessionLoad($config, ContainerBuilder $container): void
+    private function sessionLoad(array $config, ContainerBuilder $container): void
     {
         $sessions = $loaded = [];
         foreach ($config['sessions'] as $name => $session) {
@@ -170,7 +161,7 @@ private function sessionLoad($config, ContainerBuilder $container): void
         $container->setAlias(SessionInterface::class, new Alias($sessions[$config['default_session']], true));
     }
 
-    private function loadJackalopeSession(array $session, ContainerBuilder $container, $type, $admin = false): void
+    private function loadJackalopeSession(array $session, ContainerBuilder $container, string $type, bool|string $admin = false): void
     {
         $serviceNamePrefix = $admin ? '.admin' : '';
         $backendParameters = [];
@@ -598,7 +589,7 @@ protected function getMappingResourceExtension(): string
         return 'phpcr';
     }
 
-    public function getNamespace()
+    public function getNamespace(): string
     {
         return 'http://doctrine-project.org/schema/symfony-dic/odm/phpcr';
     }

src/EventListener/JackalopeDoctrineDbalSchemaListener.php

@@ -17,14 +17,9 @@
  */
 class JackalopeDoctrineDbalSchemaListener
 {
-    /**
-     * @var RepositorySchema
-     */
-    private $schema;
-
-    public function __construct(RepositorySchema $schema)
-    {
-        $this->schema = $schema;
+    public function __construct(
+        private RepositorySchema $schema
+    ) {
     }
 
     public function postGenerateSchema(GenerateSchemaEventArgs $args): void

src/Form/Type/DocumentType.php

@@ -17,13 +17,20 @@
 namespace Doctrine\Bundle\PHPCRBundle\Form\Type;
 
 use Doctrine\Bundle\PHPCRBundle\Form\ChoiceList\PhpcrOdmQueryBuilderLoader;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
+use Doctrine\ODM\PHPCR\Query\Builder\QueryBuilder;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
 
 class DocumentType extends DoctrineType
 {
-    public function getLoader($manager, $queryBuilder, $class): EntityLoaderInterface
+    public function getLoader(ObjectManager $manager, object $queryBuilder, string $class): EntityLoaderInterface
     {
+        if (!$manager instanceof DocumentManagerInterface || !($queryBuilder instanceof QueryBuilder || $queryBuilder instanceof \Closure)) {
+            throw new \InvalidArgumentException('Expected a '.DocumentManagerInterface::class.' and a closure or '.QueryBuilder::class.', got '.get_class($manager).' and '.get_class($queryBuilder));
+        }
+
         return new PhpcrOdmQueryBuilderLoader(
             $queryBuilder,
             $manager,

src/Form/Type/PHPCRReferenceType.php

@@ -29,21 +29,14 @@ public function __construct(?SessionInterface $session = null)
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        switch (strtolower($options['transformer_type'])) {
-            case 'uuid':
-                $transformer = new PHPCRNodeToUuidTransformer($this->session);
-
-                break;
-            case 'path':
-                $transformer = new PHPCRNodeToPathTransformer($this->session);
-
-                break;
-            default:
-                throw new InvalidConfigurationException(sprintf('
+        $transformer = match (strtolower($options['transformer_type'])) {
+            'uuid' => new PHPCRNodeToUuidTransformer($this->session),
+            'path' => new PHPCRNodeToPathTransformer($this->session),
+            default => throw new InvalidConfigurationException(sprintf('
                     The option "transformer_type" must be either "uuid" or "path", "%s" given',
-                    $options['transformer_type']
-                ));
-        }
+                $options['transformer_type']
+            )),
+        };
 
         $builder->addModelTransformer($transformer);
     }

src/OptionalCommand/ODM/LoadFixtureCommand.php

@@ -98,8 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $paths = \is_array($dirOrFile) ? $dirOrFile : [$dirOrFile];
         } else {
             $kernel = $application->getKernel();
-            $projectDir = method_exists($kernel, 'getRootDir') ? $kernel->getRootDir() : $kernel->getProjectDir().'/src';
-            $paths = [$projectDir.'/DataFixtures/PHPCR'];
+            $paths = [$kernel->getProjectDir().'/src/DataFixtures/PHPCR'];
             foreach ($kernel->getBundles() as $bundle) {
                 $paths[] = $bundle->getPath().'/DataFixtures/PHPCR';
             }

tests/Functional/Form/PHPCRTypeGuesserTest.php

@@ -346,7 +346,8 @@ private function renderForm(FormBuilderInterface $formBuilder): void
      * Assert that the form element has an inner type of type $typeClass and
      * the specified options with their values.
      *
-     * @param array $options keys are option names, values the expected option values
+     * @param array        $options   keys are option names, values the expected option values
+     * @param class-string $typeClass
      */
     private function assertFormType(FormBuilderInterface $element, string $typeClass, array $options): void
     {

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -28,7 +28,7 @@ protected function getConfiguration(): ConfigurationInterface
      */
     public function testSupports(array $expectedConfiguration, array $files): void
     {
-        $formats = array_map(function ($path) {
+        $formats = array_map(static function ($path) {
             return __DIR__.'/../../Fixtures/fixtures/'.$path;
         }, $files);