Merge pull request #108 from nanasess/improve/4.1

4.1 support
EC-CUBE · Aug 12, 2021 · 993c51e · 993c51e
2 parents 112e4d0 + a879b3d
commit 993c51e
Show file tree

Hide file tree

Showing 16 changed files with 247 additions and 258 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,177 @@
+name: CI for MailMagazine4
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    branches:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+jobs:
+  run-on-linux:
+    name: Run on Linux
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-18.04 ]
+        php: [ '7.1', '7.2', '7.3', '7.4' ]
+        db: [ mysql, pgsql ]
+        eccube_version: [ '4.0.6-p1', '4.1' ]
+        plugin_code: [ 'MailMagazine4' ]
+        include:
+          - eccube_version: '4.0.6-p1'
+            composer: 'v1'
+          - eccube_version: '4.1'
+            composer: 'v2'
+          - db: mysql
+            dbport: '3306'
+            dbuser: 'root'
+            dbpass: 'root'
+            dbname: 'myapp_test'
+            dbversion: 5.7
+          - db: pgsql
+            dbport: '5432'
+            dbuser: 'postgres'
+            dbpass: 'password'
+            dbname: 'myapp_test'
+            dbversion: 9.5
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: ${{ matrix.dbname }}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      postgres:
+        image: postgres:9.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ${{ matrix.dbname }}
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mailcatcher:
+        image: schickling/mailcatcher
+        ports:
+          - 1080:1080
+          - 1025:1025
+    steps:
+    - run: sudo apt-get purge -y hhvm
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: nanasess/setup-php@master
+      with:
+        php-version: ${{ matrix.php }}
+
+    - name: Archive Plugin
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      run: |
+        tar cvzf ${GITHUB_WORKSPACE}/${PLUGIN_CODE}.tar.gz ./*
+    - name: Checkout EC-CUBE
+      uses: actions/checkout@v2
+      with:
+        repository: 'EC-CUBE/ec-cube'
+        ref: ${{ matrix.eccube_version }}
+        path: 'ec-cube'
+
+    - name: Get Composer Cache Directory
+      id: composer-cache
+      run: |
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - uses: actions/cache@v1
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-composer-
+
+    - if: matrix.composer == 'v1'
+      run: sudo composer selfupdate --1
+
+    - name: Install to composer
+      working-directory: 'ec-cube'
+      run: composer install --no-interaction -o --apcu-autoloader
+
+    - if: matrix.composer == 'v1'
+      working-directory: 'ec-cube'
+      run: composer require kiy0taka/eccube4-test-fixer "dev-main@dev"
+
+    - name: Setup EC-CUBE
+      env:
+        DB: ${{ matrix.db }}
+        USER: ${{ matrix.dbuser }}
+        DBUSER: ${{ matrix.dbuser }}
+        DBPASS: ${{ matrix.dbpass }}
+        DBNAME: ${{ matrix.dbname }}
+        DBPORT: ${{ matrix.dbport }}
+        DBSERVER: 127.0.0.1
+        DBVERSION: ${{ matrix.dbversion }}
+        ROOT_URLPATH: /ec-cube/html
+      working-directory: 'ec-cube'
+      run: |
+        export PGPASSWORD=${DBPASS}
+        echo "APP_ENV=prod" > .env
+        echo "APP_DEBUG=0" >> .env
+        echo "DATABASE_URL=${DB}://${DBUSER}:${DBPASS}@${DBSERVER}/${DBNAME}" >> .env
+        echo "DATABASE_SERVER_VERSION=${DBVERSION}" >> .env
+        echo "MAILER_URL=smtp://127.0.0.1:1025" >> .env
+        echo "HTTP_SITEURL=https://localhost" >> .env
+        echo "USE_SELFSIGNED_SSL_CERTIFICATE=1" >> .env
+        cat .env
+        bin/console doctrine:schema:create
+        bin/console eccube:fixtures:load
+
+    - name: Setup Plugin
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      working-directory: 'ec-cube'
+      run: |
+        bin/console eccube:plugin:install --code=${PLUGIN_CODE} --path=${GITHUB_WORKSPACE}/${PLUGIN_CODE}.tar.gz
+        bin/console eccube:plugin:enable --code=${PLUGIN_CODE}
+        rm codeception/_support/*Tester.php
+
+    - name: Run PHPUnit
+      if: matrix.composer == 'v2'
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      working-directory: 'ec-cube'
+      run: bin/phpunit -c app/Plugin/${PLUGIN_CODE}/phpunit.xml.dist app/Plugin/${PLUGIN_CODE}/Tests
+
+    - name: Run PHPUnit
+      if: matrix.composer == 'v1'
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      working-directory: 'ec-cube'
+      run: |
+        find app/Plugin/${PLUGIN_CODE}/Tests -name "*Test.php" | while read TESTCASE
+        do
+          ./vendor/bin/phpunit -c app/Plugin/${PLUGIN_CODE}/phpunit.xml.dist --include-path vendor/kiy0taka/eccube4-test-fixer/src --loader 'Eccube\PHPUnit\Loader\Eccube4CompatTestSuiteLoader' ${TESTCASE}
+        done
+
+    - name: Disable Plugin
+      working-directory: 'ec-cube'
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      run: bin/console eccube:plugin:disable --code=${PLUGIN_CODE}
+
+    - name: Uninstall Plugin
+      env:
+        PLUGIN_CODE: ${{ matrix.plugin_code }}
+      working-directory: 'ec-cube'
+      run: bin/console eccube:plugin:uninstall --code=${PLUGIN_CODE}
diff --git a/.travis.yml b/.travis.yml
diff --git a/Controller/MailMagazineController.php b/Controller/MailMagazineController.php
@@ -25,7 +25,7 @@
 use Eccube\Repository\Master\PageMaxRepository;
 use Eccube\Util\FormUtil;
 use Eccube\Repository\CustomerRepository;
-use Knp\Component\Pager\Paginator;
+use Knp\Component\Pager\PaginatorInterface;
 use Plugin\MailMagazine4\Form\Type\MailMagazineType;
 use Doctrine\ORM\QueryBuilder;
 use Eccube\Common\Constant;
@@ -86,12 +86,12 @@ public function __construct(
      * @Template("@MailMagazine4/admin/index.twig")
      *
      * @param Request $request
-     * @param Paginator $paginator
+     * @param PaginatorInterface $paginator
      * @param integer $page_no
      *
      * @return \Symfony\Component\HttpFoundation\Response|array
      */
