pryley / site-reviews

plugin/Controllers/WelcomeController.php

Indentation +88 added lines, -88 removed lines

@@ -8,97 +8,97 @@
 
 class WelcomeController extends Controller
 {
-    /**
-     * @return array
-     * @filter plugin_action_links_site-reviews/site-reviews.php
-     */
-    public function filterActionLinks(array $links)
-    {
-        $links['welcome'] = glsr(Builder::class)->a(__('About', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=welcome'),
-        ]);
-        return $links;
-    }
+	/**
+	 * @return array
+	 * @filter plugin_action_links_site-reviews/site-reviews.php
+	 */
+	public function filterActionLinks(array $links)
+	{
+		$links['welcome'] = glsr(Builder::class)->a(__('About', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=welcome'),
+		]);
+		return $links;
+	}
 
-    /**
-     * @return string
-     * @filter admin_title
-     */
-    public function filterAdminTitle($title)
-    {
-        return Application::POST_TYPE.'_page_welcome' == glsr_current_screen()->id
-            ? sprintf(__('Welcome to %s — WordPress', 'site-reviews'), glsr()->name)
-            : $title;
-    }
+	/**
+	 * @return string
+	 * @filter admin_title
+	 */
+	public function filterAdminTitle($title)
+	{
+		return Application::POST_TYPE.'_page_welcome' == glsr_current_screen()->id
+			? sprintf(__('Welcome to %s — WordPress', 'site-reviews'), glsr()->name)
+			: $title;
+	}
 
-    /**
-     * @param string $text
-     * @return string
-     * @filter admin_footer_text
-     */
-    public function filterFooterText($text)
-    {
-        if (Application::POST_TYPE.'_page_welcome' != glsr_current_screen()->id) {
-            return $text;
-        }
-        $url = 'https://wordpress.org/support/view/plugin-reviews/site-reviews?filter=5#new-post';
-        return wp_kses_post(sprintf(
-            __('Please rate %s on %s and help us spread the word. Thank you so much!', 'site-reviews'),
-            '<strong>'.glsr()->name.'</strong> <a href="'.$url.'" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>',
-            '<a href="'.$url.'" target="_blank">wordpress.org</a>'
-        ));
-    }
+	/**
+	 * @param string $text
+	 * @return string
+	 * @filter admin_footer_text
+	 */
+	public function filterFooterText($text)
+	{
+		if (Application::POST_TYPE.'_page_welcome' != glsr_current_screen()->id) {
+			return $text;
+		}
+		$url = 'https://wordpress.org/support/view/plugin-reviews/site-reviews?filter=5#new-post';
+		return wp_kses_post(sprintf(
+			__('Please rate %s on %s and help us spread the word. Thank you so much!', 'site-reviews'),
+			'<strong>'.glsr()->name.'</strong> <a href="'.$url.'" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>',
+			'<a href="'.$url.'" target="_blank">wordpress.org</a>'
+		));
+	}
 
-    /**
-     * @param string $plugin
-     * @param bool $isNetworkActivation
-     * @return void
-     * @action activated_plugin
-     */
-    public function redirectOnActivation($plugin, $isNetworkActivation)
-    {
-        if (!$isNetworkActivation
-            && 'cli' !== php_sapi_name()
-            && $plugin === plugin_basename(glsr()->file)) {
-            wp_safe_redirect(admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=welcome'));
-            exit;
-        }
-    }
+	/**
+	 * @param string $plugin
+	 * @param bool $isNetworkActivation
+	 * @return void
+	 * @action activated_plugin
+	 */
+	public function redirectOnActivation($plugin, $isNetworkActivation)
+	{
+		if (!$isNetworkActivation
+			&& 'cli' !== php_sapi_name()
+			&& $plugin === plugin_basename(glsr()->file)) {
+			wp_safe_redirect(admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=welcome'));
+			exit;
+		}
+	}
 
-    /**
-     * @return void
-     * @action admin_menu
-     */
-    public function registerPage()
-    {
-        add_submenu_page('edit.php?post_type='.Application::POST_TYPE,
-            sprintf(__('Welcome to %s', 'site-reviews'), glsr()->name),
-            glsr()->name,
-            glsr()->getPermission('welcome'),
-            'welcome',
-            [$this, 'renderPage']
-        );
-        remove_submenu_page('edit.php?post_type='.Application::POST_TYPE, 'welcome');
-    }
+	/**
+	 * @return void
+	 * @action admin_menu
+	 */
+	public function registerPage()
+	{
+		add_submenu_page('edit.php?post_type='.Application::POST_TYPE,
+			sprintf(__('Welcome to %s', 'site-reviews'), glsr()->name),
+			glsr()->name,
+			glsr()->getPermission('welcome'),
+			'welcome',
+			[$this, 'renderPage']
+		);
+		remove_submenu_page('edit.php?post_type='.Application::POST_TYPE, 'welcome');
+	}
 
-    /**
-     * @return void
-     * @see $this->registerPage()
-     * @callback add_submenu_page
-     */
-    public function renderPage()
-    {
-        $tabs = apply_filters('site-reviews/addon/welcome/tabs', [
-            'getting-started' => __('Getting Started', 'site-reviews'),
-            'whatsnew' => __('What\'s New', 'site-reviews'),
-            'upgrade-guide' => __('Upgrade Guide', 'site-reviews'),
-            'support' => __('Support', 'site-reviews'),
-        ]);
-        glsr()->render('pages/welcome/index', [
-            'data' => ['context' => []],
-            'http_referer' => (string) wp_get_referer(),
-            'tabs' => $tabs,
-            'template' => glsr(Template::class),
-        ]);
-    }
+	/**
+	 * @return void
+	 * @see $this->registerPage()
+	 * @callback add_submenu_page
+	 */
+	public function renderPage()
+	{
+		$tabs = apply_filters('site-reviews/addon/welcome/tabs', [
+			'getting-started' => __('Getting Started', 'site-reviews'),
+			'whatsnew' => __('What\'s New', 'site-reviews'),
+			'upgrade-guide' => __('Upgrade Guide', 'site-reviews'),
+			'support' => __('Support', 'site-reviews'),
+		]);
+		glsr()->render('pages/welcome/index', [
+			'data' => ['context' => []],
+			'http_referer' => (string) wp_get_referer(),
+			'tabs' => $tabs,
+			'template' => glsr(Template::class),
+		]);
+	}
 }

plugin/Defaults/SiteReviewsDefaults.php

Indentation +35 added lines, -35 removed lines

@@ -6,41 +6,41 @@
 
 class SiteReviewsDefaults extends Defaults
 {
-    /**
-     * @var array
-     */
-    protected $guarded = [
-        'fallback',
-        'title',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $guarded = [
+		'fallback',
+		'title',
+	];
 
-    /**
-     * @var array
-     */
-    protected $mapped = [
-        'count' => 'display', // @deprecated since v4.1.0
-        'per_page' => 'display',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $mapped = [
+		'count' => 'display', // @deprecated since v4.1.0
+		'per_page' => 'display',
+	];
 
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assigned_to' => '',
-            'category' => '',
-            'class' => '',
-            'display' => 5,
-            'fallback' => '',
-            'hide' => [],
-            'id' => '',
-            'offset' => '',
-            'pagination' => false,
-            'rating' => 0,
-            'schema' => false,
-            'title' => '',
-            'type' => 'local',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assigned_to' => '',
+			'category' => '',
+			'class' => '',
+			'display' => 5,
+			'fallback' => '',
+			'hide' => [],
+			'id' => '',
+			'offset' => '',
+			'pagination' => false,
+			'rating' => 0,
+			'schema' => false,
+			'title' => '',
+			'type' => 'local',
+		];
+	}
 }

plugin/Defaults/ReviewsDefaults.php

Indentation +26 added lines, -26 removed lines

@@ -6,31 +6,31 @@
 
 class ReviewsDefaults extends Defaults
 {
-    /**
-     * @var array
-     */
-    protected $mapped = [
-        'count' => 'per_page', // @deprecated since v4.1.0
-        'display' => 'per_page',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $mapped = [
+		'count' => 'per_page', // @deprecated since v4.1.0
+		'display' => 'per_page',
+	];
 
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assigned_to' => '',
-            'category' => '',
-            'offset' => '',
-            'order' => 'DESC',
-            'orderby' => 'date',
-            'pagination' => false,
-            'per_page' => 10,
-            'post__in' => [],
-            'post__not_in' => [],
-            'rating' => '',
-            'type' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assigned_to' => '',
+			'category' => '',
+			'offset' => '',
+			'order' => 'DESC',
+			'orderby' => 'date',
+			'pagination' => false,
+			'per_page' => 10,
+			'post__in' => [],
+			'post__not_in' => [],
+			'rating' => '',
+			'type' => '',
+		];
+	}
 }

plugin/Controllers/EditorController/Labels.php

Indentation +98 added lines, -98 removed lines

@@ -7,106 +7,106 @@
 
 class Labels
 {
-    /**
-     * @param string $translation
-     * @param string $test
-     * @return string
-     */
-    public function filterPostStatusLabels($translation, $text)
-    {
-        $replacements = $this->getStatusLabels();
-        return array_key_exists($text, $replacements)
-            ? $replacements[$text]
-            : $translation;
-    }
+	/**
+	 * @param string $translation
+	 * @param string $test
+	 * @return string
+	 */
+	public function filterPostStatusLabels($translation, $text)
+	{
+		$replacements = $this->getStatusLabels();
+		return array_key_exists($text, $replacements)
+			? $replacements[$text]
+			: $translation;
+	}
 
-    /**
-     * @return array
-     */
-    public function filterUpdateMessages(array $messages)
-    {
-        $post = get_post();
-        if (!($post instanceof WP_Post)) {
-            return;
-        }
-        $strings = $this->getReviewLabels();
-        $restored = filter_input(INPUT_GET, 'revision');
-        if ($revisionTitle = wp_post_revision_title(intval($restored), false)) {
-            $restored = sprintf($strings['restored'], $revisionTitle);
-        }
-        $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date));
-        $messages[Application::POST_TYPE] = [
-             1 => $strings['updated'],
-             4 => $strings['updated'],
-             5 => $restored,
-             6 => $strings['published'],
-             7 => $strings['saved'],
-             8 => $strings['submitted'],
-             9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'),
-            10 => $strings['draft_updated'],
-            50 => $strings['approved'],
-            51 => $strings['unapproved'],
-            52 => $strings['reverted'],
-        ];
-        return $messages;
-    }
+	/**
+	 * @return array
+	 */
+	public function filterUpdateMessages(array $messages)
+	{
+		$post = get_post();
+		if (!($post instanceof WP_Post)) {
+			return;
+		}
+		$strings = $this->getReviewLabels();
+		$restored = filter_input(INPUT_GET, 'revision');
+		if ($revisionTitle = wp_post_revision_title(intval($restored), false)) {
+			$restored = sprintf($strings['restored'], $revisionTitle);
+		}
+		$scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date));
+		$messages[Application::POST_TYPE] = [
+			 1 => $strings['updated'],
+			 4 => $strings['updated'],
+			 5 => $restored,
+			 6 => $strings['published'],
+			 7 => $strings['saved'],
+			 8 => $strings['submitted'],
+			 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'),
+			10 => $strings['draft_updated'],
+			50 => $strings['approved'],
+			51 => $strings['unapproved'],
+			52 => $strings['reverted'],
+		];
+		return $messages;
+	}
 
-    /**
-     * @return void
-     */
-    public function translatePostStatusLabels()
-    {
-        global $wp_scripts;
-        $strings = [
-            'savePending' => __('Save as Unapproved', 'site-reviews'),
-            'published' => __('Approved', 'site-reviews'),
-        ];
-        if (isset($wp_scripts->registered['post']->extra['data'])) {
-            $l10n = &$wp_scripts->registered['post']->extra['data'];
-            foreach ($strings as $search => $replace) {
-                $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n);
-            }
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function translatePostStatusLabels()
+	{
+		global $wp_scripts;
+		$strings = [
+			'savePending' => __('Save as Unapproved', 'site-reviews'),
+			'published' => __('Approved', 'site-reviews'),
+		];
+		if (isset($wp_scripts->registered['post']->extra['data'])) {
+			$l10n = &$wp_scripts->registered['post']->extra['data'];
+			foreach ($strings as $search => $replace) {
+				$l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n);
+			}
+		}
+	}
 
-    /**
-     * @return array
-     */
-    protected function getReviewLabels()
-    {
-        return [
-            'approved' => __('Review has been approved and published.', 'site-reviews'),
-            'draft_updated' => __('Review draft updated.', 'site-reviews'),
-            'preview' => __('Preview review', 'site-reviews'),
-            'published' => __('Review approved and published.', 'site-reviews'),
-            'restored' => __('Review restored to revision from %s.', 'site-reviews'),
-            'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'),
-            'saved' => __('Review saved.', 'site-reviews'),
-            'scheduled' => __('Review scheduled for: %s.', 'site-reviews'),
-            'submitted' => __('Review submitted.', 'site-reviews'),
-            'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'),
-            'updated' => __('Review updated.', 'site-reviews'),
-            'view' => __('View review', 'site-reviews'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getReviewLabels()
+	{
+		return [
+			'approved' => __('Review has been approved and published.', 'site-reviews'),
+			'draft_updated' => __('Review draft updated.', 'site-reviews'),
+			'preview' => __('Preview review', 'site-reviews'),
+			'published' => __('Review approved and published.', 'site-reviews'),
+			'restored' => __('Review restored to revision from %s.', 'site-reviews'),
+			'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'),
+			'saved' => __('Review saved.', 'site-reviews'),
+			'scheduled' => __('Review scheduled for: %s.', 'site-reviews'),
+			'submitted' => __('Review submitted.', 'site-reviews'),
+			'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'),
+			'updated' => __('Review updated.', 'site-reviews'),
+			'view' => __('View review', 'site-reviews'),
+		];
+	}
 
-    /**
-     * Store the labels to avoid unnecessary loops.
-     * @return array
-     */
-    protected function getStatusLabels()
-    {
-        static $labels;
-        if (empty($labels)) {
-            $labels = [
-                'Pending' => __('Unapproved', 'site-reviews'),
-                'Pending Review' => __('Unapproved', 'site-reviews'),
-                'Privately Published' => __('Privately Approved', 'site-reviews'),
-                'Publish' => __('Approve', 'site-reviews'),
-                'Published' => __('Approved', 'site-reviews'),
-                'Save as Pending' => __('Save as Unapproved', 'site-reviews'),
-            ];
-        }
-        return $labels;
-    }
+	/**
+	 * Store the labels to avoid unnecessary loops.
+	 * @return array
+	 */
+	protected function getStatusLabels()
+	{
+		static $labels;
+		if (empty($labels)) {
+			$labels = [
+				'Pending' => __('Unapproved', 'site-reviews'),
+				'Pending Review' => __('Unapproved', 'site-reviews'),
+				'Privately Published' => __('Privately Approved', 'site-reviews'),
+				'Publish' => __('Approve', 'site-reviews'),
+				'Published' => __('Approved', 'site-reviews'),
+				'Save as Pending' => __('Save as Unapproved', 'site-reviews'),
+			];
+		}
+		return $labels;
+	}
 }

