pryley / site-reviews

plugin/Controllers/TranslationController.php

Indentation +224 added lines, -224 removed lines

@@ -10,228 +10,228 @@
 
 class TranslationController
 {
-    /**
-     * @var Translator
-     */
-    public $translator;
-
-    public function __construct(Translator $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    /**
-     * @param array $messages
-     * @return array
-     * @filter bulk_post_updated_messages
-     */
-    public function filterBulkUpdateMessages($messages, array $counts)
-    {
-        $messages = Arr::consolidateArray($messages);
-        $messages[Application::POST_TYPE] = [
-            'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
-            'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
-            'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
-            'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
-            'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
-        ];
-        return $messages;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $domain
-     * @return string
-     * @filter gettext
-     */
-    public function filterGettext($translation, $text, $domain)
-    {
-        return apply_filters('site-reviews/gettext/'.$domain, $translation, $text);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @return string
-     * @filter site-reviews/gettext/site-reviews
-     */
-    public function filterGettextSiteReviews($translation, $text)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'single' => $text,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $context
-     * @param string $domain
-     * @return string
-     * @filter gettext_with_context
-     */
-    public function filterGettextWithContext($translation, $text, $context, $domain)
-    {
-        return apply_filters('site-reviews/gettext_with_context/'.$domain, $translation, $text, $context);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $context
-     * @return string
-     * @filter site-reviews/gettext_with_context/site-reviews
-     */
-    public function filterGettextWithContextSiteReviews($translation, $text, $context)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'context' => $context,
-            'single' => $text,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $domain
-     * @return string
-     * @filter ngettext
-     */
-    public function filterNgettext($translation, $single, $plural, $number, $domain)
-    {
-        return apply_filters('site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @return string
-     * @filter site-reviews/ngettext/site-reviews
-     */
-    public function filterNgettextSiteReviews($translation, $single, $plural, $number)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $context
-     * @param string $domain
-     * @return string
-     * @filter ngettext_with_context
-     */
-    public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
-    {
-        return apply_filters('site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $context
-     * @return string
-     * @filter site-reviews/ngettext_with_context/site-reviews
-     */
-    public function filterNgettextWithContextSiteReviews($translation, $single, $plural, $number, $context)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'context' => $context,
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
-
-    /**
-     * @param array $postStates
-     * @param \WP_Post $post
-     * @return array
-     * @filter display_post_states
-     */
-    public function filterPostStates($postStates, $post)
-    {
-        $postStates = Arr::consolidateArray($postStates);
-        if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
-            $postStates['pending'] = __('Unapproved', 'site-reviews');
-        }
-        return $postStates;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @return string
-     * @filter site-reviews/gettext/default
-     * @filter site-reviews/gettext_with_context/default
-     */
-    public function filterPostStatusLabels($translation, $text)
-    {
-        return $this->canModifyTranslation()
-            ? glsr(Labels::class)->filterPostStatusLabels($translation, $text)
-            : $translation;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @return string
-     * @filter site-reviews/ngettext/default
-     */
-    public function filterPostStatusText($translation, $single, $plural, $number)
-    {
-        if ($this->canModifyTranslation()) {
-            $strings = [
-                'Published' => __('Approved', 'site-reviews'),
-                'Pending' => __('Unapproved', 'site-reviews'),
-            ];
-            foreach ($strings as $search => $replace) {
-                if (!Str::contains($single, $search)) {
-                    continue;
-                }
-                return $this->translator->getTranslation([
-                    'number' => $number,
-                    'plural' => str_replace($search, $replace, $plural),
-                    'single' => str_replace($search, $replace, $single),
-                ]);
-            }
-        }
-        return $translation;
-    }
-
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function translatePostStatusLabels()
-    {
-        if ($this->canModifyTranslation()) {
-            glsr(Labels::class)->translatePostStatusLabels();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canModifyTranslation()
-    {
-        $screen = glsr_current_screen();
-        return Application::POST_TYPE == $screen->post_type 
-            && in_array($screen->base, ['edit', 'post']);
-    }
+	/**
+	 * @var Translator
+	 */
+	public $translator;
+
+	public function __construct(Translator $translator)
+	{
+		$this->translator = $translator;
+	}
+
+	/**
+	 * @param array $messages
+	 * @return array
+	 * @filter bulk_post_updated_messages
+	 */
+	public function filterBulkUpdateMessages($messages, array $counts)
+	{
+		$messages = Arr::consolidateArray($messages);
+		$messages[Application::POST_TYPE] = [
+			'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
+			'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
+			'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
+			'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
+			'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
+		];
+		return $messages;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext
+	 */
+	public function filterGettext($translation, $text, $domain)
+	{
+		return apply_filters('site-reviews/gettext/'.$domain, $translation, $text);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @return string
+	 * @filter site-reviews/gettext/site-reviews
+	 */
+	public function filterGettextSiteReviews($translation, $text)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'single' => $text,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext_with_context
+	 */
+	public function filterGettextWithContext($translation, $text, $context, $domain)
+	{
+		return apply_filters('site-reviews/gettext_with_context/'.$domain, $translation, $text, $context);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $context
+	 * @return string
+	 * @filter site-reviews/gettext_with_context/site-reviews
+	 */
+	public function filterGettextWithContextSiteReviews($translation, $text, $context)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'context' => $context,
+			'single' => $text,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $domain
+	 * @return string
+	 * @filter ngettext
+	 */
+	public function filterNgettext($translation, $single, $plural, $number, $domain)
+	{
+		return apply_filters('site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @return string
+	 * @filter site-reviews/ngettext/site-reviews
+	 */
+	public function filterNgettextSiteReviews($translation, $single, $plural, $number)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 * @filter ngettext_with_context
+	 */
+	public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
+	{
+		return apply_filters('site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $context
+	 * @return string
+	 * @filter site-reviews/ngettext_with_context/site-reviews
+	 */
+	public function filterNgettextWithContextSiteReviews($translation, $single, $plural, $number, $context)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'context' => $context,
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
+
+	/**
+	 * @param array $postStates
+	 * @param \WP_Post $post
+	 * @return array
+	 * @filter display_post_states
+	 */
+	public function filterPostStates($postStates, $post)
+	{
+		$postStates = Arr::consolidateArray($postStates);
+		if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
+			$postStates['pending'] = __('Unapproved', 'site-reviews');
+		}
+		return $postStates;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @return string
+	 * @filter site-reviews/gettext/default
+	 * @filter site-reviews/gettext_with_context/default
+	 */
+	public function filterPostStatusLabels($translation, $text)
+	{
+		return $this->canModifyTranslation()
+			? glsr(Labels::class)->filterPostStatusLabels($translation, $text)
+			: $translation;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @return string
+	 * @filter site-reviews/ngettext/default
+	 */
+	public function filterPostStatusText($translation, $single, $plural, $number)
+	{
+		if ($this->canModifyTranslation()) {
+			$strings = [
+				'Published' => __('Approved', 'site-reviews'),
+				'Pending' => __('Unapproved', 'site-reviews'),
+			];
+			foreach ($strings as $search => $replace) {
+				if (!Str::contains($single, $search)) {
+					continue;
+				}
+				return $this->translator->getTranslation([
+					'number' => $number,
+					'plural' => str_replace($search, $replace, $plural),
+					'single' => str_replace($search, $replace, $single),
+				]);
+			}
+		}
+		return $translation;
+	}
+
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function translatePostStatusLabels()
+	{
+		if ($this->canModifyTranslation()) {
+			glsr(Labels::class)->translatePostStatusLabels();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canModifyTranslation()
+	{
+		$screen = glsr_current_screen();
+		return Application::POST_TYPE == $screen->post_type 
+			&& in_array($screen->base, ['edit', 'post']);
+	}
 }

plugin/Controllers/PublicController.php

Indentation +71 added lines, -71 removed lines

@@ -13,81 +13,81 @@
 
 class PublicController extends Controller
 {
-    /**
-     * @return void
-     * @action wp_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        (new EnqueuePublicAssets())->handle();
-    }
+	/**
+	 * @return void
+	 * @action wp_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		(new EnqueuePublicAssets())->handle();
+	}
 
-    /**
-     * @param string $tag
-     * @param string $handle
-     * @return string
-     * @filter script_loader_tag
-     */
-    public function filterEnqueuedScripts($tag, $handle)
-    {
-        $scripts = [Application::ID.'/google-recaptcha'];
-        if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' async src=', $tag);
-        }
-        if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' defer src=', $tag);
-        }
-        return $tag;
-    }
+	/**
+	 * @param string $tag
+	 * @param string $handle
+	 * @return string
+	 * @filter script_loader_tag
+	 */
+	public function filterEnqueuedScripts($tag, $handle)
+	{
+		$scripts = [Application::ID.'/google-recaptcha'];
+		if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' async src=', $tag);
+		}
+		if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' defer src=', $tag);
+		}
+		return $tag;
+	}
 
-    /**
-     * @return array
-     * @filter site-reviews/config/forms/submission-form
-     */
-    public function filterFieldOrder(array $config)
-    {
-        $order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
-        return array_intersect_key(array_merge(array_flip($order), $config), $config);
-    }
+	/**
+	 * @return array
+	 * @filter site-reviews/config/forms/submission-form
+	 */
+	public function filterFieldOrder(array $config)
+	{
+		$order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
+		return array_intersect_key(array_merge(array_flip($order), $config), $config);
+	}
 
-    /**
-     * @param string $view
-     * @return string
-     * @filter site-reviews/render/view
-     */
-    public function filterRenderView($view)
-    {
-        return glsr(Style::class)->filterView($view);
-    }
+	/**
+	 * @param string $view
+	 * @return string
+	 * @filter site-reviews/render/view
+	 */
+	public function filterRenderView($view)
+	{
+		return glsr(Style::class)->filterView($view);
+	}
 
-    /**
-     * @return void
-     * @action site-reviews/builder
-     */
-    public function modifyBuilder(Builder $instance)
-    {
-        call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
-    }
+	/**
+	 * @return void
+	 * @action site-reviews/builder
+	 */
+	public function modifyBuilder(Builder $instance)
+	{
+		call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
+	}
 
-    /**
-     * @return void
-     * @action wp_footer
-     */
-    public function renderSchema()
-    {
-        glsr(Schema::class)->render();
-    }
+	/**
+	 * @return void
+	 * @action wp_footer
+	 */
+	public function renderSchema()
+	{
+		glsr(Schema::class)->render();
+	}
 
-    /**
-     * @return CreateReview
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $validated = glsr(ValidateReview::class)->validate($request);
-        $command = new CreateReview($validated->request);
-        if (empty($validated->error) && !$validated->recaptchaIsUnset) {
-            $this->execute($command);
-        }
-        return $command;
-    }
+	/**
+	 * @return CreateReview
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$validated = glsr(ValidateReview::class)->validate($request);
+		$command = new CreateReview($validated->request);
+		if (empty($validated->error) && !$validated->recaptchaIsUnset) {
+			$this->execute($command);
+		}
+		return $command;
+	}
 }

plugin/Database/Cache.php

Indentation +57 added lines, -57 removed lines

@@ -6,63 +6,63 @@
 
 class Cache
 {
-    /**
-     * @return array
-     */
-    public function getCloudflareIps()
-    {
-        if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) {
-            $ipAddresses = array_fill_keys(['v4', 'v6'], []);
-            foreach (array_keys($ipAddresses) as $version) {
-                $url = 'https://www.cloudflare.com/ips-'.$version;
-                $response = wp_remote_get($url, ['sslverify' => false]);
-                if (is_wp_error($response)) {
-                    glsr_log()->error($response->get_error_message());
-                    continue;
-                }
-                if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) {
-                    glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']');
-                    continue;
-                }
-                $ipAddresses[$version] = array_filter(
-                    (array) preg_split('/\R/', wp_remote_retrieve_body($response))
-                );
-            }
-            set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS);
-        }
-        return $ipAddresses;
-    }
+	/**
+	 * @return array
+	 */
+	public function getCloudflareIps()
+	{
+		if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) {
+			$ipAddresses = array_fill_keys(['v4', 'v6'], []);
+			foreach (array_keys($ipAddresses) as $version) {
+				$url = 'https://www.cloudflare.com/ips-'.$version;
+				$response = wp_remote_get($url, ['sslverify' => false]);
+				if (is_wp_error($response)) {
+					glsr_log()->error($response->get_error_message());
+					continue;
+				}
+				if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) {
+					glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']');
+					continue;
+				}
+				$ipAddresses[$version] = array_filter(
+					(array) preg_split('/\R/', wp_remote_retrieve_body($response))
+				);
+			}
+			set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS);
+		}
+		return $ipAddresses;
+	}
 
-    /**
-     * @param string $metaKey
-     * @return array
-     */
-    public function getReviewCountsFor($metaKey)
-    {
-        $counts = wp_cache_get(Application::ID, $metaKey.'_count');
-        if (false === $counts) {
-            $counts = [];
-            $results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey);
-            foreach ($results as $result) {
-                $counts[$result->name] = $result->num_posts;
-            }
-            wp_cache_set(Application::ID, $counts, $metaKey.'_count');
-        }
-        return $counts;
-    }
+	/**
+	 * @param string $metaKey
+	 * @return array
+	 */
+	public function getReviewCountsFor($metaKey)
+	{
+		$counts = wp_cache_get(Application::ID, $metaKey.'_count');
+		if (false === $counts) {
+			$counts = [];
+			$results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey);
+			foreach ($results as $result) {
+				$counts[$result->name] = $result->num_posts;
+			}
+			wp_cache_set(Application::ID, $counts, $metaKey.'_count');
+		}
+		return $counts;
+	}
 
-    /**
-     * @return string
-     */
-    public function getRemotePostTest()
-    {
-        if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) {
-            $response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/');
-            $test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299))
-                ? 'Works'
-                : 'Does not work';
-            set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS);
-        }
-        return $test;
-    }
+	/**
+	 * @return string
+	 */
+	public function getRemotePostTest()
+	{
+		if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) {
+			$response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/');
+			$test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299))
+				? 'Works'
+				: 'Does not work';
+			set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS);
+		}
+		return $test;
+	}
 }

