← All changes | Inc/base-data.php +5 -6 4.2.25 → 2.0.7 View file →

		@@ -1,11 +1,9 @@
1	1	<?php
2	2
3		-namespace PXLBSAdminify\Inc;
	3	+namespace WPAdminify\Inc;
4	4
5		-if ( ! defined( 'ABSPATH' ) ) {
6		- exit;
7		-}
	5	+if ( ! defined( 'ABSPATH' ) ) exit;
8	6
9	7	abstract class Base_Data {
10	8
11	9	private $data;
		@@ -38,8 +36,9 @@
38	36
39	37	$data = &$this->data[ $key ];
40	38
41	39	$data = $this->merge_properties( $data, $value );
	40	+
42	41	}
43	42
44	43	final public function merge_properties( array $default_props, array $custom_props, array $allowed_props_keys = [] ) {
45	44	$props = array_replace_recursive( $default_props, $custom_props );
		@@ -71,9 +70,9 @@
71	70
72	71	public function has_own_method( $method_name, $base_class_name = null ) {
73	72	try {
74	73	$reflection_method = new \ReflectionMethod( $this, $method_name );
75		- $declaring_class = $reflection_method->getDeclaringClass();
	74	+ $declaring_class = $reflection_method->getDeclaringClass();
76	75	} catch ( \Exception $e ) {
77	76	return false;
78	77	}
79	78
		@@ -83,5 +82,5 @@
83	82
84	83	return get_called_class() === $declaring_class->name;
85	84	}
86	85
87		-}
	86	+}