Merge pull request #8 from level-level/wider-cc-version-support

Wider cc version support

Author: Mike-Hermans

clarkson-404.php

@@ -104,7 +104,9 @@ public function settings_field() {
 	public function options_reading_404() {
 		echo "<label for='clarkson-page-for-404'>";
 		printf(
-			__( 'Page: %s' ), wp_dropdown_pages(
+			/* translators: Page number */
+			__( 'Page: %s' ),
+			wp_dropdown_pages(
 				array(
 					'name'              => 'clarkson-page-for-404',
 					'echo'              => 0,
@@ -132,7 +134,7 @@ public function field_content( $post_states, $post ) {
 			return $post_states;
 		}
 
-		if ( $post->ID === intval( $id ) ) {
+		if ( intval( $id ) === $post->ID ) {
 			$post_states['clarkson-page-for-404'] = __( '404', 'clarkson-404' );
 		}
 
@@ -152,7 +154,7 @@ public function exclude_404_from_search( WP_Query $query ): void {
 				return;
 			}
 
-			$excluded_posts = $query->get( 'post__not_in' ) ?: array();
+			$excluded_posts = $query->get( 'post__not_in' ) ? $query->get( 'post__not_in' ) : array();
 			array_push( $excluded_posts, $id );
 
 			$query->set( 'post__not_in', $excluded_posts );

composer.json

@@ -1,13 +1,31 @@
 {
     "name": "level-level/clarkson-404",
     "type": "wordpress-muplugin",
+    "license": "MIT",
+    "description": "A plugin to set a custom page as 404 for using with Clarkson.",
     "authors": [
         {
             "name": "Level Level",
             "homepage": "https://level-level.com"
         }
     ],
+    "require-dev": {
+        "wp-coding-standards/wpcs": "^2.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2"
+    },
+    "scripts": {
+		"fix" : [
+			"phpcbf"
+		],
+		"test": [
+			"composer validate",
+			"phpcs"
+		],
+		"phpunit":[
+			"phpunit"
+		]
+	},
     "require": {
-        "level-level/clarkson-core": "^1.0.0"
+        "level-level/clarkson-core": "^1 | ^2"
     }
 }

phpcs.xml.dist

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="clarkson_core">
+ <description>Level Level Clarkson Core ruleset</description>
+
+ <file>./clarkson-404.php</file>
+
+ <!--<arg name="report" value="summary"/>-->
+ <arg name="colors"/>
+ <arg value="sp"/>
+
+ 	<rule ref="Squiz.PHP.CommentedOutCode"/>
+ 	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+ 	<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
+ 	<rule ref="Generic.Commenting.Todo"/>
+ 	<rule ref="Generic.ControlStructures.InlineControlStructure"/>
+
+ 	<rule ref="WordPress-Core">
+       <exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+       <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.Found" />
+       <exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
+       <exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed" />
+   </rule>
+</ruleset>

readme.md

@@ -1,6 +1,6 @@
 # Custom 404 page for Clarkson
 
-A plugin to set a custom page as 404 when using [Clarkson Core](http://wp-clarkson.com/core){:target="_blank"}
+A plugin to set a custom page as 404 when using [Clarkson Core](https://github.com/level-level/clarkson-core)
 
 ## How to