plugin/Container.php

Indentation +222 added lines, -222 removed lines

@@ -11,226 +11,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(Str::snakeCase($property));
-        if (defined($constant)) {
-            return constant($constant);
-        }
-        return Arr::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 = Arr::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 (!Str::contains($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(Str::snakeCase($property));
+		if (defined($constant)) {
+			return constant($constant);
+		}
+		return Arr::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 = Arr::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 (!Str::contains($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;
+	}
 }

plugin/Modules/Translation.php

Indentation +250 added lines, -250 removed lines

@@ -11,272 +11,272 @@
 
 class Translation
 {
-    const SEARCH_THRESHOLD = 3;
+	const SEARCH_THRESHOLD = 3;
 
-    /**
-     * @var array
-     */
-    protected $entries;
+	/**
+	 * @var array
+	 */
+	protected $entries;
 
-    /**
-     * @var array
-     */
-    protected $results;
+	/**
+	 * @var array
+	 */
+	protected $results;
 
-    /**
-     * Returns all saved custom translations with translation context.
-     * @return array
-     */
-    public function all()
-    {
-        $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
-                : '';
-        });
-        return $translations;
-    }
+	/**
+	 * Returns all saved custom translations with translation context.
+	 * @return array
+	 */
+	public function all()
+	{
+		$translations = $this->translations();
+		$entries = $this->filter($translations, $this->entries())->results();
+		array_walk($translations, function (&$entry) use ($entries) {
+			$entry['desc'] = array_key_exists($entry['id'], $entries)
+				? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+				: '';
+		});
+		return $translations;
+	}
 
-    /**
-     * @return array
-     */
-    public function entries()
-    {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
-            $this->entries = $entries;
-        }
-        return $this->entries;
-    }
+	/**
+	 * @return array
+	 */
+	public function entries()
+	{
+		if (!isset($this->entries)) {
+			$potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
+			$entries = $this->extractEntriesFromPotFile($potFile);
+			$entries = apply_filters('site-reviews/translation/entries', $entries);
+			$this->entries = $entries;
+		}
+		return $this->entries;
+	}
 
-    /**
-     * @param array|null $entriesToExclude
-     * @param array|null $entries
-     * @return static
-     */
-    public function exclude($entriesToExclude = null, $entries = null)
-    {
-        return $this->filter($entriesToExclude, $entries, false);
-    }
+	/**
+	 * @param array|null $entriesToExclude
+	 * @param array|null $entries
+	 * @return static
+	 */
+	public function exclude($entriesToExclude = null, $entries = null)
+	{
+		return $this->filter($entriesToExclude, $entries, false);
+	}
 
-    /**
-     * @param string $potFile
-     * @return array
-     */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
-    {
-        try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
-            }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
-        }
-        return $entries;
-    }
+	/**
+	 * @param string $potFile
+	 * @return array
+	 */
+	public function extractEntriesFromPotFile($potFile, array $entries = [])
+	{
+		try {
+			$potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
+			foreach ($potEntries as $key => $entry) {
+				$entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+			}
+		} catch (Exception $e) {
+			glsr_log()->error($e->getMessage());
+		}
+		return $entries;
+	}
 
-    /**
-     * @param array|null $filterWith
-     * @param array|null $entries
-     * @param bool $intersect
-     * @return static
-     */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
-    {
-        if (!is_array($entries)) {
-            $entries = $this->results;
-        }
-        if (!is_array($filterWith)) {
-            $filterWith = $this->translations();
-        }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
-        $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
-        return $this;
-    }
+	/**
+	 * @param array|null $filterWith
+	 * @param array|null $entries
+	 * @param bool $intersect
+	 * @return static
+	 */
+	public function filter($filterWith = null, $entries = null, $intersect = true)
+	{
+		if (!is_array($entries)) {
+			$entries = $this->results;
+		}
+		if (!is_array($filterWith)) {
+			$filterWith = $this->translations();
+		}
+		$keys = array_flip(glsr_array_column($filterWith, 'id'));
+		$this->results = $intersect
+			? array_intersect_key($entries, $keys)
+			: array_diff_key($entries, $keys);
+		return $this;
+	}
 
-    /**
-     * @param string $template
-     * @return string
-     */
-    public function render($template, array $entry)
-    {
-        $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
-            $entry
-        );
-        $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
-            $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
-        }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
-            'context' => array_map('esc_html', $data),
-        ]);
-    }
+	/**
+	 * @param string $template
+	 * @return string
+	 */
+	public function render($template, array $entry)
+	{
+		$data = array_combine(
+			array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+			$entry
+		);
+		$data['data.class'] = $data['data.error'] = '';
+		if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+			$data['data.class'] = 'is-invalid';
+			$data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+		}
+		return glsr(Template::class)->build('partials/translations/'.$template, [
+			'context' => array_map('esc_html', $data),
+		]);
+	}
 
