Skip to content

Commit ba27f62

Browse files
ji-eunsooji-eunsoo
committed
PHP CS Fixer修正
1 parent 57da15e commit ba27f62

19 files changed

Lines changed: 111 additions & 149 deletions

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
runs-on: ubuntu-24.04
165165
# 静的解析は DB 種別に依存しないため、SQLite 1 構成で一度だけ実行する。
166166
# （php-cs-fixer / rector は DB 不要だが、phpstan は objectManagerLoader が
167-
# カーネルを起動し EccubeExtension が dtb_plugin を読むため本体+DBが必要）
167+
# カーネルを起動するため本体+DBが必要）
168168
env:
169169
PLUGIN_CODE: MailMagazine44
170170
APP_ENV: 'test'
@@ -210,7 +210,7 @@ jobs:
210210
run: |
211211
bin/console doctrine:database:create
212212
bin/console doctrine:schema:create
213-
# プラグイン有効化時に DeviceType 等のマスタデータを参照するため fixtures を投入する
213+
# プラグイン有効化時にマスタデータを参照するため fixtures を投入する
214214
bin/console eccube:fixtures:load
215215
- name: Setup Plugin
216216
working-directory: 'ec-cube'
@@ -231,4 +231,4 @@ jobs:
231231
working-directory: 'ec-cube'
232232
run: |
233233
bin/console cache:clear --no-warmup
234-
./vendor/bin/phpstan analyse -c app/Plugin/${PLUGIN_CODE}/phpstan.neon.dist --no-progress
234+
./vendor/bin/phpstan analyse -c app/Plugin/${PLUGIN_CODE}/phpstan.neon.dist --no-progress

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ jobs:
1313
working-directory: ../
1414
run: |
1515
rm -rf $GITHUB_WORKSPACE/.github
16+
# 開発・テスト用ファイルは配布パッケージに含めない
17+
rm -rf $GITHUB_WORKSPACE/docker-compose*.yml $GITHUB_WORKSPACE/dockerbuild
18+
rm -f $GITHUB_WORKSPACE/CLAUDE.md $GITHUB_WORKSPACE/phpstan.neon.dist
19+
rm -f $GITHUB_WORKSPACE/Resource/rector.php "$GITHUB_WORKSPACE/Resource/.php-cs-fixer.dist.php"
1620
find $GITHUB_WORKSPACE -name "dummy" -delete
1721
find $GITHUB_WORKSPACE -name ".git*" -and ! -name ".gitkeep" -print0 | xargs -0 rm -rf
1822
chmod -R o+w $GITHUB_WORKSPACE

