Merge branch 'release/1.5.0'

.gitattributes

@@ -0,0 +1,12 @@
+/assets export-ignore
+/test export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+composer.json export-ignore
+composer.lock export-ignore
+CONTRIBUTING.md export-ignore
+package.json export-ignore
+phpcs.xml export-ignore
+phpunit.xml export-ignore
+RoboFile.php export-ignore

.gitignore

@@ -4,4 +4,5 @@ composer.lock
 /dist/
 .idea
 tests-clover.xml
-tests-junit.xml
+tests-junit.xml
+.phpunit.result.cache

.travis.yml

@@ -1,12 +1,13 @@
 language: php
-dist: trusty
 php:
-  - '5.5'
   - '5.6'
-  - '7.0'
-  - '7.1'
   - '7.2'
+  - '7.3'
+  - '7.4'
 before_script:
   - composer install
 script:
   - composer test-all
+notifications:
+  slack:
+    secure: "ScXTSMO65veI1jA6TBHGDUtvDqEMkqJykaNf7vLLbb7YIxPIHHNBiX/wcjOHVFfQXZCV3qxQrflB7Lbm9qVUsAv861jTO9x/ZkECl5QhRoc0DIznejwZoypx0HJ9tBZFYT6qNUkViXRKZ/ILAiBLU9Yw52WACtQB9hu3FNFZwmKsjipvV8Sne1qEyTkLYLaMphsbC5mtXYdKMHvdt39jsYsk91UWGeYbXQ37LkMbsaG/8YHXF724d5JO7BRGoThw6p5knKAO5fk29V7GfNqg2h+hnGyNIUOcmxujgMDMFLyFCGMZpPoBa+3jyWWgq4PgpQt0F5VZtJFGoXCGcoMQm5IbVfqkSKJ4jYhqiSIrqSebLmzoPHepWX3yn8tpfOiBWjC6K9w9esp6vcZf26rnAJcjcGkA01rMrHRwR+UEMCLvj7q0DR0qzi/AFeED6gtpODzUf93Rp42Tz1iGvWIbgeCtkCWjfPO6XLuNiqGVPEVaT5BDKqlqbijdKxxp7yh1fdt8s0fInWdIsgoWTbU9DC1W4ZiqtQW7oYO+QtFZMaD6kZWpSqJUwB3kW5JL3odAUEm8bLbRWBvK5ZjGdaGqSbOs6f9gAKcf86iQQhwzCJSOgFlLlKFv9smicjPC+BGOxgx32pgseHNPWn6tmEo/ihmmr/NbbqoOusUKX9gQbA4="

CONTRIBUTING.md

@@ -33,17 +33,19 @@ If the changes introduce new functionality or affect major parts of existing cod
 
 For adding new functionality a new test case the corresponding PHPUnit test would be nice (no hard criterion though).
 
+The `master` branch should also be target for most pull requests.
+However it it features new functionality you might want to target the `develop` branch instead (see next section for details on branches).
+
 ### Branches
 
 The `master` branch represents the current state of development.
 Please ensure your initial code is up to date with it at the time you start development.
-The `master` should also be target for most pull requests.
 
 In addition, this project features a `develop` branch, which holds bleeding edge developments, not necessarily considered stable or even compatible.
 Do not expect this code to run smoothly, but you might have a look into the history to see if some work on an issue has already been started there.
 
-For fixes and features, there might be additional branches, likely prefixed by `ft-` (feature) or `hf-` (hotfix) followed by an issue number (if applicable) and/or a title.
-Feel free to adapt these naming scheme to your forks.
+For fixes and features, there might be additional branches, likely prefixed by `hotfix/` or `feature/` followed by an issue number (if applicable) and/or a title.
+Feel free to adapt this naming scheme to your forks.
 
 ### Merge Requirements
 

LICENSE.md

