← All changes | inc/conflicts/conflict_manager.php +11 -11 2.5.6 → trunk View file →

		@@ -18,9 +18,9 @@
18	18	* @since 2.0.6
19	19	* @access protected
20	20	* @var array $watched_conflicts
21	21	*/
22		- protected $watched_conflicts = array();
	22	+ protected $watched_conflicts = [];
23	23	/**
24	24	* List of conflicts dismissed by user.
25	25	*
26	26	* @since 2.0.6
		@@ -26,9 +26,9 @@
26	26	* @since 2.0.6
27	27	* @access protected
28	28	* @var array $dismissed_conflicts
29	29	*/
30		- protected $dismissed_conflicts = array();
	30	+ protected $dismissed_conflicts = [];
31	31
32	32
33	33
34	34	/**
		@@ -37,10 +37,10 @@
37	37	* @since 2.0.6
38	38	* @access public
39	39	* @param array $register_conflicts A list of conflicts to be registered.
40	40	*/
41		- public function __construct( $register_conflicts = array() ) {
42		- $this->dismissed_conflicts = get_option( 'optml_dismissed_conflicts', array() );
	41	+ public function __construct( $register_conflicts = [] ) {
	42	+ $this->dismissed_conflicts = get_option( 'optml_dismissed_conflicts', [] );
43	43	if ( ! empty( $register_conflicts ) ) {
44	44	foreach ( $register_conflicts as $conflict_to_watch ) {
45	45	$this->watch( $conflict_to_watch );
46	46	}
		@@ -54,10 +54,10 @@
54	54	* @access public
55	55	* @param string $conflict A conflict class name.
56	56	*/
57	57	public function watch( $conflict ) {
58		- if ( is_subclass_of( new $conflict, 'Optml_Abstract_Conflict' ) ) {
59		- array_push( $this->watched_conflicts, new $conflict );
	58	+ if ( is_subclass_of( new $conflict(), 'Optml_Abstract_Conflict' ) ) {
	59	+ array_push( $this->watched_conflicts, new $conflict() );
60	60	}
61	61	}
62	62
63	63	/**
		@@ -81,9 +81,9 @@
81	81	* @access public
82	82	* @return array
83	83	*/
84	84	public function get_conflict_list() {
85		- $conflict_list = array();
	85	+ $conflict_list = [];
86	86	if ( empty( $this->watched_conflicts ) ) {
87	87	return $conflict_list;
88	88	}
89	89
		@@ -107,13 +107,13 @@
107	107	}
108	108	if ( ! isset( $item2['severity'] ) ) {
109	109	return -1;
110	110	}
111		- $severity_map = array(
	111	+ $severity_map = [
112	112	'high' => 0,
113	113	'medium' => 1,
114	114	'low' => 1,
115		- );
	115	+ ];
116	116
117	117	if ( $severity_map[ $item1['severity'] ] === $severity_map[ $item2['severity'] ] ) {
118	118	if ( ! isset( $item1['priority'] ) ) {
119	119	return 0;
		@@ -140,9 +140,9 @@
140	140	* @access public
141	141	* @return int
142	142	*/
143	143	public function get_conflict_count() {
144		- if ( empty( $this->watched_conflicts ) || sizeof( $this->watched_conflicts ) === 0 ) {
	144	+ if ( empty( $this->watched_conflicts ) ) {
145	145	return 0;
146	146	}
147	147
148	148	$count = 0;
		@@ -152,9 +152,9 @@
152	152	* @var Optml_Abstract_Conflict $conflict
153	153	*/
154	154	foreach ( $this->watched_conflicts as $conflict ) {
155	155	if ( $conflict->is_active( $this->dismissed_conflicts ) ) {
156		- $count++;
	156	+ ++$count;
157	157	}
158	158	}
159	159	return $count;
160	160	}