Merge pull request #366 from lloc/version-2-9-2

Addressed some of the errors that were reported by PHPStan

Author: lloc

includes/MslsPlugin.php

@@ -40,7 +40,7 @@ public static function init() {
 
 		add_action( 'plugins_loaded', array( $obj, 'init_i18n_support' ) );
 
-		register_activation_hook( self::file(), array( $obj, 'activate' ) );
+		register_activation_hook( self::file(), array( __CLASS__, 'activate' ) );
 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 			add_action( 'admin_enqueue_scripts', array( $obj, 'custom_enqueue' ) );
@@ -69,14 +69,16 @@ public static function init() {
 				add_action( 'load-term.php', array( MslsPostTag::class, 'init' ) );
 
 				if ( MslsRequest::has_var( MslsFields::FIELD_ACTION ) ) {
-					$action = MslsRequest::get_var( MslsFields::FIELD_ACTION );
-
-					if ( 'add-tag' === $action ) {
-						add_action( 'admin_init', array( MslsPostTag::class, 'init' ) );
-					} elseif ( 'inline-save' === $action ) {
-						add_action( 'admin_init', array( MslsCustomColumn::class, 'init' ) );
-					} elseif ( 'inline-save-tax' === $action ) {
-						add_action( 'admin_init', array( MslsCustomColumnTaxonomy::class, 'init' ) );
+					switch ( MslsRequest::get_var( MslsFields::FIELD_ACTION ) ) {
+						case 'add-tag':
+							add_action( 'admin_init', array( MslsPostTag::class, 'init' ) );
+							break;
+						case 'inline-save':
+							add_action( 'admin_init', array( MslsCustomColumn::class, 'init' ) );
+							break;
+						case 'inline-save-tax':
+							add_action( 'admin_init', array( MslsCustomColumnTaxonomy::class, 'init' ) );
+							break;
 					}
 				}
 
@@ -120,23 +122,16 @@ public static function get_output() {
 		return $obj;
 	}
 
-	/**
-	 * Callback for action wp_head
-	 */
-	public static function print_alternate_links() {
+	public static function print_alternate_links(): void {
 		echo self::get_output()->get_alternate_links(), PHP_EOL;
 	}
 
 	/**
 	 * Loads styles and some js if needed
-	 *
-	 * The method returns true if the autocomplete-option is activated, false otherwise.
-	 *
-	 * @return boolean
 	 */
-	public function custom_enqueue() {
+	public function custom_enqueue(): void {
 		if ( ! is_admin_bar_showing() ) {
-			return false;
+			return;
 		}
 
 		$ver    = defined( 'MSLS_PLUGIN_VERSION' ) ? constant( 'MSLS_PLUGIN_VERSION' ) : false;
@@ -147,11 +142,7 @@ public function custom_enqueue() {
 
 		if ( $this->options->activate_autocomplete ) {
 			wp_enqueue_script( 'msls-autocomplete', self::plugins_url( "$folder/msls.js" ), array( 'jquery-ui-autocomplete' ), $ver, array( 'in_footer' => true ) );
-
-			return true;
 		}
-
-		return false;
 	}
 
 	/**
@@ -202,13 +193,10 @@ public static function path(): string {
 	/**
 	 * Load textdomain
 	 *
-	 * The method should be executed always on init because we have some
-	 * translatable string in the frontend too.
-	 *
-	 * @return boolean
+	 * The method should be executed always on init because we have some translatable string in the frontend too.
 	 */
-	public function init_i18n_support() {
-		return load_plugin_textdomain( 'multisite-language-switcher', false, self::dirname( '/languages/' ) );
+	public function init_i18n_support(): void {
+		load_plugin_textdomain( 'multisite-language-switcher', false, self::dirname( '/languages/' ) );
 	}
 
 	/**
@@ -234,7 +222,7 @@ public static function message_handler( $message, $css_class = 'error' ) {
 	/**
 	 * Activate plugin
 	 */
-	public static function activate() {
+	public static function activate(): void {
 		register_uninstall_hook( self::file(), array( __CLASS__, 'uninstall' ) );
 	}
 

tests/phpunit/TestMslsPlugin.php

@@ -18,7 +18,8 @@ function test_admin_menu_without_autocomplete(): void {
 
 		$test = new MslsPlugin( $options );
 
-		$this->assertFalse( $test->custom_enqueue() );
+		$this->expectNotToPerformAssertions();
+		$test->custom_enqueue();
 	}
 
 	function test_admin_menu_with_autocomplete(): void {
@@ -33,7 +34,8 @@ function test_admin_menu_with_autocomplete(): void {
 
 		$test = new MslsPlugin( $options );
 
-		$this->assertTrue( $test->custom_enqueue() );
+		$this->expectNotToPerformAssertions();
+		$test->custom_enqueue();
 	}
 
 	function test_admin_menu_admin_bar_not_showing(): void {
@@ -45,21 +47,22 @@ function test_admin_menu_admin_bar_not_showing(): void {
 
 		$test = new MslsPlugin( $options );
 
-		$this->assertFalse( $test->custom_enqueue() );
+		$this->expectNotToPerformAssertions();
+		$test->custom_enqueue();
 	}
 
 	/**
 	 * Verify the static init_i18n_support-method
 	 */
 	function test_init_i18n_support(): void {
-		Functions\when( 'load_plugin_textdomain' )->justReturn( true );
+		Functions\expect( 'load_plugin_textdomain' )->once()->andReturn( true );
 
 		$options = \Mockery::mock( MslsOptions::class );
-		$options->shouldReceive( 'is_excluded' )->andReturn( false );
 
 		$test = new MslsPlugin( $options );
 
-		$this->assertIsBool( $test->init_i18n_support() );
+		$this->expectNotToPerformAssertions();
+		$test->init_i18n_support();
 	}
 
 	/**