PHPStan Level 4 Compliance (#219)

* PHPStan Level 4
* Solves Property WPMN_Loader::$admin_bar is never read, only written.
* Solves Unreachable statement - code above always terminates.
* Solves Strict comparison using === between true and int|null will always evaluate to false.

Author: lloc

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-    level: 3
+    level: 4
     paths:
         - wp-multi-network/includes
         - wpmn-loader.php

wp-multi-network/includes/classes/class-wp-ms-network-command.php

@@ -86,10 +86,6 @@ public function create( $args, $assoc_args ) {
 
 		if ( ! empty( $clone_network ) && ! get_network( $clone_network ) ) {
 			WP_CLI::error( sprintf( "Clone network %s doesn't exist.", $clone_network ) );
-
-			if ( ! empty( $assoc_args['options_to_clone'] ) ) {
-				$options_to_clone = explode( ',', $assoc_args['options_to_clone'] );
-			}
 		}
 
 		$network_id = add_network(

wp-multi-network/includes/classes/class-wp-ms-networks-admin-bar.php

@@ -17,15 +17,17 @@
 class WP_MS_Networks_Admin_Bar {
 
 	/**
-	 * Constructor.
+	 * Registers WordPress hooks for the plugin.
 	 *
-	 * Hooks in the necessary methods.
+	 * Adds actions to:
+	 * - Modify the admin bar menu
+	 * - Add custom styles to the admin area
+	 * - Add custom styles to the front-end
 	 *
-	 * @since 2.2.0
+	 * @return void
 	 */
-	public function __construct() {
+	public function add_hooks(): void {
 		add_action( 'admin_bar_menu', array( $this, 'admin_bar' ), 20 );
-
 		add_action( 'admin_print_styles', array( $this, 'admin_print_styles' ) );
 		add_action( 'wp_print_styles', array( $this, 'admin_print_styles' ) );
 	}

wp-multi-network/includes/compat.php

@@ -56,6 +56,7 @@ function wp_sanitize_site_path( $path = '' ) {
 	 * @param string $domain  Site domain.
 	 * @param string $path    Site path.
 	 * @param string $site_id Optional. Site ID, if an existing site. Default 0.
+	 *
 	 * @return bool True if the site URL is valid, false otherwise.
 	 */
 	function wp_validate_site_url( $domain, $path, $site_id = '0' ) {
@@ -66,7 +67,8 @@ function wp_validate_site_url( $domain, $path, $site_id = '0' ) {
 		if ( (int) $exists === (int) $site_id ) {
 			return true;
 		}
-		if ( true === $exists ) {
+
+		if ( true === (bool) $exists ) {
 			return false;
 		}
 

wpmn-loader.php

@@ -165,6 +165,7 @@ private function includes() {
 		$this->capabilities->add_hooks();
 
 		$this->admin_bar = new WP_MS_Networks_Admin_Bar();
+		$this->admin_bar->add_hooks();
 
 		if ( defined( 'WPMN_DEPRECATED' ) && ( true === WPMN_DEPRECATED ) ) {
 			require $this->plugin_dir . 'includes/deprecated.php';