Adding singleton hierarchy to be able to find them by class parent

Author: Tofandel

WPlusPlusCore.php

@@ -53,7 +53,7 @@ public function actionsAndFilters() {
 
 
 	public function multisite_maybe_hide_plugin( $plugins ) {
-		if ( count( self::getSingletons() ) > 1 ) {
+		if ( count( self::getSingletons( WP_Plugin::class ) ) > 1 ) {
 			$updates = get_transient( 'update_plugins' );
 			if ( ! isset( $updates->response[ $this->getPluginFile() ] ) ) {
 				unset( $plugins[ $this->getPluginFile() ] );
@@ -65,7 +65,7 @@ public function multisite_maybe_hide_plugin( $plugins ) {
 
 	public function maybe_hide_plugin() {
 		global $wp_list_table;
-		if ( count( self::getSingletons() ) > 1 && isset( $wp_list_table->items[ $this->getPluginFile() ] ) ) {
+		if ( count( self::getSingletons( WP_Plugin::class ) ) > 1 && isset( $wp_list_table->items[ $this->getPluginFile() ] ) ) {
 			$updates = get_transient( 'update_plugins' );
 			if ( ! isset( $updates->response[ $this->getPluginFile() ] ) ) {
 				unset( $wp_list_table->items[ $this->getPluginFile() ] );
@@ -80,7 +80,7 @@ public function maybe_hide_plugin() {
 	 * @throws \ReflectionException
 	 */
 	private function searchPlugins( $plugins ) {
-		$non_core = self::getSingletonsByClass( WP_Plugin::class );
+		$non_core = self::getSingletons( WP_Plugin::class );
 		$class    = new \ReflectionClass( static::class );
 		$class->getName();
 		unset( $non_core[ $class->getName() ] );

src/Traits/Singleton.php

@@ -82,22 +82,19 @@ public static final function InitFromConstructor( $that ) {
 	}
 
 	/**
-	 * @param string $class
+	 * @param bool|string $class
 	 *
 	 * @return array
 	 */
-	public static final function getSingletonsByClass( $class ) {
-		global $singletons_hierarchy;
+	public static final function getSingletons( $class = false ) {
+		if ( ! empty( $class ) ) {
+			global $singletons_hierarchy;
 
-		return $singletons_hierarchy[ $class ];
-	}
-
-	/**
-	 * @return array
-	 */
-	public static final function getSingletons() {
-		global $singletons;
+			return $singletons_hierarchy[ $class ];
+		} else {
+			global $singletons;
 
-		return $singletons;
+			return $singletons;
+		}
 	}
 }