← All changes | Options/Options.php +21 -17 2.43 → 3.36 View file →

		@@ -1,49 +1,53 @@
1	1	<?php
2	2	namespace Photonic_Plugin\Options;
3	3
4	4	class Options {
5		- private static $instance;
	5	+ private static ?Options $instance;
6	6
7	7	private function __construct() {
8		- require_once("Defaults.php");
	8	+ require_once 'Defaults.php';
9	9	}
10	10
11	11	/**
12		- *
	12	+ * Build up the options for the settings pages.
13	13	*/
14	14	public function prepare_options() {
15	15	global $photonic_setup_options;
16	16
17	17	$photonic_setup_options = [];
18		- if (is_admin() && !empty($_REQUEST['page']) && in_array($_REQUEST['page'], ['photonic-options-manager', 'photonic-options'])) {
19		- require_once("Option_Tab.php");
	18	+ if (is_admin() && !empty($_REQUEST['page']) && in_array($_REQUEST['page'], ['photonic-options-manager', 'photonic-options'], true)) { // phpcs:ignore WordPress.Security.NonceVerification
	19	+ require_once 'Option_Tab.php';
20	20
21		- require_once("Generic.php");
	21	+ require_once 'Generic.php';
22	22	$options = Generic::get_instance()->get_options();
23	23	$this->add_options($options, $photonic_setup_options);
24	24
25		- require_once("Flickr.php");
	25	+ require_once 'Flickr.php';
26	26	$options = Flickr::get_instance()->get_options();
27	27	$this->add_options($options, $photonic_setup_options);
28	28
29		- require_once("Google.php");
	29	+ require_once 'Google.php';
30	30	$options = Google::get_instance()->get_options();
31	31	$this->add_options($options, $photonic_setup_options);
32	32
33		- require_once("SmugMug.php");
	33	+ require_once 'SmugMug.php';
34	34	$options = SmugMug::get_instance()->get_options();
35	35	$this->add_options($options, $photonic_setup_options);
36	36
37		- require_once("Instagram.php");
	37	+ require_once 'Instagram.php';
38	38	$options = Instagram::get_instance()->get_options();
39	39	$this->add_options($options, $photonic_setup_options);
40	40
41		- require_once("Zenfolio.php");
	41	+ require_once 'Zenfolio.php';
42	42	$options = Zenfolio::get_instance()->get_options();
43	43	$this->add_options($options, $photonic_setup_options);
44	44
45		- require_once("Lightbox.php");
	45	+ require_once 'DeviantArt.php';
	46	+ $options = DeviantArt::get_instance()->get_options();
	47	+ $this->add_options($options, $photonic_setup_options);
	48	+
	49	+ require_once 'Lightbox.php';
46	50	$options = Lightbox::get_instance()->get_options();
47	51	$this->add_options($options, $photonic_setup_options);
48	52
49	53	$defaults = Defaults::get_options();
		@@ -54,10 +58,10 @@
54	58	}
55	59	}
56	60	}
57	61
58		- public static function get_instance() {
59		- if (self::$instance == null) {
	62	+ public static function get_instance(): Options {
	63	+ if (!isset(self::$instance)) {
60	64	self::$instance = new Options();
61	65	}
62	66	return self::$instance;
63	67	}
		@@ -62,12 +66,12 @@
62	66	return self::$instance;
63	67	}
64	68
65	69	/**
66		- * @param $options array
67		- * @param $photonic_setup_options array
	70	+ * @param array $options
	71	+ * @param array $photonic_setup_options
68	72	*/
69		- function add_options($options, &$photonic_setup_options) {
	73	+ public function add_options(array $options, array &$photonic_setup_options) {
70	74	foreach ($options as $option) {
71	75	$photonic_setup_options[] = $option;
72	76	}
73	77	}