diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php index f3f65cc..c8730dc 100755 --- a/Controller/Admin/ConfigController.php +++ b/Controller/Admin/ConfigController.php @@ -11,10 +11,10 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Controller\Admin; +namespace Plugin\ProductReview42\Controller\Admin; -use Plugin\ProductReview4\Form\Type\Admin\ProductReviewConfigType; -use Plugin\ProductReview4\Repository\ProductReviewConfigRepository; +use Plugin\ProductReview42\Form\Type\Admin\ProductReviewConfigType; +use Plugin\ProductReview42\Repository\ProductReviewConfigRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; @@ -25,8 +25,8 @@ class ConfigController extends \Eccube\Controller\AbstractController { /** - * @Route("/%eccube_admin_route%/product_review/config", name="product_review4_admin_config") - * @Template("@ProductReview4/admin/config.twig") + * @Route("/%eccube_admin_route%/product_review/config", name="product_review42_admin_config") + * @Template("@ProductReview42/admin/config.twig") * * @param Request $request * @param ProductReviewConfigRepository $configRepository @@ -47,7 +47,7 @@ public function index(Request $request, ProductReviewConfigRepository $configRep log_info('Product review config', ['status' => 'Success']); $this->addSuccess('product_review.admin.save.complete', 'admin'); - return $this->redirectToRoute('product_review4_admin_config'); + return $this->redirectToRoute('product_review42_admin_config'); } return [ diff --git a/Controller/Admin/ProductReviewController.php b/Controller/Admin/ProductReviewController.php index 6e17bce..88bcd63 100755 --- a/Controller/Admin/ProductReviewController.php +++ b/Controller/Admin/ProductReviewController.php @@ -11,19 +11,19 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Controller\Admin; +namespace Plugin\ProductReview42\Controller\Admin; use Eccube\Controller\AbstractController; use Eccube\Repository\Master\PageMaxRepository; use Eccube\Service\CsvExportService; use Eccube\Util\FormUtil; use Knp\Component\Pager\PaginatorInterface; -use Plugin\ProductReview4\Entity\ProductReview; -use Plugin\ProductReview4\Entity\ProductReviewConfig; -use Plugin\ProductReview4\Form\Type\Admin\ProductReviewSearchType; -use Plugin\ProductReview4\Form\Type\Admin\ProductReviewType; -use Plugin\ProductReview4\Repository\ProductReviewConfigRepository; -use Plugin\ProductReview4\Repository\ProductReviewRepository; +use Plugin\ProductReview42\Entity\ProductReview; +use Plugin\ProductReview42\Entity\ProductReviewConfig; +use Plugin\ProductReview42\Form\Type\Admin\ProductReviewSearchType; +use Plugin\ProductReview42\Form\Type\Admin\ProductReviewType; +use Plugin\ProductReview42\Repository\ProductReviewConfigRepository; +use Plugin\ProductReview42\Repository\ProductReviewRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -79,7 +79,7 @@ public function __construct( * * @Route("/%eccube_admin_route%/product_review/", name="product_review_admin_product_review") * @Route("/%eccube_admin_route%/product_review/page/{page_no}", requirements={"page_no" = "\d+"}, name="product_review_admin_product_review_page") - * @Template("@ProductReview4/admin/index.twig") + * @Template("@ProductReview42/admin/index.twig") * * @param Request $request * @param null $page_no @@ -169,7 +169,7 @@ public function index(Request $request, $page_no = null, PaginatorInterface $pag * 編集. * * @Route("%eccube_admin_route%/product_review/{id}/edit", name="product_review_admin_product_review_edit") - * @Template("@ProductReview4/admin/edit.twig") + * @Template("@ProductReview42/admin/edit.twig") * * @param Request $request * @param $id diff --git a/Controller/ProductReviewController.php b/Controller/ProductReviewController.php index 8106c99..582b193 100755 --- a/Controller/ProductReviewController.php +++ b/Controller/ProductReviewController.php @@ -11,16 +11,16 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Controller; +namespace Plugin\ProductReview42\Controller; use Eccube\Controller\AbstractController; use Eccube\Entity\Master\ProductStatus; use Eccube\Entity\Product; -use Plugin\ProductReview4\Entity\ProductReview; -use Plugin\ProductReview4\Entity\ProductReviewStatus; -use Plugin\ProductReview4\Form\Type\ProductReviewType; -use Plugin\ProductReview4\Repository\ProductReviewRepository; -use Plugin\ProductReview4\Repository\ProductReviewStatusRepository; +use Plugin\ProductReview42\Entity\ProductReview; +use Plugin\ProductReview42\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Form\Type\ProductReviewType; +use Plugin\ProductReview42\Repository\ProductReviewRepository; +use Plugin\ProductReview42\Repository\ProductReviewStatusRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -86,7 +86,7 @@ public function index(Request $request, Product $Product) case 'confirm': log_info('Product review config confirm'); - return $this->render('ProductReview4/Resource/template/default/confirm.twig', [ + return $this->render('ProductReview42/Resource/template/default/confirm.twig', [ 'form' => $form->createView(), 'Product' => $Product, 'ProductReview' => $ProductReview, @@ -119,7 +119,7 @@ public function index(Request $request, Product $Product) } } - return $this->render('ProductReview4/Resource/template/default/index.twig', [ + return $this->render('ProductReview42/Resource/template/default/index.twig', [ 'Product' => $Product, 'ProductReview' => $ProductReview, 'form' => $form->createView(), @@ -130,7 +130,7 @@ public function index(Request $request, Product $Product) * Complete. * * @Route("/product_review/{id}/complete", name="product_review_complete", requirements={"id" = "\d+"}) - * @Template("ProductReview4/Resource/template/default/complete.twig") + * @Template("ProductReview42/Resource/template/default/complete.twig") * * @param $id * diff --git a/Entity/ProductReview.php b/Entity/ProductReview.php index 35c34d2..c5be11a 100755 --- a/Entity/ProductReview.php +++ b/Entity/ProductReview.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Entity; +namespace Plugin\ProductReview42\Entity; use Doctrine\ORM\Mapping as ORM; use Eccube\Entity\AbstractEntity; @@ -23,7 +23,7 @@ * ProductReview * * @ORM\Table(name="plg_product_review") - * @ORM\Entity(repositoryClass="Plugin\ProductReview4\Repository\ProductReviewRepository") + * @ORM\Entity(repositoryClass="Plugin\ProductReview42\Repository\ProductReviewRepository") */ class ProductReview extends AbstractEntity { @@ -116,9 +116,9 @@ class ProductReview extends AbstractEntity private $update_date; /** - * @var \Plugin\ProductReview4\Entity\ProductReviewStatus + * @var \Plugin\ProductReview42\Entity\ProductReviewStatus * - * @ORM\ManyToOne(targetEntity="Plugin\ProductReview4\Entity\ProductReviewStatus") + * @ORM\ManyToOne(targetEntity="Plugin\ProductReview42\Entity\ProductReviewStatus") * @ORM\JoinColumns({ * @ORM\JoinColumn(name="status_id", referencedColumnName="id") * }) @@ -328,7 +328,7 @@ public function getCustomer() } /** - * @return \Plugin\ProductReview4\Entity\ProductReviewStatus + * @return \Plugin\ProductReview42\Entity\ProductReviewStatus */ public function getStatus() { @@ -336,9 +336,9 @@ public function getStatus() } /** - * @param \Plugin\ProductReview4\Entity\ProductReviewStatus $status + * @param \Plugin\ProductReview42\Entity\ProductReviewStatus $status */ - public function setStatus(\Plugin\ProductReview4\Entity\ProductReviewStatus $Status) + public function setStatus(\Plugin\ProductReview42\Entity\ProductReviewStatus $Status) { $this->Status = $Status; } diff --git a/Entity/ProductReviewConfig.php b/Entity/ProductReviewConfig.php index d4deaed..248936c 100755 --- a/Entity/ProductReviewConfig.php +++ b/Entity/ProductReviewConfig.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Entity; +namespace Plugin\ProductReview42\Entity; use Doctrine\ORM\Mapping as ORM; use Eccube\Entity\AbstractEntity; @@ -21,7 +21,7 @@ * ProductReviewConfig * * @ORM\Table(name="plg_product_review_config") - * @ORM\Entity(repositoryClass="Plugin\ProductReview4\Repository\ProductReviewConfigRepository") + * @ORM\Entity(repositoryClass="Plugin\ProductReview42\Repository\ProductReviewConfigRepository") */ class ProductReviewConfig extends AbstractEntity { diff --git a/Entity/ProductReviewStatus.php b/Entity/ProductReviewStatus.php index f48bb3b..fcb6613 100755 --- a/Entity/ProductReviewStatus.php +++ b/Entity/ProductReviewStatus.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Entity; +namespace Plugin\ProductReview42\Entity; use Doctrine\ORM\Mapping as ORM; use Eccube\Entity\Master\AbstractMasterEntity; @@ -20,7 +20,7 @@ * ProductReviewStatus * * @ORM\Table(name="plg_product_review_status") - * @ORM\Entity(repositoryClass="Plugin\ProductReview4\Repository\ProductReviewStatusRepository") + * @ORM\Entity(repositoryClass="Plugin\ProductReview42\Repository\ProductReviewStatusRepository") */ class ProductReviewStatus extends AbstractMasterEntity { diff --git a/Form/Type/Admin/ProductReviewConfigType.php b/Form/Type/Admin/ProductReviewConfigType.php index 1f25c09..3418752 100755 --- a/Form/Type/Admin/ProductReviewConfigType.php +++ b/Form/Type/Admin/ProductReviewConfigType.php @@ -11,10 +11,10 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Form\Type\Admin; +namespace Plugin\ProductReview42\Form\Type\Admin; use Eccube\Common\EccubeConfig; -use Plugin\ProductReview4\Entity\ProductReviewConfig; +use Plugin\ProductReview42\Entity\ProductReviewConfig; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/Form/Type/Admin/ProductReviewSearchType.php b/Form/Type/Admin/ProductReviewSearchType.php index 5e0f046..dcae6a8 100755 --- a/Form/Type/Admin/ProductReviewSearchType.php +++ b/Form/Type/Admin/ProductReviewSearchType.php @@ -11,11 +11,11 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Form\Type\Admin; +namespace Plugin\ProductReview42\Form\Type\Admin; use Eccube\Common\EccubeConfig; use Eccube\Form\Type\Master\SexType; -use Plugin\ProductReview4\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Entity\ProductReviewStatus; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/Form/Type/Admin/ProductReviewType.php b/Form/Type/Admin/ProductReviewType.php index 4d4b856..b1e0152 100755 --- a/Form/Type/Admin/ProductReviewType.php +++ b/Form/Type/Admin/ProductReviewType.php @@ -11,11 +11,11 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Form\Type\Admin; +namespace Plugin\ProductReview42\Form\Type\Admin; use Eccube\Common\EccubeConfig; use Eccube\Form\Type\Master\SexType; -use Plugin\ProductReview4\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Entity\ProductReviewStatus; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/Form/Type/ProductReviewType.php b/Form/Type/ProductReviewType.php index 6fd9d34..898d2dd 100755 --- a/Form/Type/ProductReviewType.php +++ b/Form/Type/ProductReviewType.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Form\Type; +namespace Plugin\ProductReview42\Form\Type; use Eccube\Common\EccubeConfig; use Eccube\Form\Type\Master\SexType; diff --git a/PluginManager.php b/PluginManager.php index d2040a9..be845ca 100644 --- a/PluginManager.php +++ b/PluginManager.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4; +namespace Plugin\ProductReview42; use Doctrine\ORM\EntityManagerInterface; use Eccube\Common\EccubeConfig; @@ -22,8 +22,8 @@ use Eccube\Entity\PageLayout; use Eccube\Plugin\AbstractPluginManager; use Eccube\Repository\PageRepository; -use Plugin\ProductReview4\Entity\ProductReviewConfig; -use Plugin\ProductReview4\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Entity\ProductReviewConfig; +use Plugin\ProductReview42\Entity\ProductReviewStatus; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Filesystem\Filesystem; @@ -33,22 +33,22 @@ class PluginManager extends AbstractPluginManager [ 'name' => 'レビューを表示', 'url' => 'product_review_display', - 'filename' => 'ProductReview4/Resource/template/default/review', + 'filename' => 'ProductReview42/Resource/template/default/review', ], [ 'name' => 'レビューを投稿', 'url' => 'product_review_index', - 'filename' => 'ProductReview4/Resource/template/default/index', + 'filename' => 'ProductReview42/Resource/template/default/index', ], [ 'name' => 'レビューを投稿(確認)', 'url' => 'product_review_confirm', - 'filename' => 'ProductReview4/Resource/template/default/confirm', + 'filename' => 'ProductReview42/Resource/template/default/confirm', ], [ 'name' => 'レビューを投稿(完了)', 'url' => 'product_review_complete', - 'filename' => 'ProductReview4/Resource/template/default/complete', + 'filename' => 'ProductReview42/Resource/template/default/complete', ], ]; @@ -205,7 +205,7 @@ protected function createPage(EntityManagerInterface $em, $name, $url, $filename protected function copyTwigFiles(ContainerInterface $container) { $templatePath = $container->getParameter('eccube_theme_front_dir') - .'/ProductReview4/Resource/template/default'; + .'/ProductReview42/Resource/template/default'; $fs = new Filesystem(); if ($fs->exists($templatePath)) { return; @@ -219,7 +219,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $rank = 1; $Csv = new Csv(); $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('Product') ->setReferenceFieldName('name') ->setDispName('商品名') @@ -230,7 +230,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('Status') ->setReferenceFieldName('name') ->setDispName('公開・非公開') @@ -241,7 +241,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('create_date') ->setReferenceFieldName('create_date') ->setDispName('投稿日') @@ -252,7 +252,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('reviewer_name') ->setReferenceFieldName('reviewer_name') ->setDispName('投稿者名') @@ -263,7 +263,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('reviewer_url') ->setReferenceFieldName('reviewer_url') ->setDispName('投稿者URL') @@ -274,7 +274,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('Sex') ->setReferenceFieldName('name') ->setDispName('性別') @@ -285,7 +285,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('recommend_level') ->setReferenceFieldName('recommend_level') ->setDispName('おすすめレベル') @@ -296,7 +296,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('title') ->setReferenceFieldName('title') ->setDispName('タイトル') @@ -307,7 +307,7 @@ protected function createCsvData(EntityManagerInterface $em, CsvType $CsvType) $Csv = new Csv(); ++$rank; $Csv->setCsvType($CsvType) - ->setEntityName('Plugin\ProductReview4\Entity\ProductReview') + ->setEntityName('Plugin\ProductReview42\Entity\ProductReview') ->setFieldName('comment') ->setReferenceFieldName('comment') ->setDispName('コメント') @@ -337,7 +337,7 @@ protected function removePage(EntityManagerInterface $em, $url) protected function removeTwigFiles(ContainerInterface $container) { $templatePath = $container->getParameter('eccube_theme_front_dir') - .'/ProductReview4'; + .'/ProductReview42'; $fs = new Filesystem(); $fs->remove($templatePath); } diff --git a/ProductReviewEvent.php b/ProductReviewEvent.php index cae140c..1902c1f 100644 --- a/ProductReviewEvent.php +++ b/ProductReviewEvent.php @@ -11,14 +11,14 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4; +namespace Plugin\ProductReview42; use Eccube\Entity\Product; use Eccube\Event\TemplateEvent; use Eccube\Repository\Master\ProductStatusRepository; -use Plugin\ProductReview4\Entity\ProductReviewStatus; -use Plugin\ProductReview4\Repository\ProductReviewConfigRepository; -use Plugin\ProductReview4\Repository\ProductReviewRepository; +use Plugin\ProductReview42\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Repository\ProductReviewConfigRepository; +use Plugin\ProductReview42\Repository\ProductReviewRepository; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class ProductReviewEvent implements EventSubscriberInterface @@ -70,7 +70,7 @@ public static function getSubscribedEvents() */ public function detail(TemplateEvent $event) { - $event->addSnippet('ProductReview4/Resource/template/default/review.twig'); + $event->addSnippet('ProductReview42/Resource/template/default/review.twig'); $Config = $this->productReviewConfigRepository->get(); diff --git a/ProductReviewNav.php b/ProductReviewNav.php index 640b888..6dd8ae7 100644 --- a/ProductReviewNav.php +++ b/ProductReviewNav.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4; +namespace Plugin\ProductReview42; use Eccube\Common\EccubeNav; diff --git a/Repository/ProductReviewConfigRepository.php b/Repository/ProductReviewConfigRepository.php index fc349cd..31cb9a6 100755 --- a/Repository/ProductReviewConfigRepository.php +++ b/Repository/ProductReviewConfigRepository.php @@ -11,11 +11,11 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Repository; +namespace Plugin\ProductReview42\Repository; use Eccube\Repository\AbstractRepository; -use Plugin\ProductReview4\Entity\ProductReviewConfig; -use Symfony\Bridge\Doctrine\RegistryInterface; +use Plugin\ProductReview42\Entity\ProductReviewConfig; +use Doctrine\Persistence\ManagerRegistry; /** * ProductReview Config. @@ -28,9 +28,9 @@ class ProductReviewConfigRepository extends AbstractRepository /** * ProductReviewConfigRepository constructor. * - * @param RegistryInterface $registry + * @param ManagerRegistry $registry */ - public function __construct(RegistryInterface $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, ProductReviewConfig::class); } diff --git a/Repository/ProductReviewRepository.php b/Repository/ProductReviewRepository.php index f178b1a..12ac4ae 100755 --- a/Repository/ProductReviewRepository.php +++ b/Repository/ProductReviewRepository.php @@ -11,14 +11,14 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Repository; +namespace Plugin\ProductReview42\Repository; use Doctrine\ORM\QueryBuilder; use Eccube\Entity\Product; use Eccube\Repository\AbstractRepository; use Eccube\Util\StringUtil; -use Plugin\ProductReview4\Entity\ProductReview; -use Symfony\Bridge\Doctrine\RegistryInterface; +use Plugin\ProductReview42\Entity\ProductReview; +use Doctrine\Persistence\ManagerRegistry; /** * ProductReview. @@ -31,9 +31,9 @@ class ProductReviewRepository extends AbstractRepository /** * ProductReviewRepository constructor. * - * @param RegistryInterface $registry + * @param ManagerRegistry $registry */ - public function __construct(RegistryInterface $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, ProductReview::class); } diff --git a/Repository/ProductReviewStatusRepository.php b/Repository/ProductReviewStatusRepository.php index 0f53651..ef9b598 100755 --- a/Repository/ProductReviewStatusRepository.php +++ b/Repository/ProductReviewStatusRepository.php @@ -11,11 +11,11 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Repository; +namespace Plugin\ProductReview42\Repository; use Eccube\Repository\AbstractRepository; -use Plugin\ProductReview4\Entity\ProductReviewStatus; -use Symfony\Bridge\Doctrine\RegistryInterface; +use Plugin\ProductReview42\Entity\ProductReviewStatus; +use Doctrine\Persistence\ManagerRegistry; /** * ProductReview Status. @@ -28,9 +28,9 @@ class ProductReviewStatusRepository extends AbstractRepository /** * ProductReviewStatusRepository constructor. * - * @param RegistryInterface $registry + * @param ManagerRegistry $registry */ - public function __construct(RegistryInterface $registry) + public function __construct(ManagerRegistry $registry) { parent::__construct($registry, ProductReviewStatus::class); } diff --git a/Resource/template/admin/config.twig b/Resource/template/admin/config.twig index 3b01a13..59f9e6a 100755 --- a/Resource/template/admin/config.twig +++ b/Resource/template/admin/config.twig @@ -23,7 +23,7 @@ {% block main %} -
+ {{ form_widget(form._token) }}
diff --git a/Resource/template/default/confirm.twig b/Resource/template/default/confirm.twig index 12abb7d..3292caf 100755 --- a/Resource/template/default/confirm.twig +++ b/Resource/template/default/confirm.twig @@ -79,7 +79,7 @@ file that was distributed with this source code.
- {% for child in form.recommend_level.children if child.vars.checked %} + {% for child in form.recommend_level.children|filter(child => child.vars.checked) %} {{ child.vars.label }} {% endfor %} {{ form_widget(form.recommend_level, { type: 'hidden' }) }} diff --git a/Tests/Web/ProductReviewConfigControllerTest.php b/Tests/Web/ProductReviewConfigControllerTest.php index c8be788..024fe7b 100755 --- a/Tests/Web/ProductReviewConfigControllerTest.php +++ b/Tests/Web/ProductReviewConfigControllerTest.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Tests\Web; +namespace Plugin\ProductReview42\Tests\Web; use Eccube\Tests\Web\Admin\AbstractAdminWebTestCase; use Faker\Generator; @@ -31,7 +31,7 @@ class ProductReviewConfigControllerTest extends AbstractAdminWebTestCase /** * Setup method. */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->faker = $this->getFaker(); @@ -49,7 +49,7 @@ public function testRouting() /** * @var Crawler */ - $crawler = $this->client->request('GET', $this->generateUrl('product_review4_admin_config')); + $crawler = $this->client->request('GET', $this->generateUrl('product_review42_admin_config')); $this->assertTrue($client->getResponse()->isSuccessful()); @@ -71,7 +71,7 @@ public function testMin() /** * @var Crawler */ - $crawler = $this->client->request('GET', $this->generateUrl('product_review4_admin_config')); + $crawler = $this->client->request('GET', $this->generateUrl('product_review42_admin_config')); $this->assertTrue($client->getResponse()->isSuccessful()); @@ -96,7 +96,7 @@ public function testMax() /** * @var Crawler */ - $crawler = $this->client->request('GET', $this->generateUrl('product_review4_admin_config')); + $crawler = $this->client->request('GET', $this->generateUrl('product_review42_admin_config')); $this->assertTrue($client->getResponse()->isSuccessful()); @@ -122,7 +122,7 @@ public function testSuccess() /** * @var Crawler */ - $crawler = $this->client->request('GET', $this->generateUrl('product_review4_admin_config')); + $crawler = $this->client->request('GET', $this->generateUrl('product_review42_admin_config')); $this->assertTrue($client->getResponse()->isSuccessful()); @@ -131,7 +131,7 @@ public function testSuccess() $form['product_review_config[review_max]'] = $this->faker->numberBetween($min, $max); $crawler = $client->submit($form); - $this->assertTrue($client->getResponse()->isRedirection($this->generateUrl('product_review4_admin_config'))); + $this->assertTrue($client->getResponse()->isRedirection($this->generateUrl('product_review42_admin_config'))); $crawler = $client->followRedirect(); $this->assertContains('登録しました。', $crawler->html()); diff --git a/Tests/Web/ReviewAdminControllerTest.php b/Tests/Web/ReviewAdminControllerTest.php index 42897ee..5664e8d 100755 --- a/Tests/Web/ReviewAdminControllerTest.php +++ b/Tests/Web/ReviewAdminControllerTest.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Tests\Web; +namespace Plugin\ProductReview42\Tests\Web; use Eccube\Entity\Master\Sex; use Eccube\Entity\Product; @@ -20,9 +20,9 @@ use Eccube\Repository\ProductRepository; use Eccube\Tests\Web\Admin\AbstractAdminWebTestCase; use Faker\Generator; -use Plugin\ProductReview4\Entity\ProductReview; -use Plugin\ProductReview4\Entity\ProductReviewStatus; -use Plugin\ProductReview4\Repository\ProductReviewRepository; +use Plugin\ProductReview42\Entity\ProductReview; +use Plugin\ProductReview42\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Repository\ProductReviewRepository; use Symfony\Component\DomCrawler\Crawler; use Symfony\Component\HttpFoundation\Response; @@ -55,7 +55,7 @@ class ReviewAdminControllerTest extends AbstractAdminWebTestCase /** * Setup method. */ - public function setUp() + public function setUp():void { parent::setUp(); $this->faker = $this->getFaker(); diff --git a/Tests/Web/ReviewControllerTest.php b/Tests/Web/ReviewControllerTest.php index 54f392f..11f0e25 100755 --- a/Tests/Web/ReviewControllerTest.php +++ b/Tests/Web/ReviewControllerTest.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\ProductReview4\Tests\Web; +namespace Plugin\ProductReview42\Tests\Web; use Eccube\Entity\Master\Sex; use Eccube\Entity\Product; @@ -20,8 +20,8 @@ use Eccube\Repository\ProductRepository; use Eccube\Tests\Web\AbstractWebTestCase; use Faker\Generator; -use Plugin\ProductReview4\Entity\ProductReview; -use Plugin\ProductReview4\Entity\ProductReviewStatus; +use Plugin\ProductReview42\Entity\ProductReview; +use Plugin\ProductReview42\Entity\ProductReviewStatus; use Symfony\Component\DomCrawler\Crawler; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -54,7 +54,7 @@ class ReviewControllerTest extends AbstractWebTestCase /** * Setup method. */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->faker = $this->getFaker(); diff --git a/composer.json b/composer.json index 6b59fd3..ed139aa 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { - "name": "ec-cube/productreview4", - "version": "4.1.0", + "name": "ec-cube/productreview42", + "version": "4.2.0", "description": "商品レビュー管理プラグイン", "type": "eccube-plugin", "require": { - "ec-cube/plugin-installer": "~0.0.6 || ^2.0" + "ec-cube/plugin-installer": "^2.0" }, "extra": { - "code": "ProductReview4" + "code": "ProductReview42" } }