ci: add PHP 8.4 to test matrix

The cleanup request was no longer precessed since we refactored the
settings page in v1.7.0 to use the WP settings API. Process the request
including nonce verification during page creation restores it.

.distignore

@@ -1,7 +1,9 @@
 /.git
 /.github
 /assets
+/dist
 /test
+/vendor
 /.distignore
 /.editorconfig
 /.gitattributes

.gitattributes

@@ -1,5 +1,6 @@
 /.github export-ignore
 /assets export-ignore
+/dist export-ignore
 /test export-ignore
 .distignore export-ignore
 .gitattributes export-ignore

.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '5.6', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '5.6', '7.4', '8.0', '8.2', '8.4' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -15,6 +15,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          coverage: xdebug
           tools: composer
       - name: Install
         run: composer install --no-interaction
@@ -23,7 +24,7 @@ jobs:
           composer test
           sed -i "s#<file name=\"${GITHUB_WORKSPACE}#<file name=\"/github/workspace#g" tests-clover.xml
       - name: Analyze with SonarCloud
-        if: matrix.php == '8.2'
+        if: matrix.php == '8.2' && env.SONAR_TOKEN != ''
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/wordpress-plugin-check.yml

@@ -0,0 +1,23 @@
+name: Plugin check
+on:
+  push:
+    branches: [ 'stable', 'release/*' ]
+  pull_request:
+    branches: [ 'stable' ]
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Package plugin
+        run: |
+          mkdir -p ./dist
+          tail -n +6 README.md > README.md.tmp && mv README.md.tmp README.md
+          rsync -rc --exclude-from=.distignore ./ ./dist/statify-blacklist --delete --delete-excluded
+
+      - name: Check WP plugin
+        uses: wordpress/plugin-check-action@v1
+        with:
+          build-dir: ./dist/statify-blacklist

README.md

