feature #274 Allow Symfony 7 (bocharsky-bw)

weaverryan · weaverryan · commit 2b42822ed412 · 2023-12-01T14:14:12.000-05:00
This PR was squashed before being merged into the main branch. Discussion ---------- Allow Symfony 7 Commits ------- 5bf467a Allow Symfony 7
diff --git a/composer.json b/composer.json
@@ -7,15 +7,15 @@
     "require": {
         "php": ">=7.2.5",
         "ext-json": "*",
-        "symfony/config": "^5.4 | ^6.0",
-        "symfony/dependency-injection": "^5.4 | ^6.0",
+        "symfony/config": "^5.4 | ^6.0 | ^7.0",
+        "symfony/dependency-injection": "^5.4 | ^6.0 | ^7.0",
         "symfony/deprecation-contracts": "^2.2 | ^3.0",
-        "symfony/http-kernel": "^5.4 | ^6.0"
+        "symfony/http-kernel": "^5.4 | ^6.0 | ^7.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
-        "symfony/framework-bundle": "^5.4 | ^6.0",
-        "symfony/phpunit-bridge": "^5.4 | ^6.0",
+        "symfony/framework-bundle": "^5.4 | ^6.0 | ^7.0",
+        "symfony/phpunit-bridge": "^5.4 | ^6.0 | ^7.0",
         "doctrine/doctrine-bundle": "^2.0.3",
         "doctrine/annotations": "^1.0"
     },
diff --git a/psalm.xml b/psalm.xml
@@ -51,30 +51,12 @@
         <RawObjectIteration errorLevel="info"/>
 
         <InvalidStringClass errorLevel="info"/>
-        <PossiblyUndefinedMethod>
-            <errorLevel type="suppress">
-                <file name="src/DependencyInjection/Configuration.php"/>
-            </errorLevel>
-        </PossiblyUndefinedMethod>
-        <PossiblyNullReference>
+
+        <UndefinedInterfaceMethod>
             <errorLevel type="suppress">
                 <file name="src/DependencyInjection/Configuration.php"/>
+                <referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::integerNode" />
             </errorLevel>
-        </PossiblyNullReference>
-        <PossiblyNullArgument>
-            <errorLevel type="suppress">
-                <file name="src/DependencyInjection/SymfonyCastsResetPasswordExtension.php"/>
-            </errorLevel>
-        </PossiblyNullArgument>
-        <InvalidReturnType>
-            <errorLevel type="suppress">
-                <file name="src/Persistence/Fake/FakeResetPasswordInternalRepository.php"/>
-            </errorLevel>
-        </InvalidReturnType>
-        <TooManyArguments>
-            <errorLevel type="suppress">
-                <file name="src/Model/ResetPasswordToken.php"/>
-            </errorLevel>
-        </TooManyArguments>
+        </UndefinedInterfaceMethod>
     </issueHandlers>
 </psalm>
diff --git a/src/DependencyInjection/SymfonyCastsResetPasswordExtension.php b/src/DependencyInjection/SymfonyCastsResetPasswordExtension.php
@@ -27,6 +27,9 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('reset_password_services.xml');
 
         $configuration = $this->getConfiguration($configs, $container);
+        if (!$configuration) {
+            throw new \Exception('Configuration is not expected to be null');
+        }
 
         $config = $this->processConfiguration($configuration, $configs);
 
diff --git a/src/Model/ResetPasswordToken.php b/src/Model/ResetPasswordToken.php
@@ -143,6 +143,9 @@ public function getExpiresAtIntervalInstance(): \DateInterval
         return $this->expiresAt->diff($createdAtTime);
     }
 
