Merge pull request #28 from matsuo/update-files-for-ci

Update files for CI
emic · Jan 23, 2025 · a001d3c · a001d3c
2 parents 122bf5c + e768292
commit a001d3c
Show file tree

Hide file tree

Showing 9 changed files with 608 additions and 343 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,15 +6,18 @@ on:
       - "*"
 
 jobs:
-  test-with-wordpress63:
-    runs-on: ubuntu-latest
+  test:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      matrix:
+        wordpress-version: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7' ]
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v4
       - name: docker-run
         shell: bash
         run: |
           docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50063:80 fmpress-ubuntu
+          docker run -d --name testcontainer --rm -p 8080:80 fmpress-ubuntu
 
           docker exec -i testcontainer sh -c "php -v"
           docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
@@ -23,122 +26,4 @@ jobs:
 
           docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
 
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp63 root PASSWORD localhost 6.3 && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress62:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50062:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp62 root PASSWORD localhost 6.2 && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress61:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50061:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp61 root PASSWORD localhost 6.1 && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress60:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50060:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp60 root PASSWORD localhost 6.0 && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress59:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50059:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp59 root PASSWORD localhost 5.9 && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress58:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50058:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "rm -f /usr/local/bin/phpunit && curl -L -o /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x /usr/local/bin/phpunit && /usr/local/bin/phpunit --version"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp58 root PASSWORD localhost 5.8 && /usr/local/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
-
-  test-with-wordpress57:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - name: docker-run
-        shell: bash
-        run: |
-          docker build -t fmpress-ubuntu .
-          docker run -d --name testcontainer --rm -p 50057:80 fmpress-ubuntu
-
-          docker exec -i testcontainer sh -c "php -v"
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs -i"
-
-          docker exec -i testcontainer sh -c "/vendor/bin/phpcs --standard=/fmpress-forms/phpcs.xml --extensions=php /fmpress-forms"
-
-          docker exec -i testcontainer sh -c "/etc/init.d/mysql start &"
-
-          docker exec -i testcontainer sh -c "rm -f /usr/local/bin/phpunit && curl -L -o /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x /usr/local/bin/phpunit && /usr/local/bin/phpunit --version"
-
-          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp57 root PASSWORD localhost 5.7 && /usr/local/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
+          docker exec -i testcontainer sh -c "cd /var/www/html/wp-content/plugins/fmpress-forms && ./bin/install-wp-tests.sh wp root PASSWORD localhost ${{ matrix.wordpress-version }} && /vendor/bin/phpunit --bootstrap=tests/phpunit/bootstrap.php tests/phpunit/fmpress-forms-test.php"
diff --git a/Dockerfile b/Dockerfile
@@ -36,8 +36,12 @@ ADD . /fmpress-forms
 ADD composer.json /composer.json
 RUN useradd -m wordpress
 RUN sudo -u wordpress -i -- cd / && composer update
-RUN git clone -b master https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git ./vendor/squizlabs/php_codesniffer/Standards/WordPress
-RUN ./vendor/bin/phpcs --config-set installed_paths `pwd`/vendor/squizlabs/php_codesniffer/Standards/WordPress
+
+# Installing WordPress Coding Standards for PHP_CodeSniffer
+RUN sudo -u wordpress -i -- cd / && composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
+RUN sudo -u wordpress -i -- cd / && composer require --dev wp-coding-standards/wpcs:"^3.0"
+RUN sudo -u wordpress -i -- cd / && composer update wp-coding-standards/wpcs --with-dependencies
+RUN sudo -u wordpress -i -- /vendor/bin/phpcs -ps . --standard=WordPress
 
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x wp-cli.phar && mv wp-cli.phar /usr/local/bin/wp
 RUN rm -f /var/www/html/index.html

diff --git a/composer.json b/composer.json
@@ -1,11 +1,16 @@
 {
     "require-dev": {
-        "squizlabs/php_codesniffer": "3.*",
-        "wp-coding-standards/wpcs": "^2.3",
+        "squizlabs/php_codesniffer": "^3.7.2",
+        "wp-coding-standards/wpcs": "^3.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpunit/phpunit": "^8",
         "yoast/phpunit-polyfills": "^1.0.3",
         "phpstan/phpstan": "^1.10",
         "szepeviktor/phpstan-wordpress": "^1.3"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }