pryley / site-reviews

plugin/Handlers/ChangeStatus.php

Indentation +63 added lines, -63 removed lines

@@ -8,70 +8,70 @@
 
 class ChangeStatus
 {
-    /**
-     * @return array
-     */
-    public function handle(Command $command)
-    {
-        $postId = wp_update_post([
-            'ID' => $command->id,
-            'post_status' => $command->status,
-        ]);
-        if (is_wp_error($postId)) {
-            glsr_log()->error($postId->get_error_message());
-            return [];
-        }
-        return [
-            'class' => 'status-'.$command->status,
-            'counts' => $this->getStatusLinks(),
-            'link' => $this->getPostLink($postId).$this->getPostState($postId),
-            'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function handle(Command $command)
+	{
+		$postId = wp_update_post([
+			'ID' => $command->id,
+			'post_status' => $command->status,
+		]);
+		if (is_wp_error($postId)) {
+			glsr_log()->error($postId->get_error_message());
+			return [];
+		}
+		return [
+			'class' => 'status-'.$command->status,
+			'counts' => $this->getStatusLinks(),
+			'link' => $this->getPostLink($postId).$this->getPostState($postId),
+			'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
+		];
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    protected function getPostLink($postId)
-    {
-        $title = _draft_or_post_title($postId);
-        return glsr(Builder::class)->a($title, [
-            'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
-            'class' => 'row-title',
-            'href' => get_edit_post_link($postId),
-        ]);
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	protected function getPostLink($postId)
+	{
+		$title = _draft_or_post_title($postId);
+		return glsr(Builder::class)->a($title, [
+			'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
+			'class' => 'row-title',
+			'href' => get_edit_post_link($postId),
+		]);
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    protected function getPostState($postId)
-    {
-        ob_start();
-        _post_states(get_post($postId));
-        return ob_get_clean();
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	protected function getPostState($postId)
+	{
+		ob_start();
+		_post_states(get_post($postId));
+		return ob_get_clean();
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function getStatusLinks()
-    {
-        global $avail_post_stati;
-        require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
-        $hookName = 'edit-'.Application::POST_TYPE;
-        set_current_screen($hookName);
-        $avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
-        $table = new \WP_Posts_List_Table(['screen' => $hookName]);
-        $views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
-        if (empty($views)) {
-            return;
-        }
-        foreach ($views as $class => $view) {
-            $views[$class] = "\t<li class='$class'>$view";
-        }
-        return implode(' |</li>', $views).'</li>';
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function getStatusLinks()
+	{
+		global $avail_post_stati;
+		require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
+		$hookName = 'edit-'.Application::POST_TYPE;
+		set_current_screen($hookName);
+		$avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
+		$table = new \WP_Posts_List_Table(['screen' => $hookName]);
+		$views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
+		if (empty($views)) {
+			return;
+		}
+		foreach ($views as $class => $view) {
+			$views[$class] = "\t<li class='$class'>$view";
+		}
+		return implode(' |</li>', $views).'</li>';
+	}
 }

plugin/Handlers/CreateReview.php

Indentation +35 added lines, -35 removed lines

@@ -8,40 +8,40 @@
 
 class CreateReview
 {
-    /**
-     * @return void|string
-     */
-    public function handle(Command $command)
-    {
-        $review = glsr(ReviewManager::class)->create($command);
-        if (!$review) {
-            glsr()->sessionSet($command->form_id.'errors', []);
-            glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
-            return;
-        }
-        glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
-        glsr(Notification::class)->send($review);
-        if ($command->ajax_request) {
-            return;
-        }
-        wp_safe_redirect($this->getReferer($command));
-        exit;
-    }
+	/**
+	 * @return void|string
+	 */
+	public function handle(Command $command)
+	{
+		$review = glsr(ReviewManager::class)->create($command);
+		if (!$review) {
+			glsr()->sessionSet($command->form_id.'errors', []);
+			glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
+			return;
+		}
+		glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
+		glsr(Notification::class)->send($review);
+		if ($command->ajax_request) {
+			return;
+		}
+		wp_safe_redirect($this->getReferer($command));
+		exit;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getReferer(Command $command)
-    {
-        $referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $referer = apply_filters('site-reviews/review/redirect', $referer, $command);
-        if (empty($referer)) {
-            $referer = $command->referer;
-        }
-        if (empty($referer)) {
-            glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
-            $referer = home_url();
-        }
-        return $referer;
-    }
+	/**
+	 * @return string
+	 */
+	protected function getReferer(Command $command)
+	{
+		$referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
+		$referer = apply_filters('site-reviews/review/redirect', $referer, $command);
+		if (empty($referer)) {
+			$referer = $command->referer;
+		}
+		if (empty($referer)) {
+			glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
+			$referer = home_url();
+		}
+		return $referer;
+	}
 }

deprecated.php

Indentation +82 added lines, -82 removed lines

@@ -4,131 +4,131 @@
 
 // Unprotected review meta has been deprecated
 add_filter('get_post_metadata', function ($check, $postId, $metaKey, $single) {
-    $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-    if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
-        return $check;
-    }
-    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);
+	$metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
+	if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+		return $check;
+	}
+	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;
+	$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);
-    }
+	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.';
-    }
+	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;
+	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;
+	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;
+	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;
+	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;
+	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;
+	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;
+	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;
+	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/Widgets/SiteReviewsWidget.php

Indentation +86 added lines, -86 removed lines

@@ -7,92 +7,92 @@
 
 class SiteReviewsWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        $this->renderField('number', [
-            'class' => 'small-text',
-            'default' => 5,
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
-            'max' => 100,
-            'name' => 'count',
-        ]);
-        $this->renderField('select', [
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
-            'name' => 'rating',
-            'options' => [
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
-            ],
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
-                'name' => 'type',
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
-        }
-        if (!empty($terms)) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Limit reviews to this category', 'site-reviews'),
-                'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
-        }
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
-            'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		$this->renderField('number', [
+			'class' => 'small-text',
+			'default' => 5,
+			'label' => __('How many reviews would you like to display?', 'site-reviews'),
+			'max' => 100,
+			'name' => 'count',
+		]);
+		$this->renderField('select', [
+			'label' => __('What is the minimum rating to display?', 'site-reviews'),
+			'name' => 'rating',
+			'options' => [
+				'5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
+				'4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
+				'3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
+				'2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
+				'1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
+			],
+		]);
+		if (count(glsr()->reviewTypes) > 1) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Which type of review would you like to display?', 'site-reviews'),
+				'name' => 'type',
+				'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
+			]);
+		}
+		if (!empty($terms)) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Limit reviews to this category', 'site-reviews'),
+				'name' => 'category',
+				'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
+			]);
+		}
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
+			'name' => 'assigned_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $newInstance
-     * @param array $oldInstance
-     * @return array
-     */
-    public function update($newInstance, $oldInstance)
-    {
-        if (!is_numeric($newInstance['count'])) {
-            $newInstance['count'] = 10;
-        }
-        $newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
-        return parent::update($newInstance, $oldInstance);
-    }
+	/**
+	 * @param array $newInstance
+	 * @param array $oldInstance
+	 * @return array
+	 */
+	public function update($newInstance, $oldInstance)
+	{
+		if (!is_numeric($newInstance['count'])) {
+			$newInstance['count'] = 10;
+		}
+		$newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
+		return parent::update($newInstance, $oldInstance);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
+	}
 }

plugin/Widgets/SiteReviewsFormWidget.php

Indentation +50 added lines, -50 removed lines

@@ -7,55 +7,55 @@
 
 class SiteReviewsFormWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        $this->renderField('textarea', [
-            'class' => 'widefat',
-            'label' => __('Description', 'site-reviews'),
-            'name' => 'description',
-        ]);
-        $this->renderField('select', [
-            'class' => 'widefat',
-            'label' => __('Automatically assign a category', 'site-reviews'),
-            'name' => 'category',
-            'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
-            'name' => 'assign_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		$this->renderField('textarea', [
+			'class' => 'widefat',
+			'label' => __('Description', 'site-reviews'),
+			'name' => 'description',
+		]);
+		$this->renderField('select', [
+			'class' => 'widefat',
+			'label' => __('Automatically assign a category', 'site-reviews'),
+			'name' => 'category',
+			'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
+			'name' => 'assign_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
+	}
 }

plugin/Widgets/SiteReviewsSummaryWidget.php

Indentation +55 added lines, -55 removed lines

@@ -7,60 +7,60 @@
 
 class SiteReviewsSummaryWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsSummaryShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Which type of review would you like to use?', 'site-reviews'),
-                'name' => 'type',
-                'options' => ['' => __('All review types', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
-        }
-        if (!empty($terms)) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Limit summary to this category', 'site-reviews'),
-                'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
-        }
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit summary to reviews assigned to a page/post ID', 'site-reviews'),
-            'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsSummaryShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsSummaryShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		if (count(glsr()->reviewTypes) > 1) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Which type of review would you like to use?', 'site-reviews'),
+				'name' => 'type',
+				'options' => ['' => __('All review types', 'site-reviews')] + glsr()->reviewTypes,
+			]);
+		}
+		if (!empty($terms)) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Limit summary to this category', 'site-reviews'),
+				'name' => 'category',
+				'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
+			]);
+		}
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Limit summary to reviews assigned to a page/post ID', 'site-reviews'),
+			'name' => 'assigned_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsSummaryShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsSummaryShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsSummaryShortcode::class)->build($instance, $args, 'widget');
+	}
 }