+    /**
+     * @psalm-suppress UndefinedFunction
+     */
     private function triggerDeprecation(): void
     {
         trigger_deprecation(
diff --git a/tests/Fixtures/Entity/ResetPasswordTestFixtureRequest.php b/tests/Fixtures/Entity/ResetPasswordTestFixtureRequest.php
@@ -20,6 +20,7 @@
  *
  * @ORM\Entity(repositoryClass="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordTestFixtureRequestRepository")
  */
+#[ORM\Entity(repositoryClass: "SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordTestFixtureRequestRepository")]
 final class ResetPasswordTestFixtureRequest implements ResetPasswordRequestInterface
 {
     /**
@@ -29,26 +30,33 @@ final class ResetPasswordTestFixtureRequest implements ResetPasswordRequestInter
      *
      * @ORM\Column(type="integer")
      */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
     public $id;
 
     /**
      * @ORM\Column(type="string", nullable=true)
      */
+    #[ORM\Column(type: 'string', nullable: true)]
     public $selector;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
+    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
     public $expiresAt;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
+    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
     public $requestedAt;
 
     /**
      * @ORM\ManyToOne(targetEntity="ResetPasswordTestFixtureUser")
      */
+    #[ORM\ManyToOne(targetEntity: 'ResetPasswordTestFixtureUser')]
     public $user;
 
     public function getRequestedAt(): \DateTimeInterface
diff --git a/tests/Fixtures/Entity/ResetPasswordTestFixtureUser.php b/tests/Fixtures/Entity/ResetPasswordTestFixtureUser.php
@@ -19,6 +19,7 @@
  *
  * @ORM\Entity()
  */
+#[ORM\Entity]
 final class ResetPasswordTestFixtureUser
 {
     /**
@@ -28,5 +29,8 @@ final class ResetPasswordTestFixtureUser
      *
      * @ORM\Column(type="integer")
      */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
     private $id;
 }
diff --git a/tests/ResetPasswordTestKernel.php b/tests/ResetPasswordTestKernel.php
@@ -91,7 +91,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                     'mappings' => [
                         'App' => [
                             'is_bundle' => false,
-                            'type' => 'annotation',
+                            'type' => self::shouldUseAttributes() ? 'attribute' : 'annotation',
                             'dir' => 'tests/Fixtures/Entity/',
                             'prefix' => 'SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity',
                             'alias' => 'App',
@@ -141,4 +141,9 @@ public function getLogDir(): string
     {
         return sys_get_temp_dir().'/logs'.spl_object_hash($this);
     }
+
+    public static function shouldUseAttributes(): bool
+    {
+        return Kernel::VERSION_ID >= 70000;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,9 @@ public function getExpiresAtIntervalInstance(): \DateInterval`
`143`	`143`	`return $this->expiresAt->diff($createdAtTime);`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ /**`
	`147`	`+ * @psalm-suppress UndefinedFunction`
	`148`	`+ */`
`146`	`149`	`private function triggerDeprecation(): void`
`147`	`150`	`{`
`148`	`151`	`trigger_deprecation(`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @ORM\Entity()`
`21`	`21`	`*/`
	`22`	`+#[ORM\Entity]`
`22`	`23`	`final class ResetPasswordTestFixtureUser`
`23`	`24`	`{`
`24`	`25`	`/**`
`@@ -28,5 +29,8 @@ final class ResetPasswordTestFixtureUser`
`28`	`29`	`*`
`29`	`30`	`* @ORM\Column(type="integer")`
`30`	`31`	`*/`
	`32`	`+ #[ORM\Id]`
	`33`	`+ #[ORM\GeneratedValue]`
	`34`	`+ #[ORM\Column(type: 'integer')]`
`31`	`35`	`private $id;`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void`
`91`	`91`	`'mappings' => [`
`92`	`92`	`'App' => [`
`93`	`93`	`'is_bundle' => false,`
`94`		`- 'type' => 'annotation',`
	`94`	`+ 'type' => self::shouldUseAttributes() ? 'attribute' : 'annotation',`
`95`	`95`	`'dir' => 'tests/Fixtures/Entity/',`
`96`	`96`	`'prefix' => 'SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity',`
`97`	`97`	`'alias' => 'App',`
`@@ -141,4 +141,9 @@ public function getLogDir(): string`
`141`	`141`	`{`
`142`	`142`	`return sys_get_temp_dir().'/logs'.spl_object_hash($this);`
`143`	`143`	`}`
	`144`	`+`
	`145`	`+ public static function shouldUseAttributes(): bool`
	`146`	`+ {`
	`147`	`+ return Kernel::VERSION_ID >= 70000;`
	`148`	`+ }`
`144`	`149`	`}`