plugin/Defaults/CreateReviewDefaults.php

Indentation +36 added lines, -36 removed lines

@@ -6,41 +6,41 @@
 
 class CreateReviewDefaults extends Defaults
 {
-    /**
-     * @var array
-     */
-    protected $guarded = [
-        'assigned_to',
-        'content',
-        'date',
-        'pinned',
-        'response',
-        'review_id',
-        'review_type',
-        'title',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $guarded = [
+		'assigned_to',
+		'content',
+		'date',
+		'pinned',
+		'response',
+		'review_id',
+		'review_type',
+		'title',
+	];
 
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assigned_to' => '',
-            'author' => '',
-            'avatar' => '',
-            'content' => '',
-            'custom' => '',
-            'date' => '',
-            'email' => '',
-            'ip_address' => '',
-            'pinned' => false,
-            'rating' => '',
-            'response' => '',
-            'review_id' => md5(time().mt_rand()),
-            'review_type' => 'local',
-            'title' => '',
-            'url' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assigned_to' => '',
+			'author' => '',
+			'avatar' => '',
+			'content' => '',
+			'custom' => '',
+			'date' => '',
+			'email' => '',
+			'ip_address' => '',
+			'pinned' => false,
+			'rating' => '',
+			'response' => '',
+			'review_id' => md5(time().mt_rand()),
+			'review_type' => 'local',
+			'title' => '',
+			'url' => '',
+		];
+	}
 }

