Merge pull request #1239 from tentwentyfour/development

chore: Replace get_class() by static::class
htmlburger · Jul 19, 2024 · 5839f74 · 5839f74
2 parents d913a51 + f179788
commit 5839f74
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/core/Container.php b/core/Container.php
@@ -33,7 +33,7 @@ public static function factory() {
 	 * @return \Carbon_Fields\Container\Container
 	 */
 	public static function make() {
-		return call_user_func_array( array( get_class(), 'factory' ), func_get_args() );
+		return call_user_func_array( array( static::class, 'factory' ), func_get_args() );
 	}
 
 	/**
@@ -46,9 +46,9 @@ public static function __callStatic( $method, $arguments ) {
 		if ( strpos( $method, 'make_' ) === 0 ) {
 			$raw_type = substr_replace( $method, '', 0, 5 );
 			array_unshift( $arguments, $raw_type );
-			return call_user_func_array( array( get_class(), 'factory' ), $arguments );
+			return call_user_func_array( array( static::class, 'factory' ), $arguments );
 		} else {
-			trigger_error( sprintf( 'Call to undefined function: %s::%s().', get_class(), $method ), E_USER_ERROR );
+			trigger_error( sprintf( 'Call to undefined function: %s::%s().', static::class, $method ), E_USER_ERROR );
 		}
 	}
 }
diff --git a/core/Container/Container.php b/core/Container/Container.php
@@ -223,7 +223,7 @@ public static function factory( $raw_type, $id, $name = '' ) {
 	 * @return Container
 	 */
 	public static function make() {
-		return call_user_func_array( array( get_class(), 'factory' ), func_get_args() );
+		return call_user_func_array( array( static::class, 'factory' ), func_get_args() );
 	}
 
 	/**

diff --git a/core/Container/Nav_Menu_Item_Container.php b/core/Container/Nav_Menu_Item_Container.php
@@ -37,7 +37,7 @@ public function __construct( $id, $title, $type, $condition_collection, $conditi
 		}
 
 		// Register the custom edit walker only once
-		$callable = array( get_class(), 'edit_walker' );
+		$callable = array( $this, 'edit_walker' );
 		if ( ! has_filter( 'wp_edit_nav_menu_walker', $callable ) ) {
 			add_filter( 'wp_edit_nav_menu_walker', $callable, 10, 2 );
 		}

diff --git a/core/Container/Theme_Options_Container.php b/core/Container/Theme_Options_Container.php
@@ -251,7 +251,7 @@ protected function register_page() {
 	 * @return Container                      $this
 	 */
 	public function set_page_parent( $parent ) {
-		if ( is_a( $parent, get_class() ) ) {
+		if ( is_a( $parent, static::class ) ) {
 			$this->settings['parent'] = $parent->get_page_file();
 			return $this;
 		}

diff --git a/core/Datastore/Datastore.php b/core/Datastore/Datastore.php
@@ -76,6 +76,6 @@ public static function factory( $raw_type ) {
 	 * @return Datastore_Interface
 	 */
 	public static function make() {
-		return call_user_func_array( array( get_class(), 'factory' ), func_get_args() );
+		return call_user_func_array( array( static::class, 'factory' ), func_get_args() );
 	}
 }
diff --git a/core/Field.php b/core/Field.php
@@ -54,7 +54,7 @@ public static function factory() {
 	 * @return \Carbon_Fields\Field\Field
 	 */
 	public static function make() {
-		return call_user_func_array( array( get_class(), 'factory' ), func_get_args() );
+		return call_user_func_array( array( static::class, 'factory' ), func_get_args() );
 	}
 
 	/**
@@ -67,9 +67,9 @@ public static function __callStatic( $method, $arguments ) {
 		if ( strpos( $method, 'make_' ) === 0 ) {
 			$raw_type = substr_replace( $method, '', 0, 5 );
 			array_unshift( $arguments, $raw_type );
-			return call_user_func_array( array( get_class(), 'factory' ), $arguments );
+			return call_user_func_array( array( static::class, 'factory' ), $arguments );
 		} else {
-			trigger_error( sprintf( 'Call to undefined function: %s::%s().', get_class(), $method ), E_USER_ERROR );
+			trigger_error( sprintf( 'Call to undefined function: %s::%s().', static::class, $method ), E_USER_ERROR );
 		}
 	}
 }
diff --git a/core/Field/Field.php b/core/Field/Field.php
@@ -249,7 +249,7 @@ public static function factory( $raw_type, $name, $label = null ) {
 	 * @return Field
 	 */
 	public static function make() {
-		return call_user_func_array( array( get_class(), 'factory' ), func_get_args() );
+		return call_user_func_array( array( static::class, 'factory' ), func_get_args() );
 	}
 
 	/**
@@ -293,8 +293,8 @@ public function get_type() {
 	public function activate() {
 		$this->admin_init();
 
-		add_action( 'admin_print_footer_scripts', array( get_class(), 'admin_hook_scripts' ), 5 );
-		add_action( 'admin_print_footer_scripts', array( get_class(), 'admin_hook_styles' ), 5 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'admin_hook_scripts' ), 5 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'admin_hook_styles' ), 5 );
 		static::activate_field_type( get_class( $this ) );
 
 		do_action( 'carbon_fields_field_activated', $this );