-    /**
-     * Returns a rendered string of all saved custom translations with translation context.
-     * @return string
-     */
-    public function renderAll()
-    {
-        $rendered = '';
-        foreach ($this->all() as $index => $entry) {
-            $entry['index'] = $index;
-            $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
-        }
-        return $rendered;
-    }
+	/**
+	 * Returns a rendered string of all saved custom translations with translation context.
+	 * @return string
+	 */
+	public function renderAll()
+	{
+		$rendered = '';
+		foreach ($this->all() as $index => $entry) {
+			$entry['index'] = $index;
+			$entry['prefix'] = OptionManager::databaseKey();
+			$rendered.= $this->render($entry['type'], $entry);
+		}
+		return $rendered;
+	}
 
-    /**
-     * @param bool $resetAfterRender
-     * @return string
-     */
-    public function renderResults($resetAfterRender = true)
-    {
-        $rendered = '';
-        foreach ($this->results as $id => $entry) {
-            $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
-                'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
-            ];
-            $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
-                : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
-        }
-        if ($resetAfterRender) {
-            $this->reset();
-        }
-        return $rendered;
-    }
+	/**
+	 * @param bool $resetAfterRender
+	 * @return string
+	 */
+	public function renderResults($resetAfterRender = true)
+	{
+		$rendered = '';
+		foreach ($this->results as $id => $entry) {
+			$data = [
+				'desc' => $this->getEntryString($entry, 'msgctxt'),
+				'id' => $id,
+				'p1' => $this->getEntryString($entry, 'msgid_plural'),
+				's1' => $this->getEntryString($entry, 'msgid'),
+			];
+			$text = !empty($data['p1'])
+				? sprintf('%s | %s', $data['s1'], $data['p1'])
+				: $data['s1'];
+			$rendered.= $this->render('result', [
+				'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+				'text' => wp_strip_all_tags($text),
+			]);
+		}
+		if ($resetAfterRender) {
+			$this->reset();
+		}
+		return $rendered;
+	}
 
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        $this->results = [];
-    }
+	/**
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->results = [];
+	}
 
-    /**
-     * @return array
-     */
-    public function results()
-    {
-        $results = $this->results;
-        $this->reset();
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public function results()
+	{
+		$results = $this->results;
+		$this->reset();
+		return $results;
+	}
 
-    /**
-     * @param string $needle
-     * @return static
-     */
-    public function search($needle = '')
-    {
-        $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
-                    $this->results[$key] = $entry;
-                }
-            } elseif (Str::contains(sprintf('%s %s', $single, $plural), $needle)) {
-                $this->results[$key] = $entry;
-            }
-        }
-        return $this;
-    }
+	/**
+	 * @param string $needle
+	 * @return static
+	 */
+	public function search($needle = '')
+	{
+		$this->reset();
+		$needle = trim(strtolower($needle));
+		foreach ($this->entries() as $key => $entry) {
+			$single = strtolower($this->getEntryString($entry, 'msgid'));
+			$plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
+			if (strlen($needle) < static::SEARCH_THRESHOLD) {
+				if (in_array($needle, [$single, $plural])) {
+					$this->results[$key] = $entry;
+				}
+			} elseif (Str::contains(sprintf('%s %s', $single, $plural), $needle)) {
+				$this->results[$key] = $entry;
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Store the translations to avoid unnecessary loops.
-     * @return array
-     */
-    public function translations()
-    {
-        static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
-            $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
-                : [];
-        }
-        return $translations;
-    }
+	/**
+	 * Store the translations to avoid unnecessary loops.
+	 * @return array
+	 */
+	public function translations()
+	{
+		static $translations;
+		if (empty($translations)) {
+			$settings = glsr(OptionManager::class)->get('settings');
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings((array) $settings['strings'])
+				: [];
+		}
+		return $translations;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getEntryString(array $entry, $key)
-    {
-        return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getEntryString(array $entry, $key)
+	{
+		return isset($entry[$key])
+			? implode('', (array) $entry[$key])
+			: '';
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $entries)
-    {
-        $keys = [
-            'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
-        ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
-                try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
-                }
-            }
-        });
-        return $entries;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $entries)
+	{
+		$keys = [
+			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
+		];
+		array_walk($entries, function (&$entry) use ($keys) {
+			foreach ($keys as $key) {
+				try {
+					$entry = $this->normalizeEntryString($entry, $key);
+				} catch (\TypeError $error) {
+					glsr_log()->once('error', 'Translation/normalize', $error);
+					glsr_log()->once('debug', 'Translation/normalize', $entry);
+				}
+			}
+		});
+		return $entries;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    protected function normalizeEntryString(array $entry, $key)
-    {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
-        }
-        return $entry;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	protected function normalizeEntryString(array $entry, $key)
+	{
+		if (isset($entry[$key])) {
+			$entry[$key] = $this->getEntryString($entry, $key);
+		}
+		return $entry;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeSettings(array $strings)
-    {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
-            $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
-        }
-        return array_filter($strings, function ($string) {
-            return !empty($string['id']);
-        });
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeSettings(array $strings)
+	{
+		$defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
+		$strings = array_filter($strings, 'is_array');
+		foreach ($strings as &$string) {
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
+			$string = wp_parse_args($string, $defaultString);
+		}
+		return array_filter($strings, function ($string) {
+			return !empty($string['id']);
+		});
+	}
 }

plugin/Modules/Validator.php

Indentation +274 added lines, -274 removed lines

@@ -12,302 +12,302 @@
  */
 class Validator
 {
-    use ValidationRules;
+	use ValidationRules;
 
-    /**
-     * @var array
-     */
-    public $errors = [];
+	/**
+	 * @var array
+	 */
+	public $errors = [];
 
-    /**
-     * The data under validation.
-     * @var array
-     */
-    protected $data = [];
+	/**
+	 * The data under validation.
+	 * @var array
+	 */
+	protected $data = [];
 
-    /**
-     * The failed validation rules.
-     * @var array
-     */
-    protected $failedRules = [];
+	/**
+	 * The failed validation rules.
+	 * @var array
+	 */
+	protected $failedRules = [];
 
-    /**
-     * The rules to be applied to the data.
-     * @var array
-     */
-    protected $rules = [];
+	/**
+	 * The rules to be applied to the data.
+	 * @var array
+	 */
+	protected $rules = [];
 
-    /**
-     * The size related validation rules.
-     * @var array
-     */
-    protected $sizeRules = [
-        'Between', 'Max', 'Min',
-    ];
+	/**
+	 * The size related validation rules.
+	 * @var array
+	 */
+	protected $sizeRules = [
+		'Between', 'Max', 'Min',
+	];
 
-    /**
-     * The validation rules that imply the field is required.
-     * @var array
-     */
-    protected $implicitRules = [
-        'Required',
-    ];
+	/**
+	 * The validation rules that imply the field is required.
+	 * @var array
+	 */
+	protected $implicitRules = [
+		'Required',
+	];
 
-    /**
-     * The numeric related validation rules.
-     * @var array
-     */
-    protected $numericRules = [
-        'Number',
-    ];
+	/**
+	 * The numeric related validation rules.
+	 * @var array
+	 */
+	protected $numericRules = [
+		'Number',
+	];
 
-    /**
-     * Run the validator's rules against its data.
-     * @param mixed $data
-     * @return array
-     */
-    public function validate($data, array $rules = [])
-    {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($attribute, $rule);
-                if ($this->shouldStopValidating($attribute)) {
-                    break;
-                }
-            }
-        }
-        return $this->errors;
-    }
+	/**
+	 * Run the validator's rules against its data.
+	 * @param mixed $data
+	 * @return array
+	 */
+	public function validate($data, array $rules = [])
+	{
+		$this->normalizeData($data);
+		$this->setRules($rules);
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($attribute, $rule);
+				if ($this->shouldStopValidating($attribute)) {
+					break;
+				}
+			}
+		}
+		return $this->errors;
+	}
 
