Merge pull request #874 from doctrine/cs-fixes

dbu · web-flow · commit b9b6da8b476d · 2025-03-23T11:06:51.000+01:00
fix codestyle issues and remove obsolete code for PHP 7 support
diff --git a/lib/Doctrine/ODM/PHPCR/DocumentManagerInterface.php b/lib/Doctrine/ODM/PHPCR/DocumentManagerInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/lib/Doctrine/ODM/PHPCR/Id/IdException.php b/lib/Doctrine/ODM/PHPCR/Id/IdException.php
@@ -72,7 +72,7 @@ public static function conflictingChildName(
         string $parentFieldName,
         string $fieldNodeName,
         object $childDocument,
-        string $childNodeName
+        string $childNodeName,
     ): self {
         $message = sprintf(
             '%s discovered as new child of %s in field "%s" has a node name '.
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/MixedReferrers.php b/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/MixedReferrers.php
@@ -8,7 +8,7 @@
 final class MixedReferrers implements MappingAttribute
 {
     public function __construct(
-        public ?string $referenceType = null
+        public ?string $referenceType = null,
     ) {
     }
 }
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/ParentDocument.php b/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/ParentDocument.php
@@ -15,7 +15,7 @@ final class ParentDocument implements MappingAttribute
     public ?array $cascade;
 
     public function __construct(
-        string|array|null $cascade = null
+        string|array|null $cascade = null,
     ) {
         $this->cascade = null === $cascade ? null : (array) $cascade;
     }
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/Reference.php b/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/Reference.php
@@ -18,7 +18,7 @@ public function __construct(
         public ?string $property = null,
         public ?string $targetDocument = null,
         public string $strategy = 'weak',
-        array|string|null $cascade = null
+        array|string|null $cascade = null,
     ) {
         $this->cascade = null === $cascade ? null : (array) $cascade;
     }
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/Referrers.php b/lib/Doctrine/ODM/PHPCR/Mapping/Attributes/Referrers.php
@@ -15,7 +15,7 @@ final class Referrers implements MappingAttribute
     public function __construct(
         public string $referencedBy,
         public string $referringDocument,
-        array|string|null $cascade = null
+        array|string|null $cascade = null,
     ) {
         $this->cascade = null === $cascade ? null : (array) $cascade;
     }
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Driver/AttributeDriver.php b/lib/Doctrine/ODM/PHPCR/Mapping/Driver/AttributeDriver.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/PHPCR/Mapping/Driver/XmlDriver.php
@@ -276,13 +276,7 @@ private function addReferenceMapping(PhpcrClassMetadata $class, \SimpleXMLElemen
     protected function loadMappingFile($file): array
     {
         $result = [];
-        if (\PHP_VERSION_ID < 80000) {
-            $entity = libxml_disable_entity_loader(true);
-        }
         $xmlElement = simplexml_load_string(file_get_contents($file));
-        if (\PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader($entity);
-        }
 
         foreach (['document', 'mapped-superclass'] as $type) {
             if (isset($xmlElement->$type)) {
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Builder/ConverterPhpcr.php b/lib/Doctrine/ODM/PHPCR/Query/Builder/ConverterPhpcr.php
@@ -64,7 +64,7 @@ class ConverterPhpcr extends ConverterBase
 
     public function __construct(
         DocumentManagerInterface $dm,
-        QueryObjectModelFactoryInterface $qomf
+        QueryObjectModelFactoryInterface $qomf,
     ) {
         $this->qomf = $qomf;
         $this->mdf = $dm->getMetadataFactory();
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Builder/QueryBuilder.php b/lib/Doctrine/ODM/PHPCR/Query/Builder/QueryBuilder.php
@@ -24,7 +24,7 @@
  * is to be fulfilled. The PHPCR converter walks over the query builder node
  * hierarchy and converts the object graph the PHPCR QOM object graph.
  *
- * @IgnoreException('factoryMethod')
+ * @IgnoreException("factoryMethod")
  *
  * @author Daniel Leech <daniel@dantleech.com>
  */
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Builder/SourceJoinConditionFactory.php b/lib/Doctrine/ODM/PHPCR/Query/Builder/SourceJoinConditionFactory.php
@@ -5,7 +5,7 @@
 /**
  * Factory node for join conditions.
  *
- * @IgnoreAnnotation('factoryMethod');
+ * @IgnoreAnnotation("factoryMethod");
  *
  * @author Daniel Leech <daniel@dantleech.com>
  */
diff --git a/lib/Doctrine/ODM/PHPCR/Tools/Helper/TranslationConverter.php b/lib/Doctrine/ODM/PHPCR/Tools/Helper/TranslationConverter.php
@@ -91,7 +91,7 @@ public function convert(
         string $documentClass,
         array $locales,
         array $fields = [],
-        string $previousStrategyName = NonTranslatedStrategy::NAME
+        string $previousStrategyName = NonTranslatedStrategy::NAME,
     ): bool {
         $currentMeta = $this->dm->getClassMetadata($documentClass);
         $currentStrategyName = $currentMeta->translator ?: NonTranslatedStrategy::NAME;
@@ -234,7 +234,7 @@ private function convertDocument(
         ClassMetadata $currentMeta,
         array $fields,
         array $locales,
-        bool $partialUntranslate
+        bool $partialUntranslate,
     ): void {
         $node = $this->dm->getNodeForDocument($document);
 
diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php
@@ -176,7 +176,7 @@ public function alterQueryForTranslation(
         SourceInterface &$selector,
         ?ConstraintInterface &$constraint,
         string $alias,
-        string $locale
+        string $locale,
     ): void {
         // do nothing
     }
diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/ChildTranslationStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/ChildTranslationStrategy.php
@@ -130,7 +130,7 @@ public function alterQueryForTranslation(
         SourceInterface &$selector,
         ?ConstraintInterface &$constraint,
         string $alias,
-        string $locale
+        string $locale,
     ): void {
         $childAlias = "_{$locale}_{$alias}";
 
diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/NonTranslatedStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/NonTranslatedStrategy.php
@@ -90,7 +90,7 @@ public function alterQueryForTranslation(
         SourceInterface &$selector,
         ?ConstraintInterface &$constraint,
         string $alias,
-        string $locale
+        string $locale,
     ): void {
         // nothing to alter
     }
diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/TranslationStrategyInterface.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/TranslationStrategyInterface.php
@@ -109,6 +109,6 @@ public function alterQueryForTranslation(
         SourceInterface &$selector,
         ?ConstraintInterface &$constraint,
         string $alias,
-        string $locale
+        string $locale,
     ): void;
 }
diff --git a/tests/Doctrine/Tests/Models/CMS/CmsGroup.php b/tests/Doctrine/Tests/Models/CMS/CmsGroup.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php b/tests/Doctrine/Tests/ODM/PHPCR/DocumentManagerTest.php
@@ -15,7 +15,6 @@
 use PHPCR\SessionInterface;
 use PHPCR\Util\UUIDHelper;
 use PHPCR\WorkspaceInterface;
-use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @group unit
@@ -195,7 +194,6 @@ public function testGetDocumentIdReturnsValueOfUnitOfWork(): void
 
     public function testGetDocumentIdForNonManagedDocumentsReturnsNull(): void
     {
-        /** @var SessionInterface|MockObject $session */
         $session = $this->createMock(SessionInterface::class);
         $dm = DocumentManager::create($session);
         $obj = new \stdClass();
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/UnitOfWorkTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/UnitOfWorkTest.php
@@ -161,7 +161,7 @@ public function testMoveChildThroughNodeNameChangeWithPreUpdateListener(): void
         $child2 = $this->dm->find(null, '/functional/root/parent/child2');
 
         // testing
-        $this->dm->getEventManager()->addEventSubscriber(new class() implements EventSubscriber {
+        $this->dm->getEventManager()->addEventSubscriber(new class implements EventSubscriber {
             public function getSubscribedEvents()
             {
                 return [Event::preUpdate];
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Mapping/AbstractMappingDriverTest.php
@@ -40,7 +40,6 @@
 use Doctrine\Tests\ODM\PHPCR\Mapping\Model\UuidMappingObject;
 use Doctrine\Tests\ODM\PHPCR\Mapping\Model\VersionableMappingObject;
 use PHPCR\SessionInterface;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 abstract class AbstractMappingDriverTest extends TestCase
@@ -363,7 +362,6 @@ public function testParentWithPrivatePropertyMapping(): void
         $this->assertNotNull($class->identifier);
         $this->assertEmpty($class->fieldMappings);
 
-        /** @var SessionInterface|MockObject $session */
         $session = $this->createMock(SessionInterface::class);
         $dm = DocumentManager::create($session);
         $dm->getConfiguration()->setMetadataDriverImpl($this->loadDriver());
@@ -767,7 +765,6 @@ public function testLifecycleCallbackMapping(ClassMetadata $class): void
     public function testStringExtendedMapping(): void
     {
         $this->loadMetadataForClassname(StringMappingObject::class);
-        /** @var SessionInterface|MockObject $session */
         $session = $this->createMock(SessionInterface::class);
         $dm = DocumentManager::create($session);
         $dm->getConfiguration()->setMetadataDriverImpl($this->loadDriver());
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Mapping/ClassMetadataFactoryTest.php
@@ -22,7 +22,6 @@
 use Doctrine\Tests\ODM\PHPCR\Mapping\Model\TranslatorMappingObjectNoStrategy;
 use Doctrine\Tests\ODM\PHPCR\Mapping\Model\UuidMappingObjectNotReferenceable;
 use PHPCR\SessionInterface;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ClassMetadataFactoryTest extends TestCase
@@ -42,7 +41,6 @@ protected function getMetadataFor(string $fqn): ClassMetadata
 
     public function setUp(): void
     {
-        /** @var SessionInterface|MockObject $session */
         $session = $this->createMock(SessionInterface::class);
         $this->dm = DocumentManager::create($session);
     }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php
@@ -47,7 +47,6 @@ public function setUp(): void
     protected function addChildrenToNode1($data): void
     {
         foreach ($data as $className) {
-            /** @var AbstractNode|MockObject $childNode */
             $childNode = $this->getMockForAbstractClass(AbstractNode::class, [], $className);
             $childNode->expects($this->once())
                 ->method('getNodeType')
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/ConverterPhpcrTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/ConverterPhpcrTest.php
@@ -104,7 +104,6 @@ public function setUp(): void
                 return $meta;
             });
 
-        /** @var DocumentManager|MockObject $dm */
         $dm = $this->createMock(DocumentManager::class);
 
         $dm->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/*`
`3`	`4`	`* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS`
`4`	`5`	`* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`final class MixedReferrers implements MappingAttribute`
`9`	`9`	`{`
`10`	`10`	`public function __construct(`
`11`		`- public ?string $referenceType = null`
	`11`	`+ public ?string $referenceType = null,`
`12`	`12`	`) {`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class ParentDocument implements MappingAttribute`
`15`	`15`	`public ?array $cascade;`
`16`	`16`
`17`	`17`	`public function __construct(`
`18`		`- string\|array\|null $cascade = null`
	`18`	`+ string\|array\|null $cascade = null,`
`19`	`19`	`) {`
`20`	`20`	`$this->cascade = null === $cascade ? null : (array) $cascade;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function __construct(`
`18`	`18`	`public ?string $property = null,`
`19`	`19`	`public ?string $targetDocument = null,`
`20`	`20`	`public string $strategy = 'weak',`
`21`		`- array\|string\|null $cascade = null`
	`21`	`+ array\|string\|null $cascade = null,`
`22`	`22`	`) {`
`23`	`23`	`$this->cascade = null === $cascade ? null : (array) $cascade;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class Referrers implements MappingAttribute`
`15`	`15`	`public function __construct(`
`16`	`16`	`public string $referencedBy,`
`17`	`17`	`public string $referringDocument,`
`18`		`- array\|string\|null $cascade = null`
	`18`	`+ array\|string\|null $cascade = null,`
`19`	`19`	`) {`
`20`	`20`	`$this->cascade = null === $cascade ? null : (array) $cascade;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`* is to be fulfilled. The PHPCR converter walks over the query builder node`
`25`	`25`	`* hierarchy and converts the object graph the PHPCR QOM object graph.`
`26`	`26`	`*`
`27`		`- * @IgnoreException('factoryMethod')`
	`27`	`+ * @IgnoreException("factoryMethod")`
`28`	`28`	`*`
`29`	`29`	`* @author Daniel Leech <[email protected]>`
`30`	`30`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`/**`
`6`	`6`	`* Factory node for join conditions.`
`7`	`7`	`*`
`8`		`- * @IgnoreAnnotation('factoryMethod');`
	`8`	`+ * @IgnoreAnnotation("factoryMethod");`
`9`	`9`	`*`
`10`	`10`	`* @author Daniel Leech <[email protected]>`
`11`	`11`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function alterQueryForTranslation(`
`176`	`176`	`SourceInterface &$selector,`
`177`	`177`	`?ConstraintInterface &$constraint,`
`178`	`178`	`string $alias,`
`179`		`- string $locale`
	`179`	`+ string $locale,`
`180`	`180`	`): void {`
`181`	`181`	`// do nothing`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function alterQueryForTranslation(`
`90`	`90`	`SourceInterface &$selector,`
`91`	`91`	`?ConstraintInterface &$constraint,`
`92`	`92`	`string $alias,`
`93`		`- string $locale`
	`93`	`+ string $locale,`
`94`	`94`	`): void {`
`95`	`95`	`// nothing to alter`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,6 @@ public function alterQueryForTranslation(`
`109`	`109`	`SourceInterface &$selector,`
`110`	`110`	`?ConstraintInterface &$constraint,`
`111`	`111`	`string $alias,`
`112`		`- string $locale`
	`112`	`+ string $locale,`
`113`	`113`	`): void;`
`114`	`114`	`}`