plugin/Defaults/ValidateReviewDefaults.php

Indentation +18 added lines, -18 removed lines

@@ -6,22 +6,22 @@
 
 class ValidateReviewDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assign_to' => '',
-            'category' => '',
-            'content' => '',
-            'email' => '',
-            'form_id' => '',
-            'ip_address' => '',
-            'name' => '',
-            'rating' => '0',
-            'terms' => '',
-            'title' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assign_to' => '',
+			'category' => '',
+			'content' => '',
+			'email' => '',
+			'form_id' => '',
+			'ip_address' => '',
+			'name' => '',
+			'rating' => '0',
+			'terms' => '',
+			'title' => '',
+		];
+	}
 }

plugin/Modules/Console.php

Indentation +433 added lines, -433 removed lines

@@ -10,437 +10,437 @@
 
 class Console
 {
-    const DEBUG = 0;      // Detailed debug information
-    const INFO = 1;       // Interesting events
-    const NOTICE = 2;     // Normal but significant events
-    const WARNING = 4;    // Exceptional occurrences that are not errors
-    const ERROR = 8;      // Runtime errors that do not require immediate action
-    const CRITICAL = 16;  // Critical conditions
-    const ALERT = 32;     // Action must be taken immediately
-    const EMERGENCY = 64; // System is unusable
-
-    protected $file;
-    protected $log;
-    protected $logOnceKey = 'glsr_log_once';
-
-    public function __construct()
-    {
-        $this->file = glsr()->path('console.log');
-        $this->log = file_exists($this->file)
-            ? file_get_contents($this->file)
-            : '';
-        $this->reset();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Action must be taken immediately
-     * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function alert($message, array $context = [])
-    {
-        return $this->log(static::ALERT, $message, $context);
-    }
-
-    /**
-     * @return void
-     */
-    public function clear()
-    {
-        $this->log = '';
-        file_put_contents($this->file, $this->log);
-    }
-
-    /**
-     * Critical conditions
-     * Example: Application component unavailable, unexpected exception.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function critical($message, array $context = [])
-    {
-        return $this->log(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function debug($message, array $context = [])
-    {
-        return $this->log(static::DEBUG, $message, $context);
-    }
-
-    /**
-     * System is unusable.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function emergency($message, array $context = [])
-    {
-        return $this->log(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically be logged and monitored.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function error($message, array $context = [])
-    {
-        return $this->log(static::ERROR, $message, $context);
-    }
-
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        return empty($this->log)
-            ? __('Console is empty', 'site-reviews')
-            : $this->log;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLevel()
-    {
-        return intval(apply_filters('site-reviews/console/level', static::INFO));
-    }
-
-    /**
-     * @return array
-     */
-    public function getLevels()
-    {
-        $constants = (new ReflectionClass(__CLASS__))->getConstants();
-        return array_map('strtolower', array_flip($constants));
-    }
-
-    /**
-     * @return string
-     */
-    public function humanLevel()
-    {
-        $level = $this->getLevel();
-        return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
-    }
-
-    /**
-     * @param string|null $valueIfEmpty
-     * @return string
-     */
-    public function humanSize($valueIfEmpty = null)
-    {
-        $bytes = $this->size();
-        if (empty($bytes) && is_string($valueIfEmpty)) {
-            return $valueIfEmpty;
-        }
-        $exponent = floor(log(max($bytes, 1), 1024));
-        return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
-    }
-
-    /**
-     * Interesting events
-     * Example: User logs in, SQL logs.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function info($message, array $context = [])
-    {
-        return $this->log(static::INFO, $message, $context);
-    }
-
-    /**
-     * @param int $level
-     * @param mixed $message
-     * @param array $context
-     * @param string $backtraceLine
-     * @return static
-     */
-    public function log($level, $message, $context = [], $backtraceLine = '')
-    {
-        if (empty($backtraceLine)) {
-            $backtraceLine = $this->getBacktraceLine();
-        }
-        if ($this->canLogEntry($level, $backtraceLine)) {
-            $levelName = Arr::get($this->getLevels(), $level);
-            $context = Arr::consolidateArray($context);
-            $backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
-            $message = $this->interpolate($message, $context);
-            $entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
-            file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
-            apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
-            $this->reset();
-        }
-        return $this;
-    }
-
-    /**
-     * @return void
-     */
-    public function logOnce()
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $levels = $this->getLevels();
-        foreach ($once as $entry) {
-            $levelName = Arr::get($entry, 'level');
-            if (!in_array($levelName, $levels)) {
-                continue;
-            }
-            $level = Arr::get(array_flip($levels), $levelName);
-            $message = Arr::get($entry, 'message');
-            $backtraceLine = Arr::get($entry, 'backtrace');
-            $this->log($level, $message, [], $backtraceLine);
-        }
-        glsr()->{$this->logOnceKey} = [];
-    }
-
-    /**
-     * Normal but significant events.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function notice($message, array $context = [])
-    {
-        return $this->log(static::NOTICE, $message, $context);
-    }
-
-    /**
-     * @param string $levelName
-     * @param string $handle
-     * @param mixed $data
-     * @return void
-     */
-    public function once($levelName, $handle, $data)
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
-            return Arr::get($entry, 'level') == $levelName
-                && Arr::get($entry, 'handle') == $handle;
-        });
-        if (!empty($filtered)) {
-            return;
-        }
-        $once[] = [
-            'backtrace' => $this->getBacktraceLineFromData($data),
-            'handle' => $handle,
-            'level' => $levelName,
-            'message' => '[RECURRING] '.$this->getMessageFromData($data),
-        ];
-        glsr()->{$this->logOnceKey} = $once;
-    }
-
-    /**
-     * @return int
-     */
-    public function size()
-    {
-        return file_exists($this->file)
-            ? filesize($this->file)
-            : 0;
-    }
-
-    /**
-     * Exceptional occurrences that are not errors
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function warning($message, array $context = [])
-    {
-        return $this->log(static::WARNING, $message, $context);
-    }
-
-    /**
-     * @param array $backtrace
-     * @param int $index
-     * @return string
-     */
-    protected function buildBacktraceLine($backtrace, $index)
-    {
-        return sprintf('%s:%s',
-            Arr::get($backtrace, $index.'.file'), // realpath
-            Arr::get($backtrace, $index.'.line')
-        );
-    }
-
-    /**
-     * @param string $levelName
-     * @param mixed $message
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function buildLogEntry($levelName, $message, $backtraceLine = '')
-    {
-        return sprintf('[%s] %s [%s] %s',
-            current_time('mysql'),
-            strtoupper($levelName),
-            $backtraceLine,
-            $message
-        );
-    }
-
-    /**
-     * @param int $level
-     * @return bool
-     */
-    protected function canLogEntry($level, $backtraceLine)
-    {
-        $levelExists = array_key_exists($level, $this->getLevels());
-        if (!Str::contains($backtraceLine, glsr()->path())) {
-            return $levelExists; // ignore level restriction if triggered outside of the plugin
-        }
-        return $levelExists && $level >= $this->getLevel();
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function getBacktraceLine()
-    {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
-        $search = array_search('glsr_log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            return $this->buildBacktraceLine($backtrace, (int) $search);
-        }
-        $search = array_search('log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            $index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
-                ? $search + 4
-                : $search + 1;
-            return $this->buildBacktraceLine($backtrace, $index);
-        }
-        return 'Unknown';
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getBacktraceLineFromData($data)
-    {
-        $backtrace = $data instanceof Throwable
-            ? $data->getTrace()
-            : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        return $this->buildBacktraceLine($backtrace, 0);
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getMessageFromData($data)
-    {
-        return $data instanceof Throwable
-            ? $this->normalizeThrowableMessage($data->getMessage())
-            : print_r($data, 1);
-    }
-
-    /**
-     * Interpolates context values into the message placeholders.
-     * @param mixed $message
-     * @param array $context
-     * @return string
-     */
-    protected function interpolate($message, $context = [])
-    {
-        if ($this->isObjectOrArray($message) || !is_array($context)) {
-            return print_r($message, true);
-        }
-        $replace = [];
-        foreach ($context as $key => $value) {
-            $replace['{'.$key.'}'] = $this->normalizeValue($value);
-        }
-        return strtr($message, $replace);
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    protected function isObjectOrArray($value)
-    {
-        return is_object($value) || is_array($value);
-    }
-
-    /**
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function normalizeBacktraceLine($backtraceLine)
-    {
-        $search = [
-            glsr()->path('plugin/'),
-            glsr()->path('plugin/', false),
-            trailingslashit(glsr()->path()),
-            trailingslashit(glsr()->path('', false)),
-            WP_CONTENT_DIR,
-            ABSPATH,
-        ];
-        return str_replace(array_unique($search), '', $backtraceLine);
-    }
-
-    /**
-     * @param string $message
-     * @return string
-     */
-    protected function normalizeThrowableMessage($message)
-    {
-        $calledIn = strpos($message, ', called in');
-        return false !== $calledIn
-            ? substr($message, 0, $calledIn)
-            : $message;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    protected function normalizeValue($value)
-    {
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
-            $value = json_encode($value);
-        }
-        return (string) $value;
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        if ($this->size() <= pow(1024, 2) / 8) {
-            return;
-        }
-        $this->clear();
-        file_put_contents(
-            $this->file,
-            $this->buildLogEntry(
-                static::NOTICE,
-                __('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
-            )
-        );
-    }
+	const DEBUG = 0;      // Detailed debug information
+	const INFO = 1;       // Interesting events
+	const NOTICE = 2;     // Normal but significant events
+	const WARNING = 4;    // Exceptional occurrences that are not errors
+	const ERROR = 8;      // Runtime errors that do not require immediate action
+	const CRITICAL = 16;  // Critical conditions
+	const ALERT = 32;     // Action must be taken immediately
+	const EMERGENCY = 64; // System is unusable
+
+	protected $file;
+	protected $log;
+	protected $logOnceKey = 'glsr_log_once';
+
+	public function __construct()
+	{
+		$this->file = glsr()->path('console.log');
+		$this->log = file_exists($this->file)
+			? file_get_contents($this->file)
+			: '';
+		$this->reset();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get();
+	}
+
+	/**
+	 * Action must be taken immediately
+	 * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function alert($message, array $context = [])
+	{
+		return $this->log(static::ALERT, $message, $context);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function clear()
+	{
+		$this->log = '';
+		file_put_contents($this->file, $this->log);
+	}
+
+	/**
+	 * Critical conditions
+	 * Example: Application component unavailable, unexpected exception.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function critical($message, array $context = [])
+	{
+		return $this->log(static::CRITICAL, $message, $context);
+	}
+
+	/**
+	 * Detailed debug information.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function debug($message, array $context = [])
+	{
+		return $this->log(static::DEBUG, $message, $context);
+	}
+
+	/**
+	 * System is unusable.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function emergency($message, array $context = [])
+	{
+		return $this->log(static::EMERGENCY, $message, $context);
+	}
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically be logged and monitored.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function error($message, array $context = [])
+	{
+		return $this->log(static::ERROR, $message, $context);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		return empty($this->log)
+			? __('Console is empty', 'site-reviews')
+			: $this->log;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLevel()
+	{
+		return intval(apply_filters('site-reviews/console/level', static::INFO));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLevels()
+	{
+		$constants = (new ReflectionClass(__CLASS__))->getConstants();
+		return array_map('strtolower', array_flip($constants));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function humanLevel()
+	{
+		$level = $this->getLevel();
+		return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
+	}
+
+	/**
+	 * @param string|null $valueIfEmpty
+	 * @return string
+	 */
+	public function humanSize($valueIfEmpty = null)
+	{
+		$bytes = $this->size();
+		if (empty($bytes) && is_string($valueIfEmpty)) {
+			return $valueIfEmpty;
+		}
+		$exponent = floor(log(max($bytes, 1), 1024));
+		return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
+	}
+
+	/**
+	 * Interesting events
+	 * Example: User logs in, SQL logs.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function info($message, array $context = [])
+	{
+		return $this->log(static::INFO, $message, $context);
+	}
+
+	/**
+	 * @param int $level
+	 * @param mixed $message
+	 * @param array $context
+	 * @param string $backtraceLine
+	 * @return static
+	 */
+	public function log($level, $message, $context = [], $backtraceLine = '')
+	{
+		if (empty($backtraceLine)) {
+			$backtraceLine = $this->getBacktraceLine();
+		}
+		if ($this->canLogEntry($level, $backtraceLine)) {
+			$levelName = Arr::get($this->getLevels(), $level);
+			$context = Arr::consolidateArray($context);
+			$backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
+			$message = $this->interpolate($message, $context);
+			$entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
+			file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
+			apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
+			$this->reset();
+		}
+		return $this;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function logOnce()
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$levels = $this->getLevels();
+		foreach ($once as $entry) {
+			$levelName = Arr::get($entry, 'level');
+			if (!in_array($levelName, $levels)) {
+				continue;
+			}
+			$level = Arr::get(array_flip($levels), $levelName);
+			$message = Arr::get($entry, 'message');
+			$backtraceLine = Arr::get($entry, 'backtrace');
+			$this->log($level, $message, [], $backtraceLine);
+		}
+		glsr()->{$this->logOnceKey} = [];
+	}
+
+	/**
+	 * Normal but significant events.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function notice($message, array $context = [])
+	{
+		return $this->log(static::NOTICE, $message, $context);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param string $handle
+	 * @param mixed $data
+	 * @return void
+	 */
+	public function once($levelName, $handle, $data)
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
+			return Arr::get($entry, 'level') == $levelName
+				&& Arr::get($entry, 'handle') == $handle;
+		});
+		if (!empty($filtered)) {
+			return;
+		}
+		$once[] = [
+			'backtrace' => $this->getBacktraceLineFromData($data),
+			'handle' => $handle,
+			'level' => $levelName,
+			'message' => '[RECURRING] '.$this->getMessageFromData($data),
+		];
+		glsr()->{$this->logOnceKey} = $once;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function size()
+	{
+		return file_exists($this->file)
+			? filesize($this->file)
+			: 0;
+	}
+
+	/**
+	 * Exceptional occurrences that are not errors
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function warning($message, array $context = [])
+	{
+		return $this->log(static::WARNING, $message, $context);
+	}
+
+	/**
+	 * @param array $backtrace
+	 * @param int $index
+	 * @return string
+	 */
+	protected function buildBacktraceLine($backtrace, $index)
+	{
+		return sprintf('%s:%s',
+			Arr::get($backtrace, $index.'.file'), // realpath
+			Arr::get($backtrace, $index.'.line')
+		);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param mixed $message
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function buildLogEntry($levelName, $message, $backtraceLine = '')
+	{
+		return sprintf('[%s] %s [%s] %s',
+			current_time('mysql'),
+			strtoupper($levelName),
+			$backtraceLine,
+			$message
+		);
+	}
+
+	/**
+	 * @param int $level
+	 * @return bool
+	 */
+	protected function canLogEntry($level, $backtraceLine)
+	{
+		$levelExists = array_key_exists($level, $this->getLevels());
+		if (!Str::contains($backtraceLine, glsr()->path())) {
+			return $levelExists; // ignore level restriction if triggered outside of the plugin
+		}
+		return $levelExists && $level >= $this->getLevel();
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function getBacktraceLine()
+	{
+		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
+		$search = array_search('glsr_log', glsr_array_column($backtrace, 'function'));
+		if (false !== $search) {
+			return $this->buildBacktraceLine($backtrace, (int) $search);
+		}
+		$search = array_search('log', glsr_array_column($backtrace, 'function'));
+		if (false !== $search) {
+			$index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
+				? $search + 4
+				: $search + 1;
+			return $this->buildBacktraceLine($backtrace, $index);
+		}
+		return 'Unknown';
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getBacktraceLineFromData($data)
+	{
+		$backtrace = $data instanceof Throwable
+			? $data->getTrace()
+			: debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+		return $this->buildBacktraceLine($backtrace, 0);
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getMessageFromData($data)
+	{
+		return $data instanceof Throwable
+			? $this->normalizeThrowableMessage($data->getMessage())
+			: print_r($data, 1);
+	}
+
+	/**
+	 * Interpolates context values into the message placeholders.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return string
+	 */
+	protected function interpolate($message, $context = [])
+	{
+		if ($this->isObjectOrArray($message) || !is_array($context)) {
+			return print_r($message, true);
+		}
+		$replace = [];
+		foreach ($context as $key => $value) {
+			$replace['{'.$key.'}'] = $this->normalizeValue($value);
+		}
+		return strtr($message, $replace);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	protected function isObjectOrArray($value)
+	{
+		return is_object($value) || is_array($value);
+	}
+
+	/**
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function normalizeBacktraceLine($backtraceLine)
+	{
+		$search = [
+			glsr()->path('plugin/'),
+			glsr()->path('plugin/', false),
+			trailingslashit(glsr()->path()),
+			trailingslashit(glsr()->path('', false)),
+			WP_CONTENT_DIR,
+			ABSPATH,
+		];
+		return str_replace(array_unique($search), '', $backtraceLine);
+	}
+
+	/**
+	 * @param string $message
+	 * @return string
+	 */
+	protected function normalizeThrowableMessage($message)
+	{
+		$calledIn = strpos($message, ', called in');
+		return false !== $calledIn
+			? substr($message, 0, $calledIn)
+			: $message;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	protected function normalizeValue($value)
+	{
+		if ($value instanceof DateTime) {
+			$value = $value->format('Y-m-d H:i:s');
+		} elseif ($this->isObjectOrArray($value)) {
+			$value = json_encode($value);
+		}
+		return (string) $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		if ($this->size() <= pow(1024, 2) / 8) {
+			return;
+		}
+		$this->clear();
+		file_put_contents(
+			$this->file,
+			$this->buildLogEntry(
+				static::NOTICE,
+				__('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
+			)
+		);
+	}
 }

deprecated.php

Indentation +116 added lines, -116 removed lines

@@ -3,134 +3,134 @@
 defined('WPINC') || die;
 
 if (apply_filters('site-reviews/support/deprecated/v4', true)) {
-    // Unprotected review meta has been deprecated
-    add_filter('get_post_metadata', function ($data, $postId, $metaKey, $single) {
-        $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-        if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
-            return $data;
-        }
-        glsr()->deprecated[] = sprintf(
-            'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
-            $metaKey
-        );
-        return get_post_meta($postId, '_'.$metaKey, $single);
-    }, 10, 4);
+	// Unprotected review meta has been deprecated
+	add_filter('get_post_metadata', function ($data, $postId, $metaKey, $single) {
+		$metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
+		if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+			return $data;
+		}
+		glsr()->deprecated[] = sprintf(
+			'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
+			$metaKey
+		);
+		return get_post_meta($postId, '_'.$metaKey, $single);
+	}, 10, 4);
 
-    // Modules/Html/Template.php
-    add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
-        $search = '{{ navigation }}';
-        if (false !== strpos($template, $search)) {
-            $context['navigation'] = $context['pagination'];
-            glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
-        }
-        return $context;
-    }, 10, 2);
+	// Modules/Html/Template.php
+	add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
+		$search = '{{ navigation }}';
+		if (false !== strpos($template, $search)) {
+			$context['navigation'] = $context['pagination'];
+			glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
+		}
+		return $context;
+	}, 10, 2);
 
-    // Database/ReviewManager.php
-    add_action('site-reviews/review/created', function ($review) {
-        if (has_action('site-reviews/local/review/create')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
-            do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
-        }
-    }, 9);
+	// Database/ReviewManager.php
+	add_action('site-reviews/review/created', function ($review) {
+		if (has_action('site-reviews/local/review/create')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
+			do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
+		}
+	}, 9);
 
-    // Handlers/CreateReview.php
-    add_action('site-reviews/review/submitted', function ($review) {
-        if (has_action('site-reviews/local/review/submitted')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
-            do_action('site-reviews/local/review/submitted', null, $review);
-        }
-        if (has_filter('site-reviews/local/review/submitted/message')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
-        }
-    }, 9);
+	// Handlers/CreateReview.php
+	add_action('site-reviews/review/submitted', function ($review) {
+		if (has_action('site-reviews/local/review/submitted')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
+			do_action('site-reviews/local/review/submitted', null, $review);
+		}
+		if (has_filter('site-reviews/local/review/submitted/message')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
+		}
+	}, 9);
 
-    // Database/ReviewManager.php
-    add_filter('site-reviews/create/review-values', function ($values, $command) {
-        if (has_filter('site-reviews/local/review')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
-            return apply_filters('site-reviews/local/review', $values, $command);
-        }
-        return $values;
-    }, 9, 2);
+	// Database/ReviewManager.php
+	add_filter('site-reviews/create/review-values', function ($values, $command) {
+		if (has_filter('site-reviews/local/review')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
+			return apply_filters('site-reviews/local/review', $values, $command);
+		}
+		return $values;
+	}, 9, 2);
 
-    // Handlers/EnqueuePublicAssets.php
-    add_filter('site-reviews/enqueue/public/localize', function ($variables) {
-        if (has_filter('site-reviews/enqueue/localize')) {
-            glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
-            return apply_filters('site-reviews/enqueue/localize', $variables);
-        }
-        return $variables;
-    }, 9);
+	// Handlers/EnqueuePublicAssets.php
+	add_filter('site-reviews/enqueue/public/localize', function ($variables) {
+		if (has_filter('site-reviews/enqueue/localize')) {
+			glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
+			return apply_filters('site-reviews/enqueue/localize', $variables);
+		}
+		return $variables;
+	}, 9);
 
-    // Modules/Rating.php
-    add_filter('site-reviews/rating/average', function ($average) {
-        if (has_filter('site-reviews/average/rating')) {
-            glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
-        }
-        return $average;
-    }, 9);
+	// Modules/Rating.php
+	add_filter('site-reviews/rating/average', function ($average) {
+		if (has_filter('site-reviews/average/rating')) {
+			glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
+		}
+		return $average;
+	}, 9);
 
-    // Modules/Rating.php
-    add_filter('site-reviews/rating/ranking', function ($ranking) {
-        if (has_filter('site-reviews/bayesian/ranking')) {
-            glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
-        }
-        return $ranking;
-    }, 9);
+	// Modules/Rating.php
+	add_filter('site-reviews/rating/ranking', function ($ranking) {
+		if (has_filter('site-reviews/bayesian/ranking')) {
+			glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
+		}
+		return $ranking;
+	}, 9);
 
-    // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/after', function ($renderedFields) {
-        if (has_filter('site-reviews/reviews/review/text')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-        }
-        if (has_filter('site-reviews/reviews/review/title')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-        }
-        return $renderedFields;
-    }, 9);
+	// Modules/Html/Partials/SiteReviews.php
+	add_filter('site-reviews/review/build/after', function ($renderedFields) {
+		if (has_filter('site-reviews/reviews/review/text')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+		}
+		if (has_filter('site-reviews/reviews/review/title')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+		}
+		return $renderedFields;
+	}, 9);
 
-    // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/before', function ($review) {
-        if (has_filter('site-reviews/rendered/review')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
-        }
-        if (has_filter('site-reviews/rendered/review/meta/order')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/rendered/review/order')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/rendered/review-form/login-register')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/reviews/navigation_links')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
-        }
-        return $review;
-    }, 9);
+	// Modules/Html/Partials/SiteReviews.php
+	add_filter('site-reviews/review/build/before', function ($review) {
+		if (has_filter('site-reviews/rendered/review')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
+		}
+		if (has_filter('site-reviews/rendered/review/meta/order')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/rendered/review/order')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/rendered/review-form/login-register')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/reviews/navigation_links')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
+		}
+		return $review;
+	}, 9);
 