@@ -357,5 +357,5 @@ into proprietary programs. If your program is a subroutine library,
 you may consider it more useful to permit linking proprietary
 applications with the library. If this is what you want to do, use the
 [GNU Lesser General Public
-License](http://www.gnu.org/licenses/lgpl.html) instead of this
+License](https://www.gnu.org/licenses/lgpl.html) instead of this
 License.

README.md

@@ -1,16 +1,21 @@
+[![Build Status](https://travis-ci.org/stklcode/statify-blacklist.svg?branch=master)](https://travis-ci.org/stklcode/statify-blacklist)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=de.stklcode.web.wordpress.plugins%3Astatify-blacklist&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.stklcode.web.wordpress.plugins%3Astatify-blacklist)
+[![Packagist Version](https://img.shields.io/packagist/v/stklcode/statify-blacklist.svg)](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/master/LICENSE.md)
+
 # Statify Blacklist #
 * Contributors:      Stefan Kalscheuer
-* Requires at least: 4.4
+* Requires at least: 4.7
 * Tested up to:      5.4
 * Requires PHP:      5.5
-* Stable tag:        1.4.4
+* Stable tag:        1.5.0
 * License:           GPLv2 or later
-* License URI:       http://www.gnu.org/licenses/gpl-2.0.html
+* License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 
 ## Description ##
 A blacklist extension for the famous [Statify](https://wordpress.org/plugins/statify/) Wordpress plugin.
 
-This plugin adds customizable blacklist to Statify to allow blocking of referer spam or internal interactions.
+This plugin adds a customizable blacklist to Statify to allow blocking of referer spam or internal interactions.
 
 ### Features ##
 
@@ -27,7 +32,7 @@ Add a list of IP addresses or subnets (e.g. _192.0.2.123_, _198.51.100.0/24_, _2
 Filters can be applied to data stored in database after modifying filter rules or for one-time clean-up.
 
 #### Compatibility ####
-This plugin requires Statify to be installed. The extension has been tested with Statify up to version 1.5.1
+This plugin requires Statify to be installed. The extension has been tested with Statify up to version 1.7
 The plugin is capable of handling multisite installations.
 
 ### Support & Contributions ###
@@ -37,51 +42,62 @@ The plugin is capable of handling multisite installations.
 
 ### Credits ###
 * Author: Stefan Kalscheuer
-* Special Thanks to [pluginkollektiv](https://github.com/pluginkollektiv) for maintaining _Statify_
+* Special Thanks to [pluginkollektiv](https://pluginkollektiv.org/) for maintaining _Statify_
 
 ## Installation ##
-* If you don’t know how to install a plugin for WordPress, [here’s how](http://codex.wordpress.org/Managing_Plugins#Installing_Plugins).
-* Make sure _Statify_ plugin is installed and active 
+* If you don’t know how to install a plugin for WordPress, [here’s how](https://wordpress.org/support/article/managing-plugins/#installing-plugins).
+* Make sure _Statify_ plugin is installed and active
 * Goto _Settings_ -> _Statify Blacklist_ to configure the plugin
 
 ### Requirements ###
 * PHP 5.5 or above
-* WordPress 4.4 or above
-* Statify plugin installed and activated (1.5.0 or above)
+* WordPress 4.7 or above
+* _Statify_ plugin installed and activated (1.5 or above)
 
 ## Frequently Asked Questions ##
 
 ### What is blocked by default? ###
-Nothing. By default all blacklists are empty and disabled. They can and have to be filled by the blog administrator.
+Nothing. By default, all blacklists are empty and disabled. They can and have to be filled by the blog administrator.
 
 A default blacklist is not provided, as the plugin itself is totally neutral. If you want to filter out referer spam, 
-visitors from search engines, just "false" referers from 301 redirects or you own IP address used for testing only depends on you.
+visitors from search engines, just "false" referrers from 301 redirects or you own IP address used for testing only depends on you.
 
 ### Does the filter effect user experience? ###
-No. It only prevent's _Statify_ from tracking, nothing more or less.
+No. It only prevents _Statify_ from tracking, nothing more or less.
 
 ### Does live filtering impact performance? ###
-Yes, but probalby not noticeable. Checking a single referer string against a (usually small) list should be negligible compared to the total loading procedure.
+Yes, but probably not noticeable. Checking a single referer string against a (usually small) list should be negligible compared to the total loading procedure.
 If this still is an issue for you, consider deactivating the filter and only run the one-time-cleanup or activate the cron job.
 
 ### Is any personal data collected? ###
 No. The privacy policy of _Statify_ is untouched. Data is only processed, not stored or exposed to anyone.
 
 ### Are regular expression filters possible? ###
-Yes, it is. Just select if you want to filter using regular expressions case sensitive or insensitive.
-
-Note, that regular expression matching is significantly slower than the plain domain filter. Hence it is only recommended for asynchronous cron or manual execution and not for live filtering.
+Yes, it is. Just select regular expressions (case-sensitive or insensitive) as matching method instead of exact or keyword match.
 
 ### Why is IP filtering only available as live filter? ###
-As you might know, Statify does not store any personal information, including IP addresses in the database.
+As you might know, _Statify_ does not store any personal information, including IP addresses in the database.
 Because of this, an IP blacklist can only be applied while processing the request and not afterwards.
 
+### Can whole IP subnet be blocked? ###
+Yes. The plugin features subnet blacklists using CIDR notation.
+For example _198.51.100.0/24_ blacklists all sources from _198.51.100.1_ to _198.51.100.254_.
+Same for IPv6 prefixes like _2001:db8:a0b:12f0::/64_.
+
 
 ## Screenshots ##
 1. Statify Blacklist settings page
 
 ## Changelog ##
 
+### 1.5.0 / 13.05.2020 ###
+* Minimum required WordPress version is 4.7
+* Removed `load_plugin_textdomain()` and `Domain Path` header
+* Added automatic compatibility check for WP and PHP version (#17)
+* Added keyword filter mode for referer blacklist (#15)
+* Layout adjustments on settings page
+* Regular expression filters are validated before saving (#13)
+
 ### 1.4.4 / 19.05.2018 ###
 * Fix live filter chain when regular expressions are active (#12)
 
@@ -115,7 +131,7 @@ Because of this, an IP blacklist can only be applied while processing the reques
 
 ### 1.2.0 / 29.08.2016 ###
 * Switched from `in_array()` to faster `isset()` for referer checking
-* Optional cron execiton implemented
+* Optional cron execution implemented
 
 ### 1.1.2 / 17.08.2016 ###
 * Prepared for localization

RoboFile.php

@@ -8,7 +8,7 @@
  * @author    Stefan Kalscheuer <stefan@stklcode.de>
  *
  * @package   Statify_Blacklist
- * @version   1.4.4
+ * @version   1.5.0
  */
 
 use Robo\Exception\TaskException;
@@ -19,10 +19,10 @@
  */
 class RoboFile extends Tasks {
 	const PROJECT_NAME = 'statify-blacklist';
-	const SVN_URL = 'https://plugins.svn.wordpress.org/statify-blacklist';
+	const SVN_URL      = 'https://plugins.svn.wordpress.org/statify-blacklist';
 
-	const OPT_TARGET = 'target';
-	const OPT_SKIPTEST = 'skipTests';
+	const OPT_TARGET    = 'target';
+	const OPT_SKIPTEST  = 'skipTests';
 	const OPT_SKIPSTYLE = 'skipStyle';
 
 	/**
@@ -134,13 +134,21 @@ public function build(
 	 */
 	private function bundle() {
 		$this->say( 'Bundling resources...' );
-		$this->taskCopyDir( [
-			'inc'   => $this->target_dir . '/' . $this->final_name . '/inc',
-			'views' => $this->target_dir . '/' . $this->final_name . '/views',
-		] )->run();
+		$this->taskCopyDir(
+			[
+				'inc'   => $this->target_dir . '/' . $this->final_name . '/inc',
+				'views' => $this->target_dir . '/' . $this->final_name . '/views',
+			]
+		)->run();
 		$this->_copy( 'statify-blacklist.php', $this->target_dir . '/' . $this->final_name . '/statify-blacklist.php' );
-		$this->_copy( 'README.md', $this->target_dir . '/' . $this->final_name . '/README.md' );
 		$this->_copy( 'LICENSE.md', $this->target_dir . '/' . $this->final_name . '/LICENSE.md' );
+		$this->_copy( 'README.md', $this->target_dir . '/' . $this->final_name . '/README.md' );
+
+		// Remove content before title (e.g. badges) from README file.
+		$this->taskReplaceInFile( $this->target_dir . '/' . $this->final_name . '/README.md' )
+			->regex( '/^[^\\#]*/' )
+			->to( '' )
+			->run();
 	}
 
 	/**

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "stklcode/statify-blacklist",
-  "version": "1.4.4",
+  "version": "1.5.0",
   "description": "A blacklist extension for the famous Statify WordPress plugin",
   "keywords": [
     "wordpress",
@@ -19,17 +19,17 @@
   "type": "wordpress-plugin",
   "require": {
     "php": ">=5.5",
-    "composer/installers": "~1.0"
+    "composer/installers": "~1.7"
   },
   "require-dev": {
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.4",
-    "consolidation/robo": "^1.0.0",
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.5",
+    "consolidation/robo": "^1.4",
     "phpunit/phpunit": "*",
     "phpunit/php-code-coverage": "*",
     "slowprog/composer-copy-file": "~0.2",
-    "squizlabs/php_codesniffer": "^3.1",
-    "wimg/php-compatibility": "^8.0",
-    "wp-coding-standards/wpcs": "~0.14"
+    "squizlabs/php_codesniffer": "^3.5",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "wp-coding-standards/wpcs": "^2.1"
   },
   "scripts": {
     "build": [