PHP CS Fixer修正

ji-eunsoo · ji-eunsoo · commit c81cccf59783 · 2026-07-10T18:34:12.000+09:00
diff --git a/Controller/MailMagazineController.php b/Controller/MailMagazineController.php
@@ -179,7 +179,7 @@ public function index(Request $request, ?int $page_no = null): Response|array
     #[Template('@MailMagazine44/admin/template_select.twig')]
     public function select(Request $request, ?int $id = null): Response|array
     {
-        /** @var MailMagazineTemplate $Template */
+        /** @var MailMagazineTemplate|null $Template */
         $Template = null;
 
         // テンプレート選択によるPOSTの場合はテンプレートからデータを取得する
diff --git a/Controller/MailMagazineHistoryController.php b/Controller/MailMagazineHistoryController.php
@@ -153,9 +153,9 @@ public function condition(#[MapEntity(id: 'id')] MailMagazineSendHistory $mailMa
     /**
      * search_dataの配列を表示用に変換する.
      *
-     * @param array $searchData
+     * @param array<string, mixed> $searchData
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function searchDataToDisplayData(array $searchData): array
     {
diff --git a/Entity/AdminCustomerQueryCustomizer.php b/Entity/AdminCustomerQueryCustomizer.php
@@ -22,7 +22,7 @@ class AdminCustomerQueryCustomizer extends WhereCustomizer
     /**
      * {@inheritdoc}
      *
-     * @param array $params
+     * @param array<string, mixed> $params
      * @param $queryKey
      *
      * @return WhereClause[]
diff --git a/Entity/MailMagazineSendHistory.php b/Entity/MailMagazineSendHistory.php
@@ -250,7 +250,7 @@ public function setStartDate(?\DateTimeInterface $startDate): self
     /**
      * Get start_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getStartDate(): ?\DateTimeInterface
     {
@@ -274,7 +274,7 @@ public function setEndDate(?\DateTimeInterface $endDate): self
     /**
      * Get end_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getEndDate(): ?\DateTimeInterface
     {
@@ -322,7 +322,7 @@ public function setCreateDate(?\DateTimeInterface $createDate): self
     /**
      * Get create_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getCreateDate(): ?\DateTimeInterface
     {
@@ -346,7 +346,7 @@ public function setUpdateDate(?\DateTimeInterface $updateDate): self
     /**
      * Get update_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getUpdateDate(): ?\DateTimeInterface
     {
diff --git a/Entity/MailMagazineTemplate.php b/Entity/MailMagazineTemplate.php
@@ -112,7 +112,7 @@ public function setCreateDate(?\DateTimeInterface $createDate): self
     /**
      * Get create_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getCreateDate(): ?\DateTimeInterface
     {
@@ -136,7 +136,7 @@ public function setUpdateDate(?\DateTimeInterface $updateDate): self
     /**
      * Get update_date.
      *
-     * @return \DateTime
+     * @return \DateTimeInterface|null
      */
     public function getUpdateDate(): ?\DateTimeInterface
     {
diff --git a/Form/Extension/EntryMailMagazineTypeExtension.php b/Form/Extension/EntryMailMagazineTypeExtension.php
@@ -25,7 +25,7 @@ class EntryMailMagazineTypeExtension extends AbstractTypeExtension
      * {@inheritdoc}
      *
      * @param FormBuilderInterface $builder
-     * @param array $options
+     * @param array<string, mixed> $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
diff --git a/MailMagazineNav.php b/MailMagazineNav.php
@@ -20,7 +20,7 @@ class MailMagazineNav implements EccubeNav
     /**
      * {@inheritdoc}
      *
-     * @return array
+     * @return array<string, array<string, mixed>>
      */
     public static function getNav(): array
     {
diff --git a/Repository/MailMagazineSendHistoryRepository.php b/Repository/MailMagazineSendHistoryRepository.php
@@ -42,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * @param array $searchData
+     * @param array<string, mixed> $searchData
      *
      * @return QueryBuilder
      */
diff --git a/Repository/MailMagazineTemplateRepository.php b/Repository/MailMagazineTemplateRepository.php
@@ -13,7 +13,6 @@
 
 namespace Plugin\MailMagazine44\Repository;
 
-use Doctrine\ORM\Query;
 use Doctrine\Persistence\ManagerRegistry;
 use Eccube\Repository\AbstractRepository;
 use Plugin\MailMagazine44\Entity\MailMagazineTemplate;
@@ -42,15 +41,15 @@ public function __construct(ManagerRegistry $registry, string $entityClass = Mai
     /**
      * find all.
      *
-     * @return list<array<string, mixed>>
+     * @return list<MailMagazineTemplate>
      */
     public function findAll(): array
     {
         $query = $this
             ->getEntityManager()
             ->createQuery('SELECT m FROM Plugin\MailMagazine44\Entity\MailMagazineTemplate m ORDER BY m.id DESC');
-        $result = $query
-            ->getResult(Query::HYDRATE_ARRAY);
+        /** @var list<MailMagazineTemplate> $result */
+        $result = $query->getResult();
 
         return $result;
     }
diff --git a/Service/MailMagazineService.php b/Service/MailMagazineService.php
@@ -150,12 +150,10 @@ public function setMailMagazineDir(string $mailMagazineDir): self
     /**
      * メールを送信する.
      *
-     * @param array $formData メルマガ情報
+     * @param array{email: string, subject: string, body: string, htmlBody?: string|null} $formData メルマガ情報
      *                  email: 送信先メールアドレス
      *                  subject: 件名
      *                  body：本文
-     *
-     * @return int
      */
     public function sendMail(array $formData): void
     {
@@ -180,7 +178,7 @@ public function sendMail(array $formData): void
      *
      * 配信履歴データ(MailMagazineSendHistory)の作成と、配信履歴ファイルを作成します。
      *
-     * @param array $formData
+     * @param array<string, mixed> $formData
      *
      * @return int 採番されたsend_id
      *             エラー時はfalseを返す
@@ -275,8 +273,8 @@ public function createMailMagazineHistory(array $formData): ?int
      * none,bbb@example.com,bbb
      * none,ccc@example.com,ccc
      *
-     * @param string|$fileHistory 履歴ファイル
-     * @param string|$fileResult 結果ファイル
+     * @param string $fileHistory 履歴ファイル
+     * @param string $fileResult 結果ファイル
      */
     private function mergeHistoryFile(string $fileHistory, string $fileResult): void
     {
@@ -349,12 +347,11 @@ public function markRetry(int $sendId): void
      * @param int $offset
      * @param int $max
      *
-     * @return bool|MailMagazineSendHistory
+     * @return MailMagazineSendHistory
      */
     public function sendrMailMagazine(int $sendId, int $offset = 0, int $max = 100): MailMagazineSendHistory
     {
         // send_historyを取得する
-        /** @var MailMagazineSendHistory $sendHistory */
         $sendHistory = $this->mailMagazineSendHistoryRepository->find($sendId);
 
         if (is_null($sendHistory)) {
@@ -482,7 +479,7 @@ public function sendrMailMagazine(int $sendId, int $offset = 0, int $max = 100):
     /**
      * 送信完了報告メールを送信する.
      *
-     * @return number
+     * @return bool
      */
     public function sendMailMagazineCompleateReportMail(): bool
     {
@@ -541,7 +538,7 @@ public function unlinkHistoryFiles(int $historyId): void
     /**
      * テストメール送信
      *
-     * @param array|$mailData メールデータ
+     * @param array{email: string, subject: string, body: string, htmlBody?: string|null, name: string} $mailData メールデータ
      */
     public function sendTestMail(array $mailData): void
     {
@@ -550,8 +547,8 @@ public function sendTestMail(array $mailData): void
     }
 
     /**
-     * @param array|$mailData メールデータ
-     * @param string|$name 名前
+     * @param array{email?: string, subject?: string, body?: string, htmlBody?: string|null, name?: string} $mailData メールデータ
+     * @param string $name 名前
      */
     public function replaceMailVars(array &$mailData, string $name): void
     {
diff --git a/Tests/Service/MailMagazineServiceTest.php b/Tests/Service/MailMagazineServiceTest.php
@@ -13,30 +13,25 @@
 
 namespace Plugin\MailMagazine44\Tests\Service;
 
+use Eccube\Entity\Customer;
 use Plugin\MailMagazine44\Entity\MailMagazineSendHistory;
 use Plugin\MailMagazine44\Service\MailMagazineService;
 use Plugin\MailMagazine44\Tests\AbstractMailMagazineTestCase;
 
 class MailMagazineServiceTest extends AbstractMailMagazineTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var list<string>
      */
-    private $mailer;
-
-    /**
-     * @var array
-     */
-    private $sentAddresses;
+    private $sentAddresses = [];
 
     public function setUp(): void
     {
-        $this->markTestSkipped('Skipped due to still not assign mock Swift_Mailler to service container');
         parent::setUp();
         $this->mailMagazineService = self::getContainer()->get(MailMagazineService::class);
         $this->client->enableProfiler();
-        //        $this->mailer = $this->getMockBuilder('\Swift_Mailer')->disableOriginalConstructor()->getMock();
         $this->sentAddresses = [];
+        $this->markTestSkipped('Skipped due to still not assign mock Swift_Mailler to service container');
     }
 
     public function testGetHistoryFileName(): void
@@ -581,25 +576,6 @@ public function testSendrMailMagazine再送してもエラー数を正しく履
         self::assertEquals(2, $history->getErrorCount());
     }
 
-    /**
-     * メーラのスタブを設定。
-     * 引数の順番でメールの送信結果を返す。
-     * [false, true] なら最初のメール送信は失敗、2通目のメール送信は成功。
-     *
-     * @param array|$arrayOfReturn メール送信結果の配列
-     */
-    private function setUpMailerStub($arrayOfReturn)
-    {
-        $stack = &$this->sentAddresses;
-        $this->mailer->expects($this->exactly(count($arrayOfReturn)))->method('send')->with(
-            $this->callback(function ($message) use (&$stack) {
-                $stack[] = current(array_keys($message->getTo()));
-
-                return true;
-            })
-        )->will(new \PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($arrayOfReturn));
-    }
-
     /**
      * Create send mail history
      *
diff --git a/Tests/Util/MailMagazineHistoryFilePaginationSubscriberTest.php b/Tests/Util/MailMagazineHistoryFilePaginationSubscriberTest.php
@@ -15,7 +15,7 @@
 
 use Knp\Component\Pager\Event\Subscriber\Paginate\PaginationSubscriber;
 use Knp\Component\Pager\Event\Subscriber\Sortable\SortableSubscriber;
-use Knp\Component\Pager\Pagination\AbstractPagination;
+use Knp\Component\Pager\Pagination\PaginationInterface;
 use Knp\Component\Pager\Paginator;
 use Plugin\MailMagazine44\Event\MailMagazineHistoryFilePaginationSubscriber;
 use Plugin\MailMagazine44\Service\MailMagazineService;
@@ -25,6 +25,7 @@
 
 class MailMagazineHistoryFilePaginationSubscriberTest extends AbstractMailMagazineTestCase
 {
+    /** @var string */
     private $rootDir;
 
     public function setUp(): void
@@ -143,34 +144,23 @@ public function test最終ページ(): void
     }
 
     /**
-     * @param $file
-     * @param $page
-     * @param $limit
-     * @param $total
-     *
-     * @return AbstractPagination
+     * @return PaginationInterface<int, mixed>
      */
-    private function newPagination($file, $page, $limit, $total): AbstractPagination
+    private function newPagination(string $file, int $page, int $limit, int $total): PaginationInterface
     {
         $eventDispatcher = new EventDispatcher();
         $eventDispatcher->addSubscriber(new PaginationSubscriber());
         $eventDispatcher->addSubscriber(new SortableSubscriber());
         $eventDispatcher->addSubscriber(self::getContainer()->get(MailMagazineHistoryFilePaginationSubscriber::class));
 
-        if (class_exists(\Knp\Component\Pager\ArgumentAccess\RequestArgumentAccess::class)) {
-            // ECCUBE 4.3 (knplabs/knp-components v5.2) 対応
-            $requestStack = new RequestStack();
-            $accessor = new \Knp\Component\Pager\ArgumentAccess\RequestArgumentAccess($requestStack);
-            $paginator = new Paginator($eventDispatcher, $accessor);
-        } else {
-            // ECCUBE 4.2 (knplabs/knp-components v3.6) 対応
-            $paginator = new Paginator($eventDispatcher);
-        }
+        $requestStack = new RequestStack();
+        $accessor = new \Knp\Component\Pager\ArgumentAccess\RequestArgumentAccess($requestStack);
+        $paginator = new Paginator($eventDispatcher, $accessor);
 
         return $paginator->paginate($file, $page, $limit, ['total' => $total]);
     }
 
-    private function file($name = 'out.txt')
+    private function file(string $name = 'out.txt'): string
     {
         return $this->rootDir.'/'.$name;
     }
diff --git a/Tests/Web/Admin/MailMagazineEventOnRenderAdminCustomerBeforeTest.php b/Tests/Web/Admin/MailMagazineEventOnRenderAdminCustomerBeforeTest.php
@@ -31,7 +31,10 @@ public function setUp(): void
         $this->customerRepository = $this->entityManager->getRepository(Customer::class);
     }
 
-    protected function createFormData()
+    /**
+     * @return array<string, mixed>
+     */
+    protected function createFormData(): array
     {
         $faker = $this->getFaker();
         $tel = $faker->phoneNumber;
@@ -46,11 +49,11 @@ protected function createFormData()
                 'name02' => $faker->firstName,
             ],
             'kana' => [
-                'kana01' => $faker->lastKanaName,
-                'kana02' => $faker->firstKanaName,
+                'kana01' => 'テスト',
+                'kana02' => 'タロウ',
             ],
             'company_name' => $faker->company,
-            'postal_code' => $faker->postcode1().'-'.$faker->postcode2(),
+            'postal_code' => '123-4567',
             'address' => [
                 'pref' => '5',
                 'addr01' => $faker->city,
diff --git a/Tests/Web/Admin/MailMagazineTemplateControllerTest.php b/Tests/Web/Admin/MailMagazineTemplateControllerTest.php
diff --git a/Tests/Web/Front/MailMagazineEventOnRenderEntryTest.php b/Tests/Web/Front/MailMagazineEventOnRenderEntryTest.php
diff --git a/Tests/Web/Front/MailMagazineEventOnRenderMypageChangeTest.php b/Tests/Web/Front/MailMagazineEventOnRenderMypageChangeTest.php
diff --git a/Tests/Web/MailMagazineCommon.php b/Tests/Web/MailMagazineCommon.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function index(Request $request, ?int $page_no = null): Response\|array`
`179`	`179`	`#[Template('@MailMagazine44/admin/template_select.twig')]`
`180`	`180`	`public function select(Request $request, ?int $id = null): Response\|array`
`181`	`181`	`{`
`182`		`- /** @var MailMagazineTemplate $Template */`
	`182`	`+ /** @var MailMagazineTemplate\|null $Template */`
`183`	`183`	`$Template = null;`
`184`	`184`
`185`	`185`	`// テンプレート選択によるPOSTの場合はテンプレートからデータを取得する`
Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,9 @@ public function condition(#[MapEntity(id: 'id')] MailMagazineSendHistory $mailMa`
`153`	`153`	`/**`
`154`	`154`	`* search_dataの配列を表示用に変換する.`
`155`	`155`	`*`
`156`		`- * @param array $searchData`
	`156`	`+ * @param array<string, mixed> $searchData`
`157`	`157`	`*`
`158`		`- * @return array`
	`158`	`+ * @return array<string, mixed>`
`159`	`159`	`*/`
`160`	`160`	`protected function searchDataToDisplayData(array $searchData): array`
`161`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class AdminCustomerQueryCustomizer extends WhereCustomizer`
`22`	`22`	`/**`
`23`	`23`	`* {@inheritdoc}`
`24`	`24`	`*`
`25`		`- * @param array $params`
	`25`	`+ * @param array<string, mixed> $params`
`26`	`26`	`* @param $queryKey`
`27`	`27`	`*`
`28`	`28`	`* @return WhereClause[]`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public function setStartDate(?\DateTimeInterface $startDate): self`
`250`	`250`	`/**`
`251`	`251`	`* Get start_date.`
`252`	`252`	`*`
`253`		`- * @return \DateTime`
	`253`	`+ * @return \DateTimeInterface\|null`
`254`	`254`	`*/`
`255`	`255`	`public function getStartDate(): ?\DateTimeInterface`
`256`	`256`	`{`
`@@ -274,7 +274,7 @@ public function setEndDate(?\DateTimeInterface $endDate): self`
`274`	`274`	`/**`
`275`	`275`	`* Get end_date.`
`276`	`276`	`*`
`277`		`- * @return \DateTime`
	`277`	`+ * @return \DateTimeInterface\|null`
`278`	`278`	`*/`
`279`	`279`	`public function getEndDate(): ?\DateTimeInterface`
`280`	`280`	`{`
`@@ -322,7 +322,7 @@ public function setCreateDate(?\DateTimeInterface $createDate): self`
`322`	`322`	`/**`
`323`	`323`	`* Get create_date.`
`324`	`324`	`*`
`325`		`- * @return \DateTime`
	`325`	`+ * @return \DateTimeInterface\|null`
`326`	`326`	`*/`
`327`	`327`	`public function getCreateDate(): ?\DateTimeInterface`
`328`	`328`	`{`
`@@ -346,7 +346,7 @@ public function setUpdateDate(?\DateTimeInterface $updateDate): self`
`346`	`346`	`/**`
`347`	`347`	`* Get update_date.`
`348`	`348`	`*`
`349`		`- * @return \DateTime`
	`349`	`+ * @return \DateTimeInterface\|null`
`350`	`350`	`*/`
`351`	`351`	`public function getUpdateDate(): ?\DateTimeInterface`
`352`	`352`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function setCreateDate(?\DateTimeInterface $createDate): self`
`112`	`112`	`/**`
`113`	`113`	`* Get create_date.`
`114`	`114`	`*`
`115`		`- * @return \DateTime`
	`115`	`+ * @return \DateTimeInterface\|null`
`116`	`116`	`*/`
`117`	`117`	`public function getCreateDate(): ?\DateTimeInterface`
`118`	`118`	`{`
`@@ -136,7 +136,7 @@ public function setUpdateDate(?\DateTimeInterface $updateDate): self`
`136`	`136`	`/**`
`137`	`137`	`* Get update_date.`
`138`	`138`	`*`
`139`		`- * @return \DateTime`
	`139`	`+ * @return \DateTimeInterface\|null`
`140`	`140`	`*/`
`141`	`141`	`public function getUpdateDate(): ?\DateTimeInterface`
`142`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class EntryMailMagazineTypeExtension extends AbstractTypeExtension`
`25`	`25`	`* {@inheritdoc}`
`26`	`26`	`*`
`27`	`27`	`* @param FormBuilderInterface $builder`
`28`		`- * @param array $options`
	`28`	`+ * @param array<string, mixed> $options`
`29`	`29`	`*/`
`30`	`30`	`public function buildForm(FormBuilderInterface $builder, array $options): void`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class MailMagazineNav implements EccubeNav`
`20`	`20`	`/**`
`21`	`21`	`* {@inheritdoc}`
`22`	`22`	`*`
`23`		`- * @return array`
	`23`	`+ * @return array<string, array<string, mixed>>`
`24`	`24`	`*/`
`25`	`25`	`public static function getNav(): array`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * @param array $searchData`
	`45`	`+ * @param array<string, mixed> $searchData`
`46`	`46`	`*`
`47`	`47`	`* @return QueryBuilder`
`48`	`48`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -150,12 +150,10 @@ public function setMailMagazineDir(string $mailMagazineDir): self`
`150`	`150`	`/**`
`151`	`151`	`* メールを送信する.`
`152`	`152`	`*`
`153`		`- * @param array $formData メルマガ情報`
	`153`	`+ * @param array{email: string, subject: string, body: string, htmlBody?: string\|null} $formData メルマガ情報`
`154`	`154`	`* email: 送信先メールアドレス`
`155`	`155`	`* subject: 件名`
`156`	`156`	`* body：本文`
`157`		`- *`
`158`		`- * @return int`
`159`	`157`	`*/`
`160`	`158`	`public function sendMail(array $formData): void`
`161`	`159`	`{`
`@@ -180,7 +178,7 @@ public function sendMail(array $formData): void`
`180`	`178`	`*`
`181`	`179`	`* 配信履歴データ(MailMagazineSendHistory)の作成と、配信履歴ファイルを作成します。`
`182`	`180`	`*`
`183`		`- * @param array $formData`
	`181`	`+ * @param array<string, mixed> $formData`
`184`	`182`	`*`
`185`	`183`	`* @return int 採番されたsend_id`
`186`	`184`	`* エラー時はfalseを返す`
`@@ -275,8 +273,8 @@ public function createMailMagazineHistory(array $formData): ?int`
`275`	`273`	`* none,bbb@example.com,bbb`
`276`	`274`	`* none,ccc@example.com,ccc`
`277`	`275`	`*`
`278`		`- * @param string\|$fileHistory 履歴ファイル`
`279`		`- * @param string\|$fileResult 結果ファイル`
	`276`	`+ * @param string $fileHistory 履歴ファイル`
	`277`	`+ * @param string $fileResult 結果ファイル`
`280`	`278`	`*/`
`281`	`279`	`private function mergeHistoryFile(string $fileHistory, string $fileResult): void`
`282`	`280`	`{`
`@@ -349,12 +347,11 @@ public function markRetry(int $sendId): void`
`349`	`347`	`* @param int $offset`
`350`	`348`	`* @param int $max`
`351`	`349`	`*`
`352`		`- * @return bool\|MailMagazineSendHistory`
	`350`	`+ * @return MailMagazineSendHistory`
`353`	`351`	`*/`
`354`	`352`	`public function sendrMailMagazine(int $sendId, int $offset = 0, int $max = 100): MailMagazineSendHistory`
`355`	`353`	`{`
`356`	`354`	`// send_historyを取得する`
`357`		`- /** @var MailMagazineSendHistory $sendHistory */`
`358`	`355`	`$sendHistory = $this->mailMagazineSendHistoryRepository->find($sendId);`
`359`	`356`
`360`	`357`	`if (is_null($sendHistory)) {`
`@@ -482,7 +479,7 @@ public function sendrMailMagazine(int $sendId, int $offset = 0, int $max = 100):`
`482`	`479`	`/**`
`483`	`480`	`* 送信完了報告メールを送信する.`
`484`	`481`	`*`
`485`		`- * @return number`
	`482`	`+ * @return bool`
`486`	`483`	`*/`
`487`	`484`	`public function sendMailMagazineCompleateReportMail(): bool`
`488`	`485`	`{`
`@@ -541,7 +538,7 @@ public function unlinkHistoryFiles(int $historyId): void`
`541`	`538`	`/**`
`542`	`539`	`* テストメール送信`
`543`	`540`	`*`
`544`		`- * @param array\|$mailData メールデータ`
	`541`	`+ * @param array{email: string, subject: string, body: string, htmlBody?: string\|null, name: string} $mailData メールデータ`
`545`	`542`	`*/`
`546`	`543`	`public function sendTestMail(array $mailData): void`
`547`	`544`	`{`
`@@ -550,8 +547,8 @@ public function sendTestMail(array $mailData): void`
`550`	`547`	`}`
`551`	`548`
`552`	`549`	`/**`
`553`		`- * @param array\|$mailData メールデータ`
`554`		`- * @param string\|$name 名前`
	`550`	`+ * @param array{email?: string, subject?: string, body?: string, htmlBody?: string\|null, name?: string} $mailData メールデータ`
	`551`	`+ * @param string $name 名前`
`555`	`552`	`*/`
`556`	`553`	`public function replaceMailVars(array &$mailData, string $name): void`
`557`	`554`	`{`