plugin/Router.php

Indentation +146 added lines, -146 removed lines

@@ -6,161 +6,161 @@
 
 class Router
 {
-    /**
-     * @var array
-     */
-    protected $unguardedActions = [];
+	/**
+	 * @var array
+	 */
+	protected $unguardedActions = [];
 
-    public function __construct()
-    {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
-            'fetch-paged-reviews',
-        ]);
-    }
+	public function __construct()
+	{
+		$this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+			'fetch-paged-reviews',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAdminPostRequest()
-    {
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAdminPostRequest()
+	{
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		check_admin_referer($request['_action']);
+		$this->routeRequest('admin', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAjaxRequest()
-    {
-        $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
-        wp_die();
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAjaxRequest()
+	{
+		$request = $this->getRequest();
+		$this->checkAjaxRequest($request);
+		$this->checkAjaxNonce($request);
+		$this->routeRequest('ajax', $request['_action'], $request);
+		wp_die();
+	}
 
-    /**
-     * @return void
-     */
-    public function routePublicPostRequest()
-    {
-        if (is_admin()) {
-            return;
-        }
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        if (!$this->isValidPublicNonce($request)) {
-            return;
-        }
-        $this->routeRequest('public', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routePublicPostRequest()
+	{
+		if (is_admin()) {
+			return;
+		}
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		if (!$this->isValidPublicNonce($request)) {
+			return;
+		}
+		$this->routeRequest('public', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxNonce(array $request)
-    {
-        if (!is_user_logged_in() || in_array(glsr_get($request, '_action'), $this->unguardedActions)) {
-            return;
-        }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
-        }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxNonce(array $request)
+	{
+		if (!is_user_logged_in() || in_array(glsr_get($request, '_action'), $this->unguardedActions)) {
+			return;
+		}
+		if (!isset($request['_nonce'])) {
+			$this->sendAjaxError('request is missing a nonce', $request);
+		}
+		if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			$this->sendAjaxError('request failed the nonce check', $request, 403);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxRequest(array $request)
-    {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
-        }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxRequest(array $request)
+	{
+		if (!isset($request['_action'])) {
+			$this->sendAjaxError('request must include an action', $request);
+		}
+		if (empty($request['_ajax_request'])) {
+			$this->sendAjaxError('request is invalid', $request);
+		}
+	}
 
-    /**
-     * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
-     * while each ajax route is determined by $_POST[request][_action].
-     * @return array
-     */
-    protected function getRequest()
-    {
-        $request = glsr(Helper::class)->filterInputArray(Application::ID);
-        if (glsr(Helper::class)->filterInput('action') == Application::PREFIX.'action') {
-            $request['_ajax_request'] = true;
-        }
-        if ('submit-review' == glsr(Helper::class)->filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = glsr(Helper::class)->filterInput('g-recaptcha-response');
-        }
-        return $request;
-    }
+	/**
+	 * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
+	 * while each ajax route is determined by $_POST[request][_action].
+	 * @return array
+	 */
+	protected function getRequest()
+	{
+		$request = glsr(Helper::class)->filterInputArray(Application::ID);
+		if (glsr(Helper::class)->filterInput('action') == Application::PREFIX.'action') {
+			$request['_ajax_request'] = true;
+		}
+		if ('submit-review' == glsr(Helper::class)->filterInput('_action', $request)) {
+			$request['_recaptcha-token'] = glsr(Helper::class)->filterInput('g-recaptcha-response');
+		}
+		return $request;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPostRequest(array $request = [])
-    {
-        return !empty($request['_action']) && empty($request['_ajax_request']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPostRequest(array $request = [])
+	{
+		return !empty($request['_action']) && empty($request['_ajax_request']);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPublicNonce(array $request)
-    {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPublicNonce(array $request)
+	{
+		if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			glsr_log()->error('nonce check failed for public request')->debug($request);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * @param string $type
-     * @param string $action
-     * @return void
-     */
-    protected function routeRequest($type, $action, array $request = [])
-    {
-        $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(glsr(Helper::class)->buildClassName($type.'-controller', 'Controllers'));
-        $method = glsr(Helper::class)->buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
-            return;
-        }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param string $action
+	 * @return void
+	 */
+	protected function routeRequest($type, $action, array $request = [])
+	{
+		$actionHook = 'site-reviews/route/'.$type.'/request';
+		$controller = glsr(glsr(Helper::class)->buildClassName($type.'-controller', 'Controllers'));
+		$method = glsr(Helper::class)->buildMethodName($action, 'router');
+		$request = apply_filters('site-reviews/route/request', $request, $action, $type);
+		do_action($actionHook, $action, $request);
+		if (is_callable([$controller, $method])) {
+			call_user_func([$controller, $method], $request);
+			return;
+		}
+		if (0 === did_action($actionHook)) {
+			glsr_log('Unknown '.$type.' router request: '.$action);
+		}
+	}
 
-    /**
-     * @param string $error
-     * @param int $statusCode
-     * @return void
-     */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
-    {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
-            'error' => $error,
-        ]);
-    }
+	/**
+	 * @param string $error
+	 * @param int $statusCode
+	 * @return void
+	 */
+	protected function sendAjaxError($error, array $request, $statusCode = 400)
+	{
+		glsr_log()->error($error)->debug($request);
+		glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
+		wp_send_json_error([
+			'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
+			'notices' => glsr(Notice::class)->get(),
+			'error' => $error,
+		]);
+	}
 }

plugin/Modules/Html/Fields/Button.php

Indentation +9 added lines, -9 removed lines

@@ -4,13 +4,13 @@
 
 class Button extends Field
 {
-    /**
-     * @return array
-     */
-    public static function defaults()
-    {
-        return [
-            'class' => 'button',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public static function defaults()
+	{
+		return [
+			'class' => 'button',
+		];
+	}
 }

plugin/Container.php

Indentation +222 added lines, -222 removed lines

@@ -9,226 +9,226 @@
 
 abstract class Container
 {
-    const PROTECTED_PROPERTIES = [
-        'instance',
-        'services',
-        'session',
-        'storage',
-    ];
-
-    /**
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * The container's bound services.
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * @var array
-     */
-    protected $session = [];
-
-    /**
-     * The container's storage items.
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @return static
-     */
-    public static function load()
-    {
-        if (empty(static::$instance)) {
-            static::$instance = new static();
-        }
-        return static::$instance;
-    }
-
-    /**
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
-            return $this->$property;
-        }
-        $constant = 'static::'.strtoupper($this->make(Helper::class)->snakeCase($property));
-        if (defined($constant)) {
-            return constant($constant);
-        }
-        return glsr_get($this->storage, $property, null);
-    }
-
-    /**
-     * @param string $property
-     * @param string $value
-     * @return void
-     */
-    public function __set($property, $value)
-    {
-        if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
-            $this->storage[$property] = $value;
-        } elseif (!isset($this->$property)) {
-            $this->$property = $value;
-        } else {
-            throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
-        }
-    }
-
-    /**
-     * Bind a service to the container.
-     * @param string $alias
-     * @param mixed $concrete
-     * @return mixed
-     */
-    public function bind($alias, $concrete)
-    {
-        $this->services[$alias] = $concrete;
-    }
-
-    /**
-     * Request a service from the container.
-     * @param mixed $abstract
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        if (!isset($this->services[$abstract])) {
-            $abstract = $this->addNamespace($abstract);
-        }
-        if (isset($this->services[$abstract])) {
-            $abstract = $this->services[$abstract];
-        }
-        if (is_callable($abstract)) {
-            return call_user_func_array($abstract, [$this]);
-        }
-        if (is_object($abstract)) {
-            return $abstract;
-        }
-        return $this->resolve($abstract);
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionClear()
-    {
-        $this->session = [];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function sessionGet($key, $fallback = '')
-    {
-        $value = glsr_get($this->session, $key, $fallback);
-        unset($this->session[$key]);
-        return $value;
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionSet($key, $value)
-    {
-        $this->session[$key] = $value;
-    }
-
-    /**
-     * Bind a singleton instance to the container.
-     * @param string $alias
-     * @param callable|string|null $binding
-     * @return void
-     */
-    public function singleton($alias, $binding)
-    {
-        $this->bind($alias, $this->make($binding));
-    }
-
-    /**
-     * Prefix the current namespace to the abstract if absent.
-     * @param string $abstract
-     * @return string
-     */
-    protected function addNamespace($abstract)
-    {
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
-            $abstract = __NAMESPACE__.'\\'.$abstract;
-        }
-        return $abstract;
-    }
-
-    /**
-     * Resolve a service from the container.
-     * @param mixed $concrete
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolve($concrete)
-    {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
-        }
-        $reflector = new ReflectionClass($concrete);
-        if (!$reflector->isInstantiable()) {
-            throw new Exception('Target ['.$concrete.'] is not instantiable.');
-        }
-        $constructor = $reflector->getConstructor();
-        if (empty($constructor)) {
-            return new $concrete();
-        }
-        return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
-        );
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($parameter->getClass()->name);
-        } catch (Exception $error) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-            throw $error;
-        }
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-        foreach ($dependencies as $dependency) {
-            $results[] = !is_null($class = $dependency->getClass())
-                ? $this->resolveClass($dependency)
-                : $this->resolveDependency($dependency);
-        }
-        return $results;
-    }
-
-    /**
-     * Resolve a single ReflectionParameter dependency.
-     * @return array|null
-     */
-    protected function resolveDependency(ReflectionParameter $parameter)
-    {
-        if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
-            return $parameter->getDefaultValue();
-        }
-        return null;
-    }
+	const PROTECTED_PROPERTIES = [
+		'instance',
+		'services',
+		'session',
+		'storage',
+	];
+
+	/**
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * The container's bound services.
+	 * @var array
+	 */
+	protected $services = [];
+
+	/**
+	 * @var array
+	 */
+	protected $session = [];
+
+	/**
+	 * The container's storage items.
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @return static
+	 */
+	public static function load()
+	{
+		if (empty(static::$instance)) {
+			static::$instance = new static();
+		}
+		return static::$instance;
+	}
+
+	/**
+	 * @param string $property
+	 * @return mixed
+	 */
+	public function __get($property)
+	{
+		if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
+			return $this->$property;
+		}
+		$constant = 'static::'.strtoupper($this->make(Helper::class)->snakeCase($property));
+		if (defined($constant)) {
+			return constant($constant);
+		}
+		return glsr_get($this->storage, $property, null);
+	}
+
+	/**
+	 * @param string $property
+	 * @param string $value
+	 * @return void
+	 */
+	public function __set($property, $value)
+	{
+		if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
+			$this->storage[$property] = $value;
+		} elseif (!isset($this->$property)) {
+			$this->$property = $value;
+		} else {
+			throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
+		}
+	}
+
+	/**
+	 * Bind a service to the container.
+	 * @param string $alias
+	 * @param mixed $concrete
+	 * @return mixed
+	 */
+	public function bind($alias, $concrete)
+	{
+		$this->services[$alias] = $concrete;
+	}
+
+	/**
+	 * Request a service from the container.
+	 * @param mixed $abstract
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		if (!isset($this->services[$abstract])) {
+			$abstract = $this->addNamespace($abstract);
+		}
+		if (isset($this->services[$abstract])) {
+			$abstract = $this->services[$abstract];
+		}
+		if (is_callable($abstract)) {
+			return call_user_func_array($abstract, [$this]);
+		}
+		if (is_object($abstract)) {
+			return $abstract;
+		}
+		return $this->resolve($abstract);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionClear()
+	{
+		$this->session = [];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sessionGet($key, $fallback = '')
+	{
+		$value = glsr_get($this->session, $key, $fallback);
+		unset($this->session[$key]);
+		return $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionSet($key, $value)
+	{
+		$this->session[$key] = $value;
+	}
+
+	/**
+	 * Bind a singleton instance to the container.
+	 * @param string $alias
+	 * @param callable|string|null $binding
+	 * @return void
+	 */
+	public function singleton($alias, $binding)
+	{
+		$this->bind($alias, $this->make($binding));
+	}
+
+	/**
+	 * Prefix the current namespace to the abstract if absent.
+	 * @param string $abstract
+	 * @return string
+	 */
+	protected function addNamespace($abstract)
+	{
+		if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+			$abstract = __NAMESPACE__.'\\'.$abstract;
+		}
+		return $abstract;
+	}
+
+	/**
+	 * Resolve a service from the container.
+	 * @param mixed $concrete
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolve($concrete)
+	{
+		if ($concrete instanceof Closure) {
+			return $concrete($this);
+		}
+		$reflector = new ReflectionClass($concrete);
+		if (!$reflector->isInstantiable()) {
+			throw new Exception('Target ['.$concrete.'] is not instantiable.');
+		}
+		$constructor = $reflector->getConstructor();
+		if (empty($constructor)) {
+			return new $concrete();
+		}
+		return $reflector->newInstanceArgs(
+			$this->resolveDependencies($constructor->getParameters())
+		);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($parameter->getClass()->name);
+		} catch (Exception $error) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+			throw $error;
+		}
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+		foreach ($dependencies as $dependency) {
+			$results[] = !is_null($class = $dependency->getClass())
+				? $this->resolveClass($dependency)
+				: $this->resolveDependency($dependency);
+		}
+		return $results;
+	}
+
+	/**
+	 * Resolve a single ReflectionParameter dependency.
+	 * @return array|null
+	 */
+	protected function resolveDependency(ReflectionParameter $parameter)
+	{
+		if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
+			return $parameter->getDefaultValue();
+		}
+		return null;
+	}
 }