[Mime] Move crypt_gpg to dev, rm attr from tests

the-pulli · the-pulli · commit d5b9214a7832 · 2023-05-04T12:34:05.000+02:00
diff --git a/composer.json b/composer.json
@@ -40,7 +40,6 @@
         "doctrine/event-manager": "^1.2|^2",
         "doctrine/persistence": "^2|^3",
         "twig/twig": "^2.13|^3.0.4",
-        "pear/crypt_gpg": "^1.6",
         "psr/cache": "^2.0|^3.0",
         "psr/clock": "^1.0",
         "psr/container": "^1.1|^2.0",
@@ -142,6 +141,7 @@
         "monolog/monolog": "^1.25.1|^2",
         "nyholm/psr7": "^1.0",
         "pda/pheanstalk": "^4.0",
+        "pear/crypt_gpg": "^1.6",
         "php-http/discovery": "^1.15",
         "php-http/httplug": "^1.0|^2.0",
         "php-http/message-factory": "^1.0",
diff --git a/src/Symfony/Component/Mime/Part/Multipart/PGPEncryptedPart.php b/src/Symfony/Component/Mime/Part/Multipart/PGPEncryptedPart.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Mime\Part\Multipart;
 
 use Symfony\Component\Mime\Part\AbstractMultipartPart;
diff --git a/src/Symfony/Component/Mime/Part/Multipart/PGPSignedPart.php b/src/Symfony/Component/Mime/Part/Multipart/PGPSignedPart.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Mime\Part\Multipart;
 
 use Symfony\Component\Mime\Helper\PGPSigningPreparer;
diff --git a/src/Symfony/Component/Mime/Tests/Crypto/PGPEncryptorTest.php b/src/Symfony/Component/Mime/Tests/Crypto/PGPEncryptorTest.php
@@ -11,14 +11,12 @@
 
 namespace Symfony\Component\Mime\Tests\Crypto;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Crypto\PGPEncrypter;
 use Symfony\Component\Mime\Email;
 
