fix: fix conflict with Divi's ET_Core_Data_Utils class.

elegantthemes · Dec 1, 2021 · c8fe746 · c8fe746
1 parent 2595f70
commit c8fe746
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Utilities that make reading and writing PHP code more convenient and enjoyable",
   "type": "library",
   "license": "GPL-v2-or-later",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "authors": [
     {
       "name": "Elegant Themes",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Utils.php b/src/Utils.php
@@ -129,6 +129,20 @@ public function _arraySortByCallback( $a, $b ): int {
 		return 0;
 	}
 
+	public function __call( $name, $args ) {
+		$class = __CLASS__;
+
+		if ( method_exists( $this, $name ) ) {
+			throw new \Exception( "Call to protected or private method: {$class}::{$name}() from out of scope!" );
+		}
+
+		if ( method_exists( 'ET_Core_Data_Utils', $name ) ) {
+			return ET_Core_Data_Utils::instance()->$name( ...$args );
+		}
+
+		throw new \Exception( "Call to undefined method: {$class}::{$name}()" );
+	}
+
 	/**
 	 * Returns `true` if all values in `$array` are not empty, `false` otherwise.
 	 * If `$callback` is provided then values are passed to it instead of {@see empty()} (it should return a booleon value).