-    public function index(Request $request, Paginator $paginator, $page_no = null, \Swift_Mailer $mailer)
+    public function index(Request $request, PaginatorInterface $paginator, $page_no = null, \Swift_Mailer $mailer)
     {
         $session = $request->getSession();
         $pageNo = $page_no;

diff --git a/Controller/MailMagazineHistoryController.php b/Controller/MailMagazineHistoryController.php
@@ -16,7 +16,7 @@
 use Eccube\Controller\AbstractController;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Routing\Annotation\Route;
-use Knp\Component\Pager\Paginator;
+use Knp\Component\Pager\PaginatorInterface;
 use Plugin\MailMagazine4\Entity\MailMagazineSendHistory;
 use Plugin\MailMagazine4\Repository\MailMagazineSendHistoryRepository;
 use Plugin\MailMagazine4\Service\MailMagazineService;
@@ -70,12 +70,12 @@ public function __construct(
      * @Template("@MailMagazine4/admin/history_list.twig")
      *
      * @param Request $request
-     * @param Paginator $paginator
+     * @param PaginatorInterface $paginator
      * @param int $page_no
      *
      * @return array
      */
-    public function index(Request $request, Paginator $paginator, $page_no = 1)
+    public function index(Request $request, PaginatorInterface $paginator, $page_no = 1)
     {
         $pageNo = $page_no;
         $pageMaxis = $this->pageMaxRepository->findAll();
@@ -276,12 +276,12 @@ public function retry(Request $request, MailMagazineSendHistory $mailMagazineSen
      *
      * @param Request $request
      * @param MailMagazineSendHistory $mailMagazineSendHistory
-     * @param Paginator $paginator
+     * @param PaginatorInterface $paginator
      * @param int $page_no
      *
      * @return mixed
      */
-    public function result(Request $request, MailMagazineSendHistory $mailMagazineSendHistory, Paginator $paginator, $page_no = 1)
+    public function result(Request $request, MailMagazineSendHistory $mailMagazineSendHistory, PaginatorInterface $paginator, $page_no = 1)
     {
         $resultFile = $this->mailMagazineService->getHistoryFileName($mailMagazineSendHistory->getId(), false);
         $pageMaxis = $this->pageMaxRepository->findAll();

diff --git a/Form/Extension/CustomerMailMagazineTypeExtension.php b/Form/Extension/CustomerMailMagazineTypeExtension.php
@@ -68,4 +68,14 @@ public function getExtendedType()
     {
         return CustomerType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string[]
+     */
+    public function getExtendedTypes()
+    {
+        yield CustomerType::class;
+    }
 }