-#[CoversClass(PGPEncrypter::class)]
-final class PGPEncryptorTest extends TestCase
+class PGPEncryptorTest extends TestCase
 {
     private \Crypt_GPG $gpg;
 
@@ -30,7 +28,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->gpg = new \Crypt_GPG();
-        $this->gpg->importKeyFile(__DIR__ . '/../_data/pgp.asc');
+        $this->gpg->importKeyFile(__DIR__.'/../_data/pgp.asc');
         $this->email = (new Email())
             ->from(new Address('pgp@pulli.dev', 'PuLLi'))
             ->to(new Address('pgp@pulli.dev', 'PuLLi'))
diff --git a/src/Symfony/Component/Mime/Tests/Part/Multipart/PGPEncryptedPartTest.php b/src/Symfony/Component/Mime/Tests/Part/Multipart/PGPEncryptedPartTest.php
@@ -11,11 +11,9 @@
 
 namespace Symfony\Component\Mime\Tests\Part\Multipart;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\Multipart\PGPEncryptedPart;
 
-#[CoversClass(PGPEncryptedPart::class)]
 final class PGPEncryptedPartTest extends TestCase
 {
     public function testPGPEncryptedPart()
diff --git a/src/Symfony/Component/Mime/Tests/Part/Multipart/PGPSignedPartTest.php b/src/Symfony/Component/Mime/Tests/Part/Multipart/PGPSignedPartTest.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Mime\Tests\Part\Multipart;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\Multipart\PGPSignedPart;
 use Symfony\Component\Mime\Part\TextPart;
 
-#[CoversClass(PGPSignedPart::class)]
 final class PGPSignedPartTest extends TestCase
 {
     public function testPGPSignedPart()
diff --git a/src/Symfony/Component/Mime/Tests/Part/PGPEncryptedInitializationPartTest.php b/src/Symfony/Component/Mime/Tests/Part/PGPEncryptedInitializationPartTest.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Mime\Tests\Part;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\PGPEncryptedInitializationPart;
 
-#[CoversClass(PGPEncryptedInitializationPart::class)]
-final class PGPEncryptedInitializationPartTest extends TestCase
+class PGPEncryptedInitializationPartTest extends TestCase
 {
     public function testPGPEncryptedInitializationPart()
     {
diff --git a/src/Symfony/Component/Mime/Tests/Part/PGPEncryptedMessagePartTest.php b/src/Symfony/Component/Mime/Tests/Part/PGPEncryptedMessagePartTest.php
@@ -9,14 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Tests\Part;
+namespace Symfony\Component\Mime\Tests\Part;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\PGPEncryptedMessagePart;
 
-#[CoversClass(PGPEncryptedMessagePart::class)]
-final class PGPEncryptedMessagePartTest extends TestCase
+class PGPEncryptedMessagePartTest extends TestCase
 {
     public function testPGPEncryptedMessagePart()
     {
diff --git a/src/Symfony/Component/Mime/Tests/Part/PGPKeyPartTest.php b/src/Symfony/Component/Mime/Tests/Part/PGPKeyPartTest.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Mime\Tests\Part;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\PGPKeyPart;
 
-#[CoversClass(PGPKeyPart::class)]
-final class PGPKeyPartTest extends TestCase
+class PGPKeyPartTest extends TestCase
 {
     public function testPGPKeyPartWithStandardKeyName()
     {
diff --git a/src/Symfony/Component/Mime/Tests/Part/PGPSignaturePartTest.php b/src/Symfony/Component/Mime/Tests/Part/PGPSignaturePartTest.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Mime\Tests\Part;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Part\PGPSignaturePart;
 
-#[CoversClass(PGPSignaturePart::class)]
-final class PGPSignaturePartTest extends TestCase
+class PGPSignaturePartTest extends TestCase
 {
     public function testPGPSignaturePart()
     {

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Mime\Tests\Part\Multipart;`
`13`	`13`
`14`		`-use PHPUnit\Framework\Attributes\CoversClass;`
`15`	`14`	`use PHPUnit\Framework\TestCase;`
`16`	`15`	`use Symfony\Component\Mime\Part\Multipart\PGPEncryptedPart;`
`17`	`16`
`18`		`-#[CoversClass(PGPEncryptedPart::class)]`
`19`	`17`	`final class PGPEncryptedPartTest extends TestCase`
`20`	`18`	`{`
`21`	`19`	`public function testPGPEncryptedPart()`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Mime\Tests\Part;`
`13`	`13`
`14`		`-use PHPUnit\Framework\Attributes\CoversClass;`
`15`	`14`	`use PHPUnit\Framework\TestCase;`
`16`	`15`	`use Symfony\Component\Mime\Part\PGPEncryptedInitializationPart;`
`17`	`16`
`18`		`-#[CoversClass(PGPEncryptedInitializationPart::class)]`
`19`		`-final class PGPEncryptedInitializationPartTest extends TestCase`
	`17`	`+class PGPEncryptedInitializationPartTest extends TestCase`
`20`	`18`	`{`
`21`	`19`	`public function testPGPEncryptedInitializationPart()`
`22`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,12 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Tests\Part;`
	`12`	`+namespace Symfony\Component\Mime\Tests\Part;`
`13`	`13`
`14`		`-use PHPUnit\Framework\Attributes\CoversClass;`
`15`	`14`	`use PHPUnit\Framework\TestCase;`
`16`	`15`	`use Symfony\Component\Mime\Part\PGPEncryptedMessagePart;`
`17`	`16`
`18`		`-#[CoversClass(PGPEncryptedMessagePart::class)]`
`19`		`-final class PGPEncryptedMessagePartTest extends TestCase`
	`17`	`+class PGPEncryptedMessagePartTest extends TestCase`
`20`	`18`	`{`
`21`	`19`	`public function testPGPEncryptedMessagePart()`
`22`	`20`	`{`