-    /**
-     * Validate a given attribute against a rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     * @throws BadMethodCallException
-     */
-    public function validateAttribute($attribute, $rule)
-    {
-        list($rule, $parameters) = $this->parseRule($rule);
-        if ('' == $rule) {
-            return;
-        }
-        $value = $this->getValue($attribute);
-        if (!method_exists($this, $method = 'validate'.$rule)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
-        }
-        if (!$this->$method($value, $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
-        }
-    }
+	/**
+	 * Validate a given attribute against a rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 * @throws BadMethodCallException
+	 */
+	public function validateAttribute($attribute, $rule)
+	{
+		list($rule, $parameters) = $this->parseRule($rule);
+		if ('' == $rule) {
+			return;
+		}
+		$value = $this->getValue($attribute);
+		if (!method_exists($this, $method = 'validate'.$rule)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
+		}
+		if (!$this->$method($value, $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
+		}
+	}
 
-    /**
-     * Add an error message to the validator's collection of errors.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addError($attribute, $rule, array $parameters)
-    {
-        $message = $this->getMessage($attribute, $rule, $parameters);
-        $this->errors[$attribute][] = $message;
-    }
+	/**
+	 * Add an error message to the validator's collection of errors.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addError($attribute, $rule, array $parameters)
+	{
+		$message = $this->getMessage($attribute, $rule, $parameters);
+		$this->errors[$attribute][] = $message;
+	}
 
-    /**
-     * Add a failed rule and error message to the collection.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addFailure($attribute, $rule, array $parameters)
-    {
-        $this->addError($attribute, $rule, $parameters);
-        $this->failedRules[$attribute][$rule] = $parameters;
-    }
+	/**
+	 * Add a failed rule and error message to the collection.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addFailure($attribute, $rule, array $parameters)
+	{
+		$this->addError($attribute, $rule, $parameters);
+		$this->failedRules[$attribute][$rule] = $parameters;
+	}
 
-    /**
-     * Get the data type of the given attribute.
-     * @param string $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        return !$this->hasRule($attribute, $this->numericRules)
-            ? 'length'
-            : '';
-    }
+	/**
+	 * Get the data type of the given attribute.
+	 * @param string $attribute
+	 * @return string
+	 */
+	protected function getAttributeType($attribute)
+	{
+		return !$this->hasRule($attribute, $this->numericRules)
+			? 'length'
+			: '';
+	}
 
-    /**
-     * Get the validation message for an attribute and rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getMessage($attribute, $rule, array $parameters)
-    {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
-        }
-        $lowerRule = Str::snakeCase($rule);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the validation message for an attribute and rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getMessage($attribute, $rule, array $parameters)
+	{
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
+		}
+		$lowerRule = Str::snakeCase($rule);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get a rule and its parameters for a given attribute.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return array|null
-     */
-    protected function getRule($attribute, $rules)
-    {
-        if (!array_key_exists($attribute, $this->rules)) {
-            return;
-        }
-        $rules = (array) $rules;
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-            if (in_array($rule, $rules)) {
-                return [$rule, $parameters];
-            }
-        }
-    }
+	/**
+	 * Get a rule and its parameters for a given attribute.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return array|null
+	 */
+	protected function getRule($attribute, $rules)
+	{
+		if (!array_key_exists($attribute, $this->rules)) {
+			return;
+		}
+		$rules = (array) $rules;
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
+			}
+		}
+	}
 
