Merge pull request #107 from jdevalk/trunk

Merge trunk to main

.distignore

@@ -0,0 +1,17 @@
+/.wordpress-org
+/.git
+/.github
+/.cache
+/node_modules
+/tests
+/grunt
+
+.phpcs.xml.dist
+.distignore
+.gitignore
+.removeable-files
+Gruntfile.js
+package.json
+phpmd.xml
+phpunit.xml.dist
+yarn.lock

.gitattributes

@@ -5,7 +5,6 @@
 # https://www.reddit.com/r/PHP/comments/2jzp6k/i_dont_need_your_tests_in_my_production
 # https://blog.madewithlove.be/post/gitattributes/
 #
-.codeclimate.yml export-ignore
 .eslintignore export-ignore
 .eslintrc export-ignore
 .gitattributes export-ignore
@@ -21,7 +20,7 @@ yarn.lock export-ignore
 /.cache export-ignore
 /.github export-ignore
 /grunt export-ignore
-/svn-assets export-ignore
+/.wordpress-org export-ignore
 /tests export-ignore
 
 #

.github/workflows/deploy.yml

@@ -0,0 +1,44 @@
+name: "Deploy to WordPress.org and create release on GitHub"
+
+on:
+  workflow_dispatch:
+    inputs:
+      tags:
+        description: 'Tag to run for'
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  tag:
+    name: New tag
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build
+        run: |
+          composer install --no-dev --prefer-dist --optimize-autoloader --no-scripts
+          yarn install
+          grunt build
+      - name: WordPress Plugin Deploy
+        uses: 10up/action-wordpress-plugin-deploy@stable
+        env:
+          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+          SLUG: yoast-comment-hacks # optional, remove if GitHub repo name matches SVN slug, including capitalization
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false

.github/workflows/security.yml

@@ -31,4 +31,4 @@ jobs:
       # This action checks the `composer.lock` file against known security vulnerabilities in the dependencies.
       # https://github.com/marketplace/actions/the-php-security-checker
       - name: Run Security Check
-        uses: symfonycorp/security-checker-action@v4
+        uses: symfonycorp/security-checker-action@v5

.github/workflows/update-readme.yml

@@ -0,0 +1,16 @@
+name: "Plugin asset/readme update"
+
+on:
+  workflow_dispatch:
+
+jobs:
+  trunk:
+    name: Push to trunk
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@main
+    - name: WordPress.org plugin asset/readme update
+      uses: 10up/action-wordpress-plugin-asset-update@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.phpcs.xml.dist

@@ -122,13 +122,4 @@
 		</properties>
 	</rule>
 
-	<!-- Direct database queries need careful review.
-		 Ticket: https://github.com/Yoast/comment-hacks/issues/50
-	-->
-	<rule ref="WordPress.DB.DirectDatabaseQuery">
-		<exclude-pattern>/admin/comment-parent\.php$</exclude-pattern>
-		<exclude-pattern>/inc/clean-emails\.php$</exclude-pattern>
-		<exclude-pattern>/inc/email-links\.php$</exclude-pattern>
-	</rule>
-
 </ruleset>