@@ -1,23 +1,25 @@
-[![Build Status](https://github.com/stklcode/statify-blacklist/actions/workflows/test.yml/badge.svg?branch=stable)](https://github.com/stklcode/statify-blacklist/actions/workflows/test.yml?query=branch%3Astable)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=stklcode%3Astatify-blacklist&metric=alert_status)](https://sonarcloud.io/dashboard?id=stklcode%3Astatify-blacklist)
-[![Packagist Version](https://img.shields.io/packagist/v/stklcode/statify-blacklist.svg)](https://packagist.org/packages/stklcode/statify-blacklist)
+[![CI](https://github.com/stklcode/statify-blacklist/actions/workflows/test.yml/badge.svg?branch=stable)](https://github.com/stklcode/statify-blacklist/actions/workflows/test.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=stklcode%3Astatify-blacklist&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=stklcode%3Astatify-blacklist)
+[![Packagist Version](https://img.shields.io/packagist/v/stklcode/statify-blacklist)](https://packagist.org/packages/stklcode/statify-blacklist)
 [![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://github.com/stklcode/statify-blacklist/blob/stable/LICENSE.md)
 
 # Statify Filter #
 * Contributors:      stklcode
 * Requires at least: 4.7
-* Tested up to:      6.5
+* Tested up to:      6.8
 * Requires PHP:      5.5
-* Stable tag:        1.7.1
+* Stable tag:        1.7.2
 * License:           GPLv2 or later
 * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 
+Filter extension for the famous Statify WordPress plugin.
+
 ## Description ##
 A filter extension for the famous [Statify](https://wordpress.org/plugins/statify/) WordPress plugin.
 
 This plugin adds customizable filters to Statify to allow blocking of referer spam or internal interactions.
 
-### Features ##
+### Features ###
 
 #### Referer Filter ####
 Add a list of domains (for simplicity only second-level, e.g. _example.com_ which blocks _everything.example.com_).
@@ -93,6 +95,9 @@ Same for IPv6 prefixes like _2001:db8:a0b:12f0::/64_.
 
 ## Upgrade Notice ##
 
+### 1.7.2 ###
+This is a bugfix release to restore the manual cleanup function that was broken since 1.7.0.
+
 ### 1.7.1 ###
 This is a service release with minor corrections. Recommended for all users. Tested up to 6.5.
 
@@ -100,7 +105,10 @@ This is a service release with minor corrections. Recommended for all users. Tes
 This is a service release with primarily internal rework. Tested up to 6.4 and PHP 8.3.
 
 
-## Changelog ##
+## Changelog
+
+### 1.7.2 / 06.06.2024 ###
+* Restore manual database cleanup functionality
 
 ### 1.7.1 / 24.03.2024 ###
 * Fix HTML syntax for checkboxes on settings page

assets/blueprints/blueprint.json

@@ -12,7 +12,7 @@
     },
     {
       "step": "installPlugin",
-      "pluginZipFile": {
+      "pluginData": {
         "resource": "wordpress.org/plugins",
         "slug": "statify"
       }
@@ -23,14 +23,14 @@
     },
     {
       "step": "installPlugin",
-      "pluginZipFile": {
+      "pluginData": {
         "resource": "wordpress.org/plugins",
         "slug": "statify-blacklist"
       }
     },
     {
       "step": "activatePlugin",
-      "pluginPath": "statify-blacklis/statify-blacklist.php"
+      "pluginPath": "statify-blacklist/statify-blacklist.php"
     }
   ]
 }

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "stklcode/statify-blacklist",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "A filter extension for the famous Statify WordPress plugin",
   "keywords": [
     "wordpress",
@@ -19,16 +19,16 @@
   "type": "wordpress-plugin",
   "require": {
     "php": ">=5.5",
-    "composer/installers": "~v1.12|~v2.2"
+    "composer/installers": "~v1.12|~v2.3"
   },
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^v1.0",
     "phpunit/phpunit": "^5|^6|^7|^8|^9",
     "phpunit/php-code-coverage": "*",
     "slowprog/composer-copy-file": "~0.3",
-    "squizlabs/php_codesniffer": "^3.9",
+    "squizlabs/php_codesniffer": "^3.12",
     "phpcompatibility/phpcompatibility-wp": "^2.1",
-    "wp-coding-standards/wpcs": "^3.0"
+    "wp-coding-standards/wpcs": "^3.1"
   },
   "scripts": {
     "test-all": [

inc/class-statifyblacklist-settings.php

@@ -170,6 +170,27 @@ class StatifyBlacklist_Settings extends StatifyBlacklist {
 		?>
 		<div class="wrap">
 			<h1><?php esc_html_e( 'Statify Filter', 'statify-blacklist' ); ?></h1>
+			<?php
+			if ( isset( $_SERVER['REQUEST_METHOD'] ) && 'POST' === $_SERVER['REQUEST_METHOD'] && ! empty( $_POST['cleanup'] ) ) {
+				// Database cleanup requested.
+				if ( isset( $_REQUEST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'statify-blacklist-options' ) ) {
+					// Nonce verification successful, proceed with cleanup.
+					StatifyBlacklist_Admin::cleanup_database();
+					?>
+					<div class="notice notice-success is-dismissible">
+						<p><?php esc_html_e( 'Database cleanup successful', 'statify-blacklist' ); ?></p>
+					</div>
+					<?php
+				} else {
+					// Nonce verification failed.
+					?>
+					<div class="notice notice-error is-dismissible">
+						<p><?php esc_html_e( 'Database cleanup request failed', 'statify-blacklist' ); ?></p>
+					</div>
+					<?php
+				}
+			}
+			?>
 
 			<form id="statify-settings" method="post" action="options.php">
 				<?php
@@ -178,7 +199,8 @@ class StatifyBlacklist_Settings extends StatifyBlacklist {
 				submit_button();
 				?>
 				<hr>
-				<input class="button-secondary" type="submit" name="cleanUp"
+				<input class="button-secondary" type="submit" name="cleanup"
+					formaction=""
 					value="<?php esc_html_e( 'CleanUp Database', 'statify-blacklist' ); ?>"
 					onclick="return confirm('<?php echo esc_js( __( 'Do you really want to apply filters to database? This cannot be undone.', 'statify-blacklist' ) ); ?>');">
 				<p class="description">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "statify-blacklist",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "A filter extension for the famous Statify WordPress plugin",
   "author": "Stefan Kalscheuer",
   "license": "GPL-2.0+"

statify-blacklist.php

@@ -9,8 +9,8 @@
  * @wordpress-plugin
  * Plugin Name:       Statify Filter
  * Plugin URI:        https://wordpress.org/plugins/statify-blacklist/
- * Description:       Extension for the Statify plugin to add customizable filters. (formerly "Statify Blacklist)
- * Version:           1.7.1
+ * Description:       Extension for the Statify plugin to add customizable filters. (formerly "Statify Blacklist")
+ * Version:           1.7.2
  * Requires at least: 4.7
  * Requires PHP:      5.5
  * Requires Plugins:  statify