-    /**
-     * Get the size of an attribute.
-     * @param string $attribute
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        }
-        return function_exists('mb_strlen')
-            ? mb_strlen($value)
-            : strlen($value);
-    }
+	/**
+	 * Get the size of an attribute.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	protected function getSize($attribute, $value)
+	{
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
+		if (is_numeric($value) && $hasNumeric) {
+			return $value;
+		} elseif (is_array($value)) {
+			return count($value);
+		}
+		return function_exists('mb_strlen')
+			? mb_strlen($value)
+			: strlen($value);
+	}
 
-    /**
-     * Get the proper error message for an attribute and size rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
-    {
-        $type = $this->getAttributeType($attribute);
-        $lowerRule = Str::snakeCase($rule.$type);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the proper error message for an attribute and size rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getSizeMessage($attribute, $rule, array $parameters)
+	{
+		$type = $this->getAttributeType($attribute);
+		$lowerRule = Str::snakeCase($rule.$type);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get the value of a given attribute.
-     * @param string $attribute
-     * @return mixed
-     */
-    protected function getValue($attribute)
-    {
-        if (isset($this->data[$attribute])) {
-            return $this->data[$attribute];
-        }
-    }
+	/**
+	 * Get the value of a given attribute.
+	 * @param string $attribute
+	 * @return mixed
+	 */
+	protected function getValue($attribute)
+	{
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
+		}
+	}
 
-    /**
-     * Determine if the given attribute has a rule in the given set.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return bool
-     */
-    protected function hasRule($attribute, $rules)
-    {
-        return !is_null($this->getRule($attribute, $rules));
-    }
+	/**
+	 * Determine if the given attribute has a rule in the given set.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return bool
+	 */
+	protected function hasRule($attribute, $rules)
+	{
+		return !is_null($this->getRule($attribute, $rules));
+	}
 
-    /**
-     * Normalize the provided data to an array.
-     * @param mixed $data
-     * @return void
-     */
-    protected function normalizeData($data)
-    {
-        $this->data = is_object($data)
-            ? get_object_vars($data)
-            : $data;
-    }
+	/**
+	 * Normalize the provided data to an array.
+	 * @param mixed $data
+	 * @return void
+	 */
+	protected function normalizeData($data)
+	{
+		$this->data = is_object($data)
+			? get_object_vars($data)
+			: $data;
+	}
 
-    /**
-     * Parse a parameter list.
-     * @param string $rule
-     * @param string $parameter
-     * @return array
-     */
-    protected function parseParameters($rule, $parameter)
-    {
-        return 'regex' == strtolower($rule)
-            ? [$parameter]
-            : str_getcsv($parameter);
-    }
+	/**
+	 * Parse a parameter list.
+	 * @param string $rule
+	 * @param string $parameter
+	 * @return array
+	 */
+	protected function parseParameters($rule, $parameter)
+	{
+		return 'regex' == strtolower($rule)
+			? [$parameter]
+			: str_getcsv($parameter);
+	}
 
-    /**
-     * Extract the rule name and parameters from a rule.
-     * @param string $rule
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        $parameters = [];
-        if (Str::contains($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-            $parameters = $this->parseParameters($rule, $parameter);
-        }
-        $rule = Str::camelCase($rule);
-        return [$rule, $parameters];
-    }
+	/**
+	 * Extract the rule name and parameters from a rule.
+	 * @param string $rule
+	 * @return array
+	 */
+	protected function parseRule($rule)
+	{
+		$parameters = [];
+		if (Str::contains($rule, ':')) {
+			list($rule, $parameter) = explode(':', $rule, 2);
+			$parameters = $this->parseParameters($rule, $parameter);
+		}
+		$rule = Str::camelCase($rule);
+		return [$rule, $parameters];
+	}
 