-    add_filter('site-reviews/validate/custom', function ($result, $request) {
-        if (has_filter('site-reviews/validate/review/submission')) {
-            glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
-            return apply_filters('site-reviews/validate/review/submission', $result, $request);
-        }
-        return $result;
-    }, 9, 2);
+	add_filter('site-reviews/validate/custom', function ($result, $request) {
+		if (has_filter('site-reviews/validate/review/submission')) {
+			glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
+			return apply_filters('site-reviews/validate/review/submission', $result, $request);
+		}
+		return $result;
+	}, 9, 2);
 
-    add_filter('site-reviews/views/file', function ($file, $view, $data) {
-        if (has_filter('site-reviews/addon/views/file')) {
-            glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
-            $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
-        }
-        return $file;
-    }, 9, 3);
+	add_filter('site-reviews/views/file', function ($file, $view, $data) {
+		if (has_filter('site-reviews/addon/views/file')) {
+			glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
+			$file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
+		}
+		return $file;
+	}, 9, 3);
 }
 
 add_action('wp_footer', function () {
-    $notices = array_keys(array_flip(glsr()->deprecated));
-    natsort($notices);
-    foreach ($notices as $notice) {
-        glsr_log()->warning($notice);
-    }
+	$notices = array_keys(array_flip(glsr()->deprecated));
+	natsort($notices);
+	foreach ($notices as $notice) {
+		glsr_log()->warning($notice);
+	}
 });