‎Controller/MailMagazineController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public function __construct(
7272
CustomerRepository $customerRepository,
7373
MailMagazineTemplateRepository $magazineTemplateRepository,
7474
MailMagazineService $mailMagazineService,
75+
private readonly PaginatorInterface $paginator,
7576
) {
7677
$this->pageMaxRepository = $pageMaxRepository;
7778
$this->customerRepository = $customerRepository;
@@ -88,7 +89,7 @@ public function __construct(
8889
#[Route('/%eccube_admin_route%/plugin/mail_magazine', name: 'plugin_mail_magazine')]
8990
#[Route('/%eccube_admin_route%/plugin/mail_magazine/{page_no}', name: 'plugin_mail_magazine_page', requirements: ['page_no' => '\d+'])]
9091
#[Template('@MailMagazine44/admin/index.twig')]
91-
public function index(Request $request, PaginatorInterface $paginator, ?int $page_no = null): Response|array
92+
public function index(Request $request, ?int $page_no = null): Response|array
9293
{
9394
$session = $request->getSession();
9495
$pageNo = $page_no;
@@ -128,7 +129,7 @@ public function index(Request $request, PaginatorInterface $paginator, ?int $pag
128129
'searchForm' => $searchForm->createView(),
129130
'pagination' => [],
130131
'pageMaxis' => $pageMaxis,
131-
'page_no' => $pageNo ? $pageNo : 1,
132+
'page_no' => $pageNo ?: 1,
132133
'page_count' => $pageCount,
133134
'has_errors' => true,
134135
];
@@ -153,7 +154,7 @@ public function index(Request $request, PaginatorInterface $paginator, ?int $pag
153154
$searchData['plg_mailmagazine_flg'] = Constant::ENABLED;
154155
/** @var QueryBuilder $qb */
155156
$qb = $this->customerRepository->getQueryBuilderBySearchData($searchData);
156-
$pagination = $paginator->paginate(
157+
$pagination = $this->paginator->paginate(
157158
$qb,
158159
$pageNo,
159160
$pageCount
@@ -286,7 +287,7 @@ public function prepare(Request $request): RedirectResponse
286287
log_info('メルマガ配信前処理完了', ['sendId' => $sendId]);
287288

288289
// 配信履歴画面に遷移する
289-
return $this->redirect($this->generateUrl('plugin_mail_magazine_history'));
290+
return $this->redirectToRoute('plugin_mail_magazine_history');
290291
}
291292

292293
/**

‎Controller/MailMagazineHistoryController.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public function __construct(
5656
MailMagazineService $mailMagazineService,
5757
MailMagazineSendHistoryRepository $mailMagazineSendHistoryRepository,
5858
PageMaxRepository $pageMaxRepository,
59+
private readonly PaginatorInterface $paginator,
5960
) {
6061
$this->mailMagazineService = $mailMagazineService;
6162
$this->mailMagazineSendHistoryRepository = $mailMagazineSendHistoryRepository;
@@ -70,7 +71,7 @@ public function __construct(
7071
#[Route('/%eccube_admin_route%/plugin/mail_magazine/history', name: 'plugin_mail_magazine_history')]
7172
#[Route('/%eccube_admin_route%/plugin/mail_magazine/history/{page_no}', name: 'plugin_mail_magazine_history_page', requirements: ['page_no' => '\d+'])]
7273
#[Template('@MailMagazine44/admin/history_list.twig')]
73-
public function index(Request $request, PaginatorInterface $paginator, int $page_no = 1): array
74+
public function index(Request $request, int $page_no = 1): array
7475
{
7576
$pageNo = $page_no;
7677
$pageMaxis = $this->pageMaxRepository->findAll();
@@ -95,7 +96,7 @@ public function index(Request $request, PaginatorInterface $paginator, int $page
9596

9697
$qb = $this->mailMagazineSendHistoryRepository->getQueryBuilderBySearchData($searchData);
9798

98-
$pagination = $paginator->paginate($qb, $pageNo, $pageCount);
99+
$pagination = $this->paginator->paginate($qb, $pageNo, $pageCount);
99100

100101
return [
101102
'pagination' => $pagination,
@@ -198,12 +199,12 @@ public function delete(#[MapEntity(id: 'id')] MailMagazineSendHistory $mailMagaz
198199
$this->mailMagazineService->unlinkHistoryFiles($id);
199200

200201
$this->addSuccess('admin.mailmagazine.history.delete.sucesss', 'admin');
201-
} catch (\Exception $e) {
202+
} catch (\Exception) {
202203
$this->addError('admin.mailmagazine.history.delete.failure', 'admin');
203204
}
204205

205206
// メルマガテンプレート一覧へリダイレクト
206-
return $this->redirect($this->generateUrl('plugin_mail_magazine_history'));
207+
return $this->redirectToRoute('plugin_mail_magazine_history');
207208
}
208209

209210
#[Route('/%eccube_admin_route%/plugin/mail_magazine/history/{id}/retry', name: 'plugin_mail_magazine_history_retry', requirements: ['id' => '\d+'], methods: ['POST'])]
@@ -236,13 +237,13 @@ public function retry(Request $request, #[MapEntity(id: 'id')] MailMagazineSendH
236237
#[Route('/%eccube_admin_route%/plugin/mail_magazine/history/result/{id}', name: 'plugin_mail_magazine_history_result', requirements: ['id' => '\d+'])]
237238
#[Route('/%eccube_admin_route%/plugin/mail_magazine/history/result/{id}/{page_no}', name: 'plugin_mail_magazine_history_result_page', requirements: ['id' => '\d+', 'page_no' => '\d+'])]
238239
#[Template('@MailMagazine44/admin/history_result.twig')]
239-
public function result(Request $request, #[MapEntity(id: 'id')] MailMagazineSendHistory $mailMagazineSendHistory, PaginatorInterface $paginator, int $page_no = 1): array
240+
public function result(Request $request, #[MapEntity(id: 'id')] MailMagazineSendHistory $mailMagazineSendHistory, int $page_no = 1): array
240241
{
241242
$resultFile = $this->mailMagazineService->getHistoryFileName($mailMagazineSendHistory->getId(), false);
242243
$pageMaxis = $this->pageMaxRepository->findAll();
243244
$pageCount = (int) ($request->get('page_count') ?: $this->eccubeConfig['eccube_default_page_count']);
244245

245-
$pagination = $paginator->paginate($resultFile,
246+
$pagination = $this->paginator->paginate($resultFile,
246247
$page_no,
247248
$pageCount
248249
);

‎Controller/MailMagazineTemplateController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ public function delete(#[MapEntity(id: 'id')] MailMagazineTemplate $mailMagazine
8787
$this->mailMagazineTemplateRepository->delete($mailMagazineTemplate);
8888
$this->entityManager->flush();
8989
$this->addSuccess('admin.mailmagazine.template.delete.complete', 'admin');
90-
} catch (\Exception $e) {
90+
} catch (\Exception) {
9191
$this->addError('admin.mailmagazine.template.delete.failure', 'admin');
9292
}
9393

9494
// メルマガテンプレート一覧へリダイレクト
95-
return $this->redirect($this->generateUrl('plugin_mail_magazine_template'));
95+
return $this->redirectToRoute('plugin_mail_magazine_template');
9696
}
9797

9898
/**
@@ -130,7 +130,7 @@ public function commit(Request $request, ?int $id = null): Response|array
130130
if (is_null($Template)) {
131131
$this->addError('admin.mailmagazine.template.data.notfound', 'admin');
132132

133-
return $this->redirect($this->generateUrl('plugin_mail_magazine_template'));
133+
return $this->redirectToRoute('plugin_mail_magazine_template');
134134
}
135135

136136
// Formを取得
@@ -156,7 +156,7 @@ public function commit(Request $request, ?int $id = null): Response|array
156156
$this->entityManager->flush();
157157
// 成功時のメッセージを登録する
158158
$this->addSuccess('admin.mailmagazine.template.save.complete', 'admin');
159-
} catch (\Exception $e) {
159+
} catch (\Exception) {
160160
$this->addError('admin.mailmagazine.template.save.failure', 'admin');
161161

162162
return [
@@ -167,7 +167,7 @@ public function commit(Request $request, ?int $id = null): Response|array
167167
}
168168

169169
// メルマガテンプレート一覧へリダイレクト
170-
return $this->redirect($this->generateUrl('plugin_mail_magazine_template'));
170+
return $this->redirectToRoute('plugin_mail_magazine_template');
171171
}
172172

173173
/**

‎Entity/MailMagazineTemplate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#[ORM\Table(name: 'plg_mailmaga_template')]
2222
#[ORM\Entity(repositoryClass: MailMagazineTemplateRepository::class)]
23-
class MailMagazineTemplate extends AbstractEntity
23+
class MailMagazineTemplate extends AbstractEntity implements \Stringable
2424
{
2525
public function __toString(): string
2626
{

‎Event/MailMagazineHistoryFilePaginationSubscriber.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,19 @@
1919

2020
class MailMagazineHistoryFilePaginationSubscriber implements EventSubscriberInterface
2121
{
22-
/**
23-
* @var MailMagazineService
24-
*/
25-
protected MailMagazineService $mailMagazineService;
26-
2722
/**
2823
* MailMagazineHistoryFilePaginationSubscriber constructor.
2924
*
3025
* @param MailMagazineService $mailMagazineService
3126
*/
32-
public function __construct(MailMagazineService $mailMagazineService)
27+
public function __construct(protected MailMagazineService $mailMagazineService)
3328
{
34-
$this->mailMagazineService = $mailMagazineService;
3529
}
3630

3731
public function items(ItemsEvent $event): void
3832
{
3933
$mailMagazineDir = $this->mailMagazineService->getMailMagazineDir();
40-
if (!is_string($event->target) || strpos($event->target, $mailMagazineDir) !== 0) {
34+
if (!is_string($event->target) || !str_starts_with($event->target, $mailMagazineDir)) {
4135
return;
4236
}
4337

@@ -68,7 +62,7 @@ public function items(ItemsEvent $event): void
6862
continue;
6963
}
7064
if ($count > 0) {
71-
list($status, $customerId, $email, $name) = explode(',', str_replace(PHP_EOL, '', $line), 4);
65+
[$status, $customerId, $email, $name] = explode(',', str_replace(PHP_EOL, '', $line), 4);
7266
$event->items[] = [
7367
'status' => $status,
7468
'customerId' => $customerId,

‎Form/Type/MailMagazineTemplateType.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ public function configureOptions(OptionsResolver $resolver): void
3939
'expanded' => false,
4040
'required' => false,
4141
'placeholder' => '-',
42-
'query_builder' => function (EntityRepository $er): QueryBuilder {
43-
return $er->createQueryBuilder('mt')
44-
->orderBy('mt.id', 'ASC');
45-
},
42+
'query_builder' => fn (EntityRepository $er): QueryBuilder => $er->createQueryBuilder('mt')
43+
->orderBy('mt.id', 'ASC'),
4644
]);
4745
}
4846

‎Form/Type/MailMagazineType.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
3333
{
3434
parent::buildForm($builder, $options);
3535

36-
$constraints = isset($options['eccube_form_options']['constraints'])
37-
? $options['eccube_form_options']['constraints']
38-
: true;
36+
$constraints = $options['eccube_form_options']['constraints'] ?? true;
3937

4038
// 以降テンプレート選択で使用する項目
4139
$builder->add('id', HiddenType::class)

‎Repository/MailMagazineSendHistoryRepository.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
*/
2727
class MailMagazineSendHistoryRepository extends AbstractRepository
2828
{
29-
/**
30-
* @var Queries
31-
*/
32-
protected Queries $queries;
33-
3429
/**
3530
* MailMagazineSendHistoryRepository constructor.
3631
*
@@ -39,12 +34,11 @@ class MailMagazineSendHistoryRepository extends AbstractRepository
3934
* @param string $entityClass
4035
*/
4136
public function __construct(
42-
Queries $queries,
37+
protected Queries $queries,
4338
ManagerRegistry $registry,
4439
string $entityClass = MailMagazineSendHistory::class,
4540
) {
4641
parent::__construct($registry, $entityClass);
47-
$this->queries = $queries;
4842
}
4943

5044
/**

0 commit comments

Comments
 (0)