-    /**
-     * Set the validation rules.
-     * @return void
-     */
-    protected function setRules(array $rules)
-    {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule)
-                ? explode('|', $rule)
-                : $rule;
-        }
-        $this->rules = $rules;
-    }
+	/**
+	 * Set the validation rules.
+	 * @return void
+	 */
+	protected function setRules(array $rules)
+	{
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule)
+				? explode('|', $rule)
+				: $rule;
+		}
+		$this->rules = $rules;
+	}
 
-    /**
-     * Check if we should stop further validations on a given attribute.
-     * @param string $attribute
-     * @return bool
-     */
-    protected function shouldStopValidating($attribute)
-    {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
-    }
+	/**
+	 * Check if we should stop further validations on a given attribute.
+	 * @param string $attribute
+	 * @return bool
+	 */
+	protected function shouldStopValidating($attribute)
+	{
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+	}
 
-    /**
-     * Returns a translated message for the attribute.
-     * @param string $key
-     * @param string $attribute
-     * @return void|string
-     */
-    protected function translator($key, array $parameters)
-    {
-        $strings = glsr(ValidationStringsDefaults::class)->defaults();
-        if (isset($strings[$key])) {
-            return $this->replace($strings[$key], $parameters);
-        }
-        return 'error';
-    }
+	/**
+	 * Returns a translated message for the attribute.
+	 * @param string $key
+	 * @param string $attribute
+	 * @return void|string
+	 */
+	protected function translator($key, array $parameters)
+	{
+		$strings = glsr(ValidationStringsDefaults::class)->defaults();
+		if (isset($strings[$key])) {
+			return $this->replace($strings[$key], $parameters);
+		}
+		return 'error';
+	}
 }

plugin/Modules/Translator.php

Indentation +88 added lines, -88 removed lines

@@ -6,97 +6,97 @@
 
 class Translator
 {
-    /**
-     * @param string $original
-     * @param string $domain
-     * @return string
-     */
-    public function translate($original, $domain, array $args)
-    {
-        $domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
-        if (!in_array($domain, $domains)) {
-            return $original;
-        }
-        $args = $this->normalizeTranslationArgs($args);
-        $strings = $this->getTranslationStrings($args['single'], $args['plural']);
-        if (empty($strings)) {
-            return $original;
-        }
-        $string = current($strings);
-        return 'plural' == $string['type']
-            ? $this->translatePlural($domain, $string, $args)
-            : $this->translateSingle($domain, $string, $args);
-    }
+	/**
+	 * @param string $original
+	 * @param string $domain
+	 * @return string
+	 */
+	public function translate($original, $domain, array $args)
+	{
+		$domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
+		if (!in_array($domain, $domains)) {
+			return $original;
+		}
+		$args = $this->normalizeTranslationArgs($args);
+		$strings = $this->getTranslationStrings($args['single'], $args['plural']);
+		if (empty($strings)) {
+			return $original;
+		}
+		$string = current($strings);
+		return 'plural' == $string['type']
+			? $this->translatePlural($domain, $string, $args)
+			: $this->translateSingle($domain, $string, $args);
+	}
 
-    /**
-     * Used when search/replacing a default text-domain translation
-     * @return string
-     */
-    public function getTranslation(array $args)
-    {
-        $args = $this->normalizeTranslationArgs($args);
-        return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']);
-    }
+	/**
+	 * Used when search/replacing a default text-domain translation
+	 * @return string
+	 */
+	public function getTranslation(array $args)
+	{
+		$args = $this->normalizeTranslationArgs($args);
+		return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']);
+	}
 
-    /**
-     * @param string $single
-     * @param string $plural
-     * @return array
-     */
-    protected function getTranslationStrings($single, $plural)
-    {
-        return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
-            return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
-                && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
-        });
-    }
+	/**
+	 * @param string $single
+	 * @param string $plural
+	 * @return array
+	 */
+	protected function getTranslationStrings($single, $plural)
+	{
+		return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
+			return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
+				&& $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
+		});
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeTranslationArgs(array $args)
-    {
-        $defaults = [
-            'context' => '',
-            'number' => 1,
-            'plural' => '',
-            'single' => '',
-        ];
-        return shortcode_atts($defaults, $args);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeTranslationArgs(array $args)
+	{
+		$defaults = [
+			'context' => '',
+			'number' => 1,
+			'plural' => '',
+			'single' => '',
+		];
+		return shortcode_atts($defaults, $args);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translatePlural($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        if (!empty($string['p2'])) {
-            $args['plural'] = $string['p2'];
-        }
-        return get_translations_for_domain($domain)->translate_plural(
-            $args['single'],
-            $args['plural'],
-            $args['number'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translatePlural($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		if (!empty($string['p2'])) {
+			$args['plural'] = $string['p2'];
+		}
+		return get_translations_for_domain($domain)->translate_plural(
+			$args['single'],
+			$args['plural'],
+			$args['number'],
+			$args['context']
+		);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translateSingle($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        return get_translations_for_domain($domain)->translate(
-            $args['single'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translateSingle($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		return get_translations_for_domain($domain)->translate(
+			$args['single'],
+			$args['context']
+		);
+	}
 }

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;
+	}
 }