plugin/Handlers/EnqueuePublicAssets.php

Indentation +136 added lines, -136 removed lines

@@ -9,148 +9,148 @@
 
 class EnqueuePublicAssets
 {
-    /**
-     * @return void
-     */
-    public function handle()
-    {
-        $this->enqueueAssets();
-        $this->enqueuePolyfillService();
-        $this->enqueueRecaptchaScript();
-        $this->inlineScript();
-        $this->inlineStyles();
-    }
+	/**
+	 * @return void
+	 */
+	public function handle()
+	{
+		$this->enqueueAssets();
+		$this->enqueuePolyfillService();
+		$this->enqueueRecaptchaScript();
+		$this->inlineScript();
+		$this->inlineStyles();
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueueAssets()
-    {
-        if (apply_filters('site-reviews/assets/css', true)) {
-            wp_enqueue_style(
-                Application::ID,
-                $this->getStylesheet(),
-                [],
-                glsr()->version
-            );
-        }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
-                ? [Application::ID.'/polyfill']
-                : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
-            wp_enqueue_script(
-                Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
-                $dependencies,
-                glsr()->version,
-                true
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueueAssets()
+	{
+		if (apply_filters('site-reviews/assets/css', true)) {
+			wp_enqueue_style(
+				Application::ID,
+				$this->getStylesheet(),
+				[],
+				glsr()->version
+			);
+		}
+		if (apply_filters('site-reviews/assets/js', true)) {
+			$dependencies = apply_filters('site-reviews/assets/polyfill', true)
+				? [Application::ID.'/polyfill']
+				: [];
+			$dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+			wp_enqueue_script(
+				Application::ID,
+				glsr()->url('assets/scripts/'.Application::ID.'.js'),
+				$dependencies,
+				glsr()->version,
+				true
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueuePolyfillService()
-    {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
-            return;
-        }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
-            'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
-            'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueuePolyfillService()
+	{
+		if (!apply_filters('site-reviews/assets/polyfill', true)) {
+			return;
+		}
+		wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+			'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
+			'flags' => 'gated',
+		], 'https://polyfill.io/v3/polyfill.min.js'));
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueueRecaptchaScript()
-    {
-        // wpforms-recaptcha
-        // google-recaptcha
-        // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return;
-        }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
-            'hl' => $language,
-            'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueueRecaptchaScript()
+	{
+		// wpforms-recaptcha
+		// google-recaptcha
+		// nf-google-recaptcha
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return;
+		}
+		$language = apply_filters('site-reviews/recaptcha/language', get_locale());
+		wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+			'hl' => $language,
+			'render' => 'explicit',
+		], 'https://www.google.com/recaptcha/api.js'));
+	}
 
-    /**
-     * @return void
-     */
-    public function inlineScript()
-    {
-        $variables = [
-            'action' => Application::PREFIX.'action',
-            'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
-            'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
-        ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
-    }
+	/**
+	 * @return void
+	 */
+	public function inlineScript()
+	{
+		$variables = [
+			'action' => Application::PREFIX.'action',
+			'ajaxpagination' => $this->getFixedSelectorsForPagination(),
+			'ajaxurl' => admin_url('admin-ajax.php'),
+			'nameprefix' => Application::ID,
+			'validationconfig' => glsr(Style::class)->validation,
+			'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+		];
+		$variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
+		wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+	}
 
-    /**
-     * @return void
-     */
-    public function inlineStyles()
-    {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
-            return;
-        }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
-            return;
-        }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
-        $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
-        );
-        wp_add_inline_style(Application::ID, $stylesheet);
-    }
+	/**
+	 * @return void
+	 */
+	public function inlineStyles()
+	{
+		$inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
+		if (!apply_filters('site-reviews/assets/css', true)) {
+			return;
+		}
+		if (!file_exists($inlineStylesheetPath)) {
+			glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+			return;
+		}
+		$inlineStylesheetValues = glsr()->config('inline-styles');
+		$stylesheet = str_replace(
+			array_keys($inlineStylesheetValues),
+			array_values($inlineStylesheetValues),
+			file_get_contents($inlineStylesheetPath)
+		);
+		wp_add_inline_style(Application::ID, $stylesheet);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildInlineScript(array $variables)
-    {
-        $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-        }
-        $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildInlineScript(array $variables)
+	{
+		$script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
+		foreach ($variables as $key => $value) {
+			$script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+		}
+		$pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
+		$optimizedScript = preg_replace($pattern, '$1$2', $script);
+		return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getFixedSelectorsForPagination()
-    {
-        $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getFixedSelectorsForPagination()
+	{
+		$selectors = ['#wpadminbar', '.site-navigation-fixed'];
+		return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getStylesheet()
-    {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
-    }
+	/**
+	 * @return string
+	 */
+	protected function getStylesheet()
+	{
+		$currentStyle = glsr(Style::class)->style;
+		return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
+			? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
+			: glsr()->url('assets/styles/'.Application::ID.'.css');
+	}
 }

plugin/Defaults/StyleValidationDefaults.php

Indentation +19 added lines, -19 removed lines

@@ -6,23 +6,23 @@
 
 class StyleValidationDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'error_tag' => 'div',
-            'error_tag_class' => 'glsr-field-error',
-            'field_class' => 'glsr-field',
-            'field_error_class' => 'glsr-has-error',
-            'input_error_class' => 'glsr-is-invalid',
-            'input_valid_class' => 'glsr-is-valid',
-            'message_error_class' => 'glsr-has-errors',
-            'message_initial_class' => 'glsr-is-visible',
-            'message_success_class' => 'glsr-has-success',
-            'message_tag' => 'div',
-            'message_tag_class' => 'glsr-form-message',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'error_tag' => 'div',
+			'error_tag_class' => 'glsr-field-error',
+			'field_class' => 'glsr-field',
+			'field_error_class' => 'glsr-has-error',
+			'input_error_class' => 'glsr-is-invalid',
+			'input_valid_class' => 'glsr-is-valid',
+			'message_error_class' => 'glsr-has-errors',
+			'message_initial_class' => 'glsr-is-visible',
+			'message_success_class' => 'glsr-has-success',
+			'message_tag' => 'div',
+			'message_tag_class' => 'glsr-form-message',
+		];
+	}
 }