pryley / site-reviews

plugin/HelperTraits/Arr.php

Indentation +173 added lines, -173 removed lines

@@ -4,188 +4,188 @@
 
 trait Arr
 {
-    /**
-     * @return bool
-     */
-    public function compareArrays(array $arr1, array $arr2)
-    {
-        sort($arr1);
-        sort($arr2);
-        return $arr1 == $arr2;
-    }
+	/**
+	 * @return bool
+	 */
+	public function compareArrays(array $arr1, array $arr2)
+	{
+		sort($arr1);
+		sort($arr2);
+		return $arr1 == $arr2;
+	}
 
-    /**
-     * @param mixed $array
-     * @return array
-     */
-    public function consolidateArray($array)
-    {
-        return is_array($array) || is_object($array)
-            ? (array) $array
-            : [];
-    }
+	/**
+	 * @param mixed $array
+	 * @return array
+	 */
+	public function consolidateArray($array)
+	{
+		return is_array($array) || is_object($array)
+			? (array) $array
+			: [];
+	}
 
-    /**
-     * @return array
-     */
-    public function convertDotNotationArray(array $array)
-    {
-        $results = [];
-        foreach ($array as $path => $value) {
-            $results = $this->dataSet($results, $path, $value);
-        }
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public function convertDotNotationArray(array $array)
+	{
+		$results = [];
+		foreach ($array as $path => $value) {
+			$results = $this->dataSet($results, $path, $value);
+		}
+		return $results;
+	}
 
-    /**
-     * @param string $string
-     * @param mixed $callback
-     * @return array
-     */
-    public function convertStringToArray($string, $callback = null)
-    {
-        $array = array_map('trim', explode(',', $string));
-        return $callback
-            ? array_filter($array, $callback)
-            : array_filter($array);
-    }
+	/**
+	 * @param string $string
+	 * @param mixed $callback
+	 * @return array
+	 */
+	public function convertStringToArray($string, $callback = null)
+	{
+		$array = array_map('trim', explode(',', $string));
+		return $callback
+			? array_filter($array, $callback)
+			: array_filter($array);
+	}
 
-    /**
-     * Get a value from an array of values using a dot-notation path as reference.
-     * @param array $data
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    public function dataGet($data, $path = '', $fallback = '')
-    {
-        $data = $this->consolidateArray($data);
-        $keys = explode('.', $path);
-        foreach ($keys as $key) {
-            if (!isset($data[$key])) {
-                return $fallback;
-            }
-            $data = $data[$key];
-        }
-        return $data;
-    }
+	/**
+	 * Get a value from an array of values using a dot-notation path as reference.
+	 * @param array $data
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	public function dataGet($data, $path = '', $fallback = '')
+	{
+		$data = $this->consolidateArray($data);
+		$keys = explode('.', $path);
+		foreach ($keys as $key) {
+			if (!isset($data[$key])) {
+				return $fallback;
+			}
+			$data = $data[$key];
+		}
+		return $data;
+	}
 
-    /**
-     * Set a value to an array of values using a dot-notation path as reference.
-     * @param string $path
-     * @param mixed $value
-     * @return array
-     */
-    public function dataSet(array $data, $path, $value)
-    {
-        $token = strtok($path, '.');
-        $ref = &$data;
-        while (false !== $token) {
-            $ref = $this->consolidateArray($ref);
-            $ref = &$ref[$token];
-            $token = strtok('.');
-        }
-        $ref = $value;
-        return $data;
-    }
+	/**
+	 * Set a value to an array of values using a dot-notation path as reference.
+	 * @param string $path
+	 * @param mixed $value
+	 * @return array
+	 */
+	public function dataSet(array $data, $path, $value)
+	{
+		$token = strtok($path, '.');
+		$ref = &$data;
+		while (false !== $token) {
+			$ref = $this->consolidateArray($ref);
+			$ref = &$ref[$token];
+			$token = strtok('.');
+		}
+		$ref = $value;
+		return $data;
+	}
 
-    /**
-     * @param bool $flattenValue
-     * @param string $prefix
-     * @return array
-     */
-    public function flattenArray(array $array, $flattenValue = false, $prefix = '')
-    {
-        $result = [];
-        foreach ($array as $key => $value) {
-            $newKey = ltrim($prefix.'.'.$key, '.');
-            if ($this->isIndexedFlatArray($value)) {
-                if ($flattenValue) {
-                    $value = '['.implode(', ', $value).']';
-                }
-            } elseif (is_array($value)) {
-                $result = array_merge($result, $this->flattenArray($value, $flattenValue, $newKey));
-                continue;
-            }
-            $result[$newKey] = $value;
-        }
-        return $result;
-    }
+	/**
+	 * @param bool $flattenValue
+	 * @param string $prefix
+	 * @return array
+	 */
+	public function flattenArray(array $array, $flattenValue = false, $prefix = '')
+	{
+		$result = [];
+		foreach ($array as $key => $value) {
+			$newKey = ltrim($prefix.'.'.$key, '.');
+			if ($this->isIndexedFlatArray($value)) {
+				if ($flattenValue) {
+					$value = '['.implode(', ', $value).']';
+				}
+			} elseif (is_array($value)) {
+				$result = array_merge($result, $this->flattenArray($value, $flattenValue, $newKey));
+				continue;
+			}
+			$result[$newKey] = $value;
+		}
+		return $result;
+	}
 
-    /**
-     * @param string $key
-     * @param string $position
-     * @return array
-     */
-    public function insertInArray(array $array, array $insert, $key, $position = 'before')
-    {
-        $keyPosition = intval(array_search($key, array_keys($array)));
-        if ('after' == $position) {
-            ++$keyPosition;
-        }
-        if (false !== $keyPosition) {
-            $result = array_slice($array, 0, $keyPosition);
-            $result = array_merge($result, $insert);
-            return array_merge($result, array_slice($array, $keyPosition));
-        }
-        return array_merge($array, $insert);
-    }
+	/**
+	 * @param string $key
+	 * @param string $position
+	 * @return array
+	 */
+	public function insertInArray(array $array, array $insert, $key, $position = 'before')
+	{
+		$keyPosition = intval(array_search($key, array_keys($array)));
+		if ('after' == $position) {
+			++$keyPosition;
+		}
+		if (false !== $keyPosition) {
+			$result = array_slice($array, 0, $keyPosition);
+			$result = array_merge($result, $insert);
+			return array_merge($result, array_slice($array, $keyPosition));
+		}
+		return array_merge($array, $insert);
+	}
 
-    /**
-     * @param mixed $array
-     * @return bool
-     */
-    public function isIndexedFlatArray($array)
-    {
-        if (!is_array($array) || array_filter($array, 'is_array')) {
-            return false;
-        }
-        return wp_is_numeric_array($array);
-    }
+	/**
+	 * @param mixed $array
+	 * @return bool
+	 */
+	public function isIndexedFlatArray($array)
+	{
+		if (!is_array($array) || array_filter($array, 'is_array')) {
+			return false;
+		}
+		return wp_is_numeric_array($array);
+	}
 
-    /**
-     * @param bool $prefixed
-     * @return array
-     */
-    public function prefixArrayKeys(array $values, $prefixed = true)
-    {
-        $trim = '_';
-        $prefix = $prefixed
-            ? $trim
-            : '';
-        $prefixed = [];
-        foreach ($values as $key => $value) {
-            $key = trim($key);
-            if (0 === strpos($key, $trim)) {
-                $key = substr($key, strlen($trim));
-            }
-            $prefixed[$prefix.$key] = $value;
-        }
-        return $prefixed;
-    }
+	/**
+	 * @param bool $prefixed
+	 * @return array
+	 */
+	public function prefixArrayKeys(array $values, $prefixed = true)
+	{
+		$trim = '_';
+		$prefix = $prefixed
+			? $trim
+			: '';
+		$prefixed = [];
+		foreach ($values as $key => $value) {
+			$key = trim($key);
+			if (0 === strpos($key, $trim)) {
+				$key = substr($key, strlen($trim));
+			}
+			$prefixed[$prefix.$key] = $value;
+		}
+		return $prefixed;
+	}
 
-    /**
-     * @return array
-     */
-    public function removeEmptyArrayValues(array $array)
-    {
-        $result = [];
-        foreach ($array as $key => $value) {
-            if (!$value) {
-                continue;
-            }
-            $result[$key] = is_array($value)
-                ? $this->removeEmptyArrayValues($value)
-                : $value;
-        }
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public function removeEmptyArrayValues(array $array)
+	{
+		$result = [];
+		foreach ($array as $key => $value) {
+			if (!$value) {
+				continue;
+			}
+			$result[$key] = is_array($value)
+				? $this->removeEmptyArrayValues($value)
+				: $value;
+		}
+		return $result;
+	}
 
-    /**
-     * @return array
-     */
-    public function unprefixArrayKeys(array $values)
-    {
-        return $this->prefixArrayKeys($values, false);
-    }
+	/**
+	 * @return array
+	 */
+	public function unprefixArrayKeys(array $values)
+	{
+		return $this->prefixArrayKeys($values, false);
+	}
 }

plugin/HelperTraits/Str.php

Indentation +96 added lines, -96 removed lines

@@ -4,108 +4,108 @@
 
 trait Str
 {
-    /**
-     * @param string $string
-     * @return string
-     */
-    public function camelCase($string)
-    {
-        $string = ucwords(str_replace(['-', '_'], ' ', trim($string)));
-        return str_replace(' ', '', $string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public function camelCase($string)
+	{
+		$string = ucwords(str_replace(['-', '_'], ' ', trim($string)));
+		return str_replace(' ', '', $string);
+	}
 
-    /**
-     * @param string $name
-     * @return string
-     */
-    public function convertPathToId($path, $prefix = '')
-    {
-        return str_replace(['[', ']'], ['-', ''], $this->convertPathToName($path, $prefix));
-    }
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public function convertPathToId($path, $prefix = '')
+	{
+		return str_replace(['[', ']'], ['-', ''], $this->convertPathToName($path, $prefix));
+	}
 
-    /**
-     * @param string $path
-     * @return string
-     */
-    public function convertPathToName($path, $prefix = '')
-    {
-        $levels = explode('.', $path);
-        return array_reduce($levels, function ($result, $value) {
-            return $result .= '['.$value.']';
-        }, $prefix);
-    }
+	/**
+	 * @param string $path
+	 * @return string
+	 */
+	public function convertPathToName($path, $prefix = '')
+	{
+		$levels = explode('.', $path);
+		return array_reduce($levels, function ($result, $value) {
+			return $result .= '['.$value.']';
+		}, $prefix);
+	}
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    public function dashCase($string)
-    {
-        return str_replace('_', '-', $this->snakeCase($string));
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public function dashCase($string)
+	{
+		return str_replace('_', '-', $this->snakeCase($string));
+	}
 
-    /**
-     * @param string $needle
-     * @param string $haystack
-     * @return bool
-     */
-    public function endsWith($needle, $haystack)
-    {
-        $length = strlen($needle);
-        return 0 != $length
-            ? substr($haystack, -$length) === $needle
-            : true;
-    }
+	/**
+	 * @param string $needle
+	 * @param string $haystack
+	 * @return bool
+	 */
+	public function endsWith($needle, $haystack)
+	{
+		$length = strlen($needle);
+		return 0 != $length
+			? substr($haystack, -$length) === $needle
+			: true;
+	}
 
-    /**
-     * @param string $prefix
-     * @param string $string
-     * @param string|null $trim
-     * @return string
-     */
-    public function prefix($prefix, $string, $trim = null)
-    {
-        if (null === $trim) {
-            $trim = $prefix;
-        }
-        return $prefix.trim($this->removePrefix($trim, $string));
-    }
+	/**
+	 * @param string $prefix
+	 * @param string $string
+	 * @param string|null $trim
+	 * @return string
+	 */
+	public function prefix($prefix, $string, $trim = null)
+	{
+		if (null === $trim) {
+			$trim = $prefix;
+		}
+		return $prefix.trim($this->removePrefix($trim, $string));
+	}
 
-    /**
-     * @param string $prefix
-     * @param string $string
-     * @return string
-     */
-    public function removePrefix($prefix, $string)
-    {
-        return $this->startsWith($prefix, $string)
-            ? substr($string, strlen($prefix))
-            : $string;
-    }
+	/**
+	 * @param string $prefix
+	 * @param string $string
+	 * @return string
+	 */
+	public function removePrefix($prefix, $string)
+	{
+		return $this->startsWith($prefix, $string)
+			? substr($string, strlen($prefix))
+			: $string;
+	}
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    public function snakeCase($string)
-    {
-        if (!ctype_lower($string)) {
-            $string = preg_replace('/\s+/u', '', $string);
-            $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
-            $string = function_exists('mb_strtolower')
-                ? mb_strtolower($string, 'UTF-8')
-                : strtolower($string);
-        }
-        return str_replace('-', '_', $string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public function snakeCase($string)
+	{
+		if (!ctype_lower($string)) {
+			$string = preg_replace('/\s+/u', '', $string);
+			$string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
+			$string = function_exists('mb_strtolower')
+				? mb_strtolower($string, 'UTF-8')
+				: strtolower($string);
+		}
+		return str_replace('-', '_', $string);
+	}
 
-    /**
-     * @param string $needle
-     * @param string $haystack
-     * @return bool
-     */
-    public function startsWith($needle, $haystack)
-    {
-        return substr($haystack, 0, strlen($needle)) === $needle;
-    }
+	/**
+	 * @param string $needle
+	 * @param string $haystack
+	 * @return bool
+	 */
+	public function startsWith($needle, $haystack)
+	{
+		return substr($haystack, 0, strlen($needle)) === $needle;
+	}
 }

helpers.php

Indentation +74 added lines, -74 removed lines

@@ -9,25 +9,25 @@ 
  * @return mixed
  */
 add_filter('plugins_loaded', function () {
-    $hooks = array(
-        'glsr_calculate_ratings' => 1,
-        'glsr_create_review' => 2,
-        'glsr_debug' => 10,
-        'glsr_get' => 4,
-        'glsr_get_option' => 4,
-        'glsr_get_options' => 1,
-        'glsr_get_review' => 2,
-        'glsr_get_reviews' => 2,
-        'glsr_log' => 3,
-        'glsr_star_rating' => 2,
-    );
-    foreach ($hooks as $function => $acceptedArgs) {
-        add_filter($function, function () use ($function) {
-            $args = func_get_args();
-            array_shift($args); // remove the fallback value
-            return call_user_func_array($function, $args);
-        }, 10, $acceptedArgs);
-    }
+	$hooks = array(
+		'glsr_calculate_ratings' => 1,
+		'glsr_create_review' => 2,
+		'glsr_debug' => 10,
+		'glsr_get' => 4,
+		'glsr_get_option' => 4,
+		'glsr_get_options' => 1,
+		'glsr_get_review' => 2,
+		'glsr_get_reviews' => 2,
+		'glsr_log' => 3,
+		'glsr_star_rating' => 2,
+	);
+	foreach ($hooks as $function => $acceptedArgs) {
+		add_filter($function, function () use ($function) {
+			$args = func_get_args();
+			array_shift($args); // remove the fallback value
+			return call_user_func_array($function, $args);
+		}, 10, $acceptedArgs);
+	}
 });
 
 /**
@@ -35,10 +35,10 @@ 
  */
 function glsr($alias = null)
 {
-    $app = \GeminiLabs\SiteReviews\Application::load();
-    return !empty($alias)
-        ? $app->make($alias)
-        : $app;
+	$app = \GeminiLabs\SiteReviews\Application::load();
+	return !empty($alias)
+		? $app->make($alias)
+		: $app;
 }
 
 /**
@@ -48,15 +48,15 @@ 
  */
 function glsr_array_column(array $array, $column)
 {
-    $result = array();
-    foreach ($array as $subarray) {
-        $subarray = (array) $subarray;
-        if (!isset($subarray[$column])) {
-            continue;
-        }
-        $result[] = $subarray[$column];
-    }
-    return $result;
+	$result = array();
+	foreach ($array as $subarray) {
+		$subarray = (array) $subarray;
+		if (!isset($subarray[$column])) {
+			continue;
+		}
+		$result[] = $subarray[$column];
+	}
+	return $result;
 }
 
 /**
@@ -64,8 +64,8 @@ 
  */
 function glsr_calculate_ratings()
 {
-    glsr('Controllers\AdminController')->routerCountReviews(false);
-    glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews'));
+	glsr('Controllers\AdminController')->routerCountReviews(false);
+	glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews'));
 }
 
 /**
@@ -73,10 +73,10 @@ 
  */
 function glsr_create_review($reviewValues = array())
 {
-    $review = new \GeminiLabs\SiteReviews\Commands\CreateReview(
-        glsr('Helper')->consolidateArray($reviewValues)
-    );
-    return glsr('Database\ReviewManager')->create($review);
+	$review = new \GeminiLabs\SiteReviews\Commands\CreateReview(
+		glsr('Helper')->consolidateArray($reviewValues)
+	);
+	return glsr('Database\ReviewManager')->create($review);
 }
 
 /**
@@ -84,12 +84,12 @@ 
  */
 function glsr_current_screen()
 {
-    if (function_exists('get_current_screen')) {
-        $screen = get_current_screen();
-    }
-    return empty($screen)
-        ? (object) array_fill_keys(['base', 'id', 'post_type'], null)
-        : $screen;
+	if (function_exists('get_current_screen')) {
+		$screen = get_current_screen();
+	}
+	return empty($screen)
+		? (object) array_fill_keys(['base', 'id', 'post_type'], null)
+		: $screen;
 }
 
 /**
@@ -98,16 +98,16 @@ 
  */
 function glsr_debug(...$vars)
 {
-    if (1 == count($vars)) {
-        $value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8');
-        printf('<div class="glsr-debug"><pre>%s</pre></div>', $value);
-    } else {
-        echo '<div class="glsr-debug-group">';
-        foreach ($vars as $var) {
-            glsr_debug($var);
-        }
-        echo '</div>';
-    }
+	if (1 == count($vars)) {
+		$value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8');
+		printf('<div class="glsr-debug"><pre>%s</pre></div>', $value);
+	} else {
+		echo '<div class="glsr-debug-group">';
+		foreach ($vars as $var) {
+			glsr_debug($var);
+		}
+		echo '</div>';
+	}
 }
 
 /**
@@ -118,7 +118,7 @@ 
  */
 function glsr_get($array, $path = '', $fallback = '')
 {
-    return glsr('Helper')->dataGet($array, $path, $fallback);
+	return glsr('Helper')->dataGet($array, $path, $fallback);
 }
 
 /**
@@ -129,9 +129,9 @@ 
  */
 function glsr_get_option($path = '', $fallback = '', $cast = '')
 {
-    return is_string($path)
-        ? glsr('Database\OptionManager')->get('settings.'.$path, $fallback, $cast)
-        : $fallback;
+	return is_string($path)
+		? glsr('Database\OptionManager')->get('settings.'.$path, $fallback, $cast)
+		: $fallback;
 }
 
 /**
@@ -139,7 +139,7 @@ 
  */
 function glsr_get_options()
 {
-    return glsr('Database\OptionManager')->get('settings');
+	return glsr('Database\OptionManager')->get('settings');
 }
 
 /**
@@ -148,13 +148,13 @@ 
  */
 function glsr_get_review($post)
 {
-    if (is_numeric($post)) {
-        $post = get_post($post);
-    }
-    if (!($post instanceof WP_Post)) {
-        $post = new WP_Post((object) []);
-    }
-    return glsr('Database\ReviewManager')->single($post);
+	if (is_numeric($post)) {
+		$post = get_post($post);
+	}
+	if (!($post instanceof WP_Post)) {
+		$post = new WP_Post((object) []);
+	}
+	return glsr('Database\ReviewManager')->single($post);
 }
 
 /**
@@ -162,7 +162,7 @@ 
  */
 function glsr_get_reviews($args = array())
 {
-    return glsr('Database\ReviewManager')->get(glsr('Helper')->consolidateArray($args));
+	return glsr('Database\ReviewManager')->get(glsr('Helper')->consolidateArray($args));
 }
 
 /**
@@ -170,12 +170,12 @@ 
  */
 function glsr_log()
 {
-    $args = func_get_args();
-    $console = glsr('Modules\Console');
-    if ($value = glsr_get($args, '0')) {
-        return $console->debug($value, glsr_get($args, '1', []));
-    }
-    return $console;
+	$args = func_get_args();
+	$console = glsr('Modules\Console');
+	if ($value = glsr_get($args, '0')) {
+		return $console->debug($value, glsr_get($args, '1', []));
+	}
+	return $console;
 }
 
 /**
@@ -183,5 +183,5 @@ 
  */
 function glsr_star_rating($rating)
 {
-    return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]);
+	return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]);
 }

plugin/Controllers/SettingsController.php

Indentation +103 added lines, -103 removed lines

@@ -9,112 +9,112 @@
 
 class SettingsController extends Controller
 {
-    /**
-     * @param mixed $input
-     * @return array
-     * @callback register_setting
-     */
-    public function callbackRegisterSettings($input)
-    {
-        $settings = glsr(Helper::class)->consolidateArray($input);
-        if (1 === count($settings) && array_key_exists('settings', $settings)) {
-            $options = array_replace_recursive(glsr(OptionManager::class)->all(), $input);
-            $options = $this->sanitizeGeneral($input, $options);
-            $options = $this->sanitizeSubmissions($input, $options);
-            $options = $this->sanitizeTranslations($input, $options);
-            if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') {
-                glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews'));
-            }
-            return $options;
-        }
-        return $input;
-    }
+	/**
+	 * @param mixed $input
+	 * @return array
+	 * @callback register_setting
+	 */
+	public function callbackRegisterSettings($input)
+	{
+		$settings = glsr(Helper::class)->consolidateArray($input);
+		if (1 === count($settings) && array_key_exists('settings', $settings)) {
+			$options = array_replace_recursive(glsr(OptionManager::class)->all(), $input);
+			$options = $this->sanitizeGeneral($input, $options);
+			$options = $this->sanitizeSubmissions($input, $options);
+			$options = $this->sanitizeTranslations($input, $options);
+			if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') {
+				glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews'));
+			}
+			return $options;
+		}
+		return $input;
+	}
 
-    /**
-     * @return void
-     * @action admin_init
-     */
-    public function registerSettings()
-    {
-        register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [
-            'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-        ]);
-    }
+	/**
+	 * @return void
+	 * @action admin_init
+	 */
+	public function registerSettings()
+	{
+		register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [
+			'sanitize_callback' => [$this, 'callbackRegisterSettings'],
+		]);
+	}
 
-    /**
-     * @return array
-     */
-    protected function sanitizeGeneral(array $input, array $options)
-    {
-        $inputForm = $input['settings']['general'];
-        if (!$this->hasMultilingualIntegration($inputForm['support']['multilingual'])) {
-            $options['settings']['general']['support']['multilingual'] = '';
-        }
-        if ('' == trim($inputForm['notification_message'])) {
-            $options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message'];
-        }
-        $options['settings']['general']['notifications'] = glsr_get($inputForm, 'notifications', []);
-        return $options;
-    }
+	/**
+	 * @return array
+	 */
+	protected function sanitizeGeneral(array $input, array $options)
+	{
+		$inputForm = $input['settings']['general'];
+		if (!$this->hasMultilingualIntegration($inputForm['support']['multilingual'])) {
+			$options['settings']['general']['support']['multilingual'] = '';
+		}
+		if ('' == trim($inputForm['notification_message'])) {
+			$options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message'];
+		}
+		$options['settings']['general']['notifications'] = glsr_get($inputForm, 'notifications', []);
+		return $options;
+	}
 
-    /**
-     * @return array
-     */
-    protected function sanitizeSubmissions(array $input, array $options)
-    {
-        $inputForm = $input['settings']['submissions'];
-        $options['settings']['submissions']['required'] = isset($inputForm['required'])
-            ? $inputForm['required']
-            : [];
-        return $options;
-    }
+	/**
+	 * @return array
+	 */
+	protected function sanitizeSubmissions(array $input, array $options)
+	{
+		$inputForm = $input['settings']['submissions'];
+		$options['settings']['submissions']['required'] = isset($inputForm['required'])
+			? $inputForm['required']
+			: [];
+		return $options;
+	}
 
-    /**
-     * @return array
-     */
-    protected function sanitizeTranslations(array $input, array $options)
-    {
-        if (isset($input['settings']['strings'])) {
-            $options['settings']['strings'] = array_values(array_filter($input['settings']['strings']));
-            $allowedTags = [
-                'a' => ['class' => [], 'href' => [], 'target' => []],
-                'span' => ['class' => []],
-            ];
-            array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) {
-                if (isset($string['s2'])) {
-                    $string['s2'] = wp_kses($string['s2'], $allowedTags);
-                }
-                if (isset($string['p2'])) {
-                    $string['p2'] = wp_kses($string['p2'], $allowedTags);
-                }
-            });
-        }
-        return $options;
-    }
+	/**
+	 * @return array
+	 */
+	protected function sanitizeTranslations(array $input, array $options)
+	{
+		if (isset($input['settings']['strings'])) {
+			$options['settings']['strings'] = array_values(array_filter($input['settings']['strings']));
+			$allowedTags = [
+				'a' => ['class' => [], 'href' => [], 'target' => []],
+				'span' => ['class' => []],
+			];
+			array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) {
+				if (isset($string['s2'])) {
+					$string['s2'] = wp_kses($string['s2'], $allowedTags);
+				}
+				if (isset($string['p2'])) {
+					$string['p2'] = wp_kses($string['p2'], $allowedTags);
+				}
+			});
+		}
+		return $options;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function hasMultilingualIntegration($integration)
-    {
-        if (!in_array($integration, ['polylang', 'wpml'])) {
-            return false;
-        }
-        $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration);
-        if (!glsr($integrationClass)->isActive()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please install/activate the %s plugin to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME')
-            ));
-            return false;
-        } elseif (!glsr($integrationClass)->isSupported()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME'),
-                constant($integrationClass.'::SUPPORTED_VERSION')
-            ));
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function hasMultilingualIntegration($integration)
+	{
+		if (!in_array($integration, ['polylang', 'wpml'])) {
+			return false;
+		}
+		$integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration);
+		if (!glsr($integrationClass)->isActive()) {
+			glsr(Notice::class)->addError(sprintf(
+				__('Please install/activate the %s plugin to enable integration.', 'site-reviews'),
+				constant($integrationClass.'::PLUGIN_NAME')
+			));
+			return false;
+		} elseif (!glsr($integrationClass)->isSupported()) {
+			glsr(Notice::class)->addError(sprintf(
+				__('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'),
+				constant($integrationClass.'::PLUGIN_NAME'),
+				constant($integrationClass.'::SUPPORTED_VERSION')
+			));
+			return false;
+		}
+		return true;
+	}
 }

plugin/Database/OptionManager.php

Indentation +140 added lines, -140 removed lines

@@ -7,155 +7,155 @@
 
 class OptionManager
 {
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return string
-     */
-    public static function databaseKey($version = null)
-    {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
-        }
-        return glsr(Helper::class)->snakeCase(
-            Application::ID.'-v'.intval($version)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public static function databaseKey($version = null)
+	{
+		if (null === $version) {
+			$version = explode('.', glsr()->version);
+			$version = array_shift($version);
+		}
+		return glsr(Helper::class)->snakeCase(
+			Application::ID.'-v'.intval($version)
+		);
+	}
 
-    /**
-     * @return array
-     */
-    public function all()
-    {
-        if (empty($this->options)) {
-            $this->reset();
-        }
-        return $this->options;
-    }
+	/**
+	 * @return array
+	 */
+	public function all()
+	{
+		if (empty($this->options)) {
+			$this->reset();
+		}
+		return $this->options;
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function delete($path)
-    {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
-        $options = $this->all();
-        $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
-                continue;
-            }
-            $pointer = &$pointer[$key];
-        }
-        unset($pointer[$last]);
-        return $this->set($options);
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		$keys = explode('.', $path);
+		$last = array_pop($keys);
+		$options = $this->all();
+		$pointer = &$options;
+		foreach ($keys as $key) {
+			if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+				continue;
+			}
+			$pointer = &$pointer[$key];
+		}
+		unset($pointer[$last]);
+		return $this->set($options);
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function get($path = '', $fallback = '', $cast = '')
-    {
-        $result = glsr(Helper::class)->dataGet($this->all(), $path, $fallback);
-        return glsr(Helper::class)->castTo($cast, $result);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function get($path = '', $fallback = '', $cast = '')
+	{
+		$result = glsr(Helper::class)->dataGet($this->all(), $path, $fallback);
+		return glsr(Helper::class)->castTo($cast, $result);
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function getBool($path)
-    {
-        return 'yes' == $this->get($path)
-            ? true
-            : false;
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function getBool($path)
+	{
+		return 'yes' == $this->get($path)
+			? true
+			: false;
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function getWP($path, $fallback = '', $cast = '')
-    {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
-            $option = $fallback;
-        }
-        return glsr(Helper::class)->castTo($cast, $option);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function getWP($path, $fallback = '', $cast = '')
+	{
+		$option = get_option($path, $fallback);
+		if (empty($option)) {
+			$option = $fallback;
+		}
+		return glsr(Helper::class)->castTo($cast, $option);
+	}
 
-    /**
-     * @return string
-     */
-    public function json()
-    {
-        return json_encode($this->all());
-    }
+	/**
+	 * @return string
+	 */
+	public function json()
+	{
+		return json_encode($this->all());
+	}
 
-    /**
-     * @return array
-     */
-    public function normalize(array $options = [])
-    {
-        $options = wp_parse_args(
-            glsr(Helper::class)->flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
-        );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
-                return;
-            }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
-        });
-        return glsr(Helper::class)->convertDotNotationArray($options);
-    }
+	/**
+	 * @return array
+	 */
+	public function normalize(array $options = [])
+	{
+		$options = wp_parse_args(
+			glsr(Helper::class)->flattenArray($options),
+			glsr(DefaultsManager::class)->defaults()
+		);
+		array_walk($options, function (&$value) {
+			if (!is_string($value)) {
+				return;
+			}
+			$value = wp_kses($value, wp_kses_allowed_html('post'));
+		});
+		return glsr(Helper::class)->convertDotNotationArray($options);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isRecaptchaEnabled()
-    {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
-        return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRecaptchaEnabled()
+	{
+		$integration = $this->get('settings.submissions.recaptcha.integration');
+		return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
+	}
 
-    /**
-     * @return array
-     */
-    public function reset()
-    {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
-            $options = glsr()->defaults;
-        }
-        $this->options = $options;
-    }
+	/**
+	 * @return array
+	 */
+	public function reset()
+	{
+		$options = $this->getWP(static::databaseKey(), []);
+		if (!is_array($options) || empty($options)) {
+			delete_option(static::databaseKey());
+			$options = glsr()->defaults;
+		}
+		$this->options = $options;
+	}
 
-    /**
-     * @param string|array $pathOrOptions
-     * @param mixed $value
-     * @return bool
-     */
-    public function set($pathOrOptions, $value = '')
-    {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = glsr(Helper::class)->dataSet($this->all(), $pathOrOptions, $value);
-        }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
-            $this->reset();
-        }
-        return $result;
-    }
+	/**
+	 * @param string|array $pathOrOptions
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function set($pathOrOptions, $value = '')
+	{
+		if (is_string($pathOrOptions)) {
+			$pathOrOptions = glsr(Helper::class)->dataSet($this->all(), $pathOrOptions, $value);
+		}
+		if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+			$this->reset();
+		}
+		return $result;
+	}
 }

plugin/Database/SqlQueries.php

Indentation +103 added lines, -103 removed lines

@@ -7,23 +7,23 @@ 
 
 class SqlQueries
 {
-    protected $db;
-    protected $postType;
+	protected $db;
+	protected $postType;
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->db = $wpdb;
-        $this->postType = Application::POST_TYPE;
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->db = $wpdb;
+		$this->postType = Application::POST_TYPE;
+	}
 
-    /**
-     * @param string $metaReviewId
-     * @return int
-     */
-    public function getPostIdFromReviewId($metaReviewId)
-    {
-        $postId = $this->db->get_var("
+	/**
+	 * @param string $metaReviewId
+	 * @return int
+	 */
+	public function getPostIdFromReviewId($metaReviewId)
+	{
+		$postId = $this->db->get_var("
             SELECT p.ID
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -31,17 +31,17 @@ 
             AND m.meta_key = '_review_id'
             AND m.meta_value = '{$metaReviewId}'
         ");
-        return intval($postId);
-    }
+		return intval($postId);
+	}
 
-    /**
-     * @param int $lastPostId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
-    {
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $lastPostId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
+	{
+		return (array) $this->db->get_results("
             SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -56,17 +56,17 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $metaKey
-     * @return array
-     */
-    public function getReviewCountsFor($metaKey)
-    {
-        $metaKey = glsr(Helper::class)->prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+	/**
+	 * @todo remove this?
+	 * @param string $metaKey
+	 * @return array
+	 */
+	public function getReviewCountsFor($metaKey)
+	{
+		$metaKey = glsr(Helper::class)->prefix('_', $metaKey);
+		return (array) $this->db->get_results("
             SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -74,16 +74,16 @@ 
             AND m.meta_key = '{$metaKey}'
             GROUP BY name
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $reviewType
-     * @return array
-     */
-    public function getReviewIdsByType($reviewType)
-    {
-        $results = $this->db->get_col("
+	/**
+	 * @todo remove this?
+	 * @param string $reviewType
+	 * @return array
+	 */
+	public function getReviewIdsByType($reviewType)
+	{
+		$results = $this->db->get_col("
             SELECT DISTINCT m1.meta_value AS review_id
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -93,20 +93,20 @@ 
             AND m2.meta_key = '_review_type'
             AND m2.meta_value = '{$reviewType}'
         ");
-        return array_keys(array_flip($results));
-    }
+		return array_keys(array_flip($results));
+	}
 
-    /**
-     * @param int $greaterThanId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
-    {
-        sort($postIds);
-        $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
-        $postIds = implode(',', $postIds);
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $greaterThanId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
+	{
+		sort($postIds);
+		$postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
+		$postIds = implode(',', $postIds);
+		return (array) $this->db->get_results("
             SELECT p.ID, m.meta_value AS rating
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -119,17 +119,17 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @param string $key
-     * @param string $status
-     * @return array
-     */
-    public function getReviewsMeta($key, $status = 'publish')
-    {
-        $key = glsr(Helper::class)->prefix('_', $key);
-        $values = $this->db->get_col("
+	/**
+	 * @param string $key
+	 * @param string $status
+	 * @return array
+	 */
+	public function getReviewsMeta($key, $status = 'publish')
+	{
+		$key = glsr(Helper::class)->prefix('_', $key);
+		$values = $this->db->get_col("
             SELECT DISTINCT m.meta_value
             FROM {$this->db->postmeta} m
             LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id
@@ -140,42 +140,42 @@ 
             GROUP BY p.ID -- remove duplicate meta_value entries
             ORDER BY m.meta_id ASC -- sort by oldest meta_value
         ");
-        sort($values);
-        return $values;
-    }
+		sort($values);
+		return $values;
+	}
 
-    /**
-     * @param string $and
-     * @return string
-     */
-    protected function getAndForCounts(array $args, $and = '')
-    {
-        $postIds = implode(',', array_filter(glsr_get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(glsr_get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
-        }
-        if ($postIds) {
-            $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
-        }
-        if ($termIds) {
-            $and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
-        }
-        return apply_filters('site-reviews/query/and-for-counts', $and);
-    }
+	/**
+	 * @param string $and
+	 * @return string
+	 */
+	protected function getAndForCounts(array $args, $and = '')
+	{
+		$postIds = implode(',', array_filter(glsr_get($args, 'post_ids', [])));
+		$termIds = implode(',', array_filter(glsr_get($args, 'term_ids', [])));
+		if (!empty($args['type'])) {
+			$and.= "AND m2.meta_value = '{$args['type']}' ";
+		}
+		if ($postIds) {
+			$and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
+		}
+		if ($termIds) {
+			$and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
+		}
+		return apply_filters('site-reviews/query/and-for-counts', $and);
+	}
 
-    /**
-     * @param string $innerJoin
-     * @return string
-     */
-    protected function getInnerJoinForCounts(array $args, $innerJoin = '')
-    {
-        if (!empty(glsr_get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
-        }
-        if (!empty(glsr_get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
-        }
-        return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
-    }
+	/**
+	 * @param string $innerJoin
+	 * @return string
+	 */
+	protected function getInnerJoinForCounts(array $args, $innerJoin = '')
+	{
+		if (!empty(glsr_get($args, 'post_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+		}
+		if (!empty(glsr_get($args, 'term_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+		}
+		return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
+	}
 }

plugin/Modules/Upgrader.php

Indentation +75 added lines, -75 removed lines

@@ -7,84 +7,84 @@
 
 class Upgrader
 {
-    /**
-     * @return string
-     */
-    public $currentVersion;
+	/**
+	 * @return string
+	 */
+	public $currentVersion;
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $filenames = [];
-        $iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
-        foreach ($iterator as $fileinfo) {
-            if ($fileinfo->isFile()) {
-                $filenames[] = $fileinfo->getFilename();
-            }
-        }
-        natsort($filenames);
-        $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if ('0.0.0' == $this->currentVersion
-                || version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
-                return;
-            }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
-        });
-        $this->finish();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$filenames = [];
+		$iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
+		foreach ($iterator as $fileinfo) {
+			if ($fileinfo->isFile()) {
+				$filenames[] = $fileinfo->getFilename();
+			}
+		}
+		natsort($filenames);
+		$this->currentVersion = $this->currentVersion();
+		array_walk($filenames, function ($file) {
+			$className = str_replace('.php', '', $file);
+			$upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
+			$suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
+			if ('0.0.0' == $this->currentVersion
+				|| version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+				return;
+			}
+			glsr('Modules\\Upgrader\\'.$className);
+			glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+		});
+		$this->finish();
+	}
 
-    /**
-     * @return void
-     */
-    public function finish()
-    {
-        if ($this->currentVersion !== glsr()->version) {
-            $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
-            $this->setReviewCounts();
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function finish()
+	{
+		if ($this->currentVersion !== glsr()->version) {
+			$this->setReviewCounts();
+			$this->updateVersionFrom($this->currentVersion);
+		} elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+			$this->setReviewCounts();
+		}
+	}
 
-    /**
-     * @return string
-     */
-    protected function currentVersion()
-    {
-        $fallback = '0.0.0';
-        $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = glsr_get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
-                return $version;
-            }
-        }
-        return $fallback;
-    }
+	/**
+	 * @return string
+	 */
+	protected function currentVersion()
+	{
+		$fallback = '0.0.0';
+		$majorVersions = [4, 3, 2];
+		foreach ($majorVersions as $majorVersion) {
+			$settings = get_option(OptionManager::databaseKey($majorVersion));
+			$version = glsr_get($settings, 'version', $fallback);
+			if (version_compare($version, $fallback, '>')) {
+				return $version;
+			}
+		}
+		return $fallback;
+	}
 
-    /**
-     * @return void
-     */
-    protected function setReviewCounts()
-    {
-        add_action('admin_init', 'glsr_calculate_ratings');
-    }
+	/**
+	 * @return void
+	 */
+	protected function setReviewCounts()
+	{
+		add_action('admin_init', 'glsr_calculate_ratings');
+	}
 
-    /**
-     * @param string $previousVersion
-     * @return void
-     */
-    protected function updateVersionFrom($previousVersion)
-    {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
-    }
+	/**
+	 * @param string $previousVersion
+	 * @return void
+	 */
+	protected function updateVersionFrom($previousVersion)
+	{
+		glsr(OptionManager::class)->set('version', glsr()->version);
+		glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+	}
 }

plugin/Modules/Wpml.php

Indentation +73 added lines, -73 removed lines

@@ -7,83 +7,83 @@
 
 class Wpml implements Contract
 {
-    const PLUGIN_NAME = 'WPML';
-    const SUPPORTED_VERSION = '3.3.5';
+	const PLUGIN_NAME = 'WPML';
+	const SUPPORTED_VERSION = '3.3.5';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPost($postId)
-    {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
-            return;
-        }
-        if ($this->isEnabled()) {
-            $postId = apply_filters('wpml_object_id', $postId, 'any', true);
-        }
-        return get_post(intval($postId));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPost($postId)
+	{
+		$postId = trim($postId);
+		if (!is_numeric($postId)) {
+			return;
+		}
+		if ($this->isEnabled()) {
+			$postId = apply_filters('wpml_object_id', $postId, 'any', true);
+		}
+		return get_post(intval($postId));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostIds(array $postIds)
-    {
-        if (!$this->isEnabled()) {
-            return $postIds;
-        }
-        $newPostIds = [];
-        foreach ($this->cleanIds($postIds) as $postId) {
-            $postType = get_post_type($postId);
-            if (!$postType) {
-                continue;
-            }
-            $elementType = 'post_'.$postType;
-            $trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
-            $translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
-            if (!is_array($translations)) {
-                $translations = [];
-            }
-            $newPostIds = array_merge(
-                $newPostIds,
-                array_column($translations, 'element_id')
-            );
-        }
-        return $this->cleanIds($newPostIds);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostIds(array $postIds)
+	{
+		if (!$this->isEnabled()) {
+			return $postIds;
+		}
+		$newPostIds = [];
+		foreach ($this->cleanIds($postIds) as $postId) {
+			$postType = get_post_type($postId);
+			if (!$postType) {
+				continue;
+			}
+			$elementType = 'post_'.$postType;
+			$trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
+			$translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
+			if (!is_array($translations)) {
+				$translations = [];
+			}
+			$newPostIds = array_merge(
+				$newPostIds,
+				array_column($translations, 'element_id')
+			);
+		}
+		return $this->cleanIds($newPostIds);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isActive()
-    {
-        return defined('ICL_SITEPRESS_VERSION');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isActive()
+	{
+		return defined('ICL_SITEPRESS_VERSION');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        return $this->isActive()
-            && 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isEnabled()
+	{
+		return $this->isActive()
+			&& 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isSupported()
-    {
-        return $this->isActive()
-            && version_compare(ICL_SITEPRESS_VERSION, static::SUPPORTED_VERSION, '>=');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isSupported()
+	{
+		return $this->isActive()
+			&& version_compare(ICL_SITEPRESS_VERSION, static::SUPPORTED_VERSION, '>=');
+	}
 
-    /**
-     * @return array
-     */
-    protected function cleanIds(array $postIds)
-    {
-        return array_filter(array_unique($postIds));
-    }
+	/**
+	 * @return array
+	 */
+	protected function cleanIds(array $postIds)
+	{
+		return array_filter(array_unique($postIds));
+	}
 }

plugin/Modules/Polylang.php

Indentation +69 added lines, -69 removed lines

@@ -7,79 +7,79 @@
 
 class Polylang implements Contract
 {
-    const PLUGIN_NAME = 'Polylang';
-    const SUPPORTED_VERSION = '2.3';
+	const PLUGIN_NAME = 'Polylang';
+	const SUPPORTED_VERSION = '2.3';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPost($postId)
-    {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
-            return;
-        }
-        if ($this->isEnabled()) {
-            $polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
-        }
-        if (!empty($polylangPostId)) {
-            $postId = $polylangPostId;
-        }
-        return get_post(intval($postId));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPost($postId)
+	{
+		$postId = trim($postId);
+		if (!is_numeric($postId)) {
+			return;
+		}
+		if ($this->isEnabled()) {
+			$polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
+		}
+		if (!empty($polylangPostId)) {
+			$postId = $polylangPostId;
+		}
+		return get_post(intval($postId));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostIds(array $postIds)
-    {
-        if (!$this->isEnabled()) {
-            return $postIds;
-        }
-        $newPostIds = [];
-        foreach ($this->cleanIds($postIds) as $postId) {
-            $newPostIds = array_merge(
-                $newPostIds,
-                array_values(pll_get_post_translations($postId))
-            );
-        }
-        return $this->cleanIds($newPostIds);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostIds(array $postIds)
+	{
+		if (!$this->isEnabled()) {
+			return $postIds;
+		}
+		$newPostIds = [];
+		foreach ($this->cleanIds($postIds) as $postId) {
+			$newPostIds = array_merge(
+				$newPostIds,
+				array_values(pll_get_post_translations($postId))
+			);
+		}
+		return $this->cleanIds($newPostIds);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isActive()
-    {
-        return function_exists('PLL')
-            && function_exists('pll_get_post')
-            && function_exists('pll_get_post_language')
-            && function_exists('pll_get_post_translations');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isActive()
+	{
+		return function_exists('PLL')
+			&& function_exists('pll_get_post')
+			&& function_exists('pll_get_post_language')
+			&& function_exists('pll_get_post_translations');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        return $this->isActive()
-            && 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isEnabled()
+	{
+		return $this->isActive()
+			&& 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isSupported()
-    {
-        return defined('POLYLANG_VERSION')
-            && version_compare(POLYLANG_VERSION, static::SUPPORTED_VERSION, '>=');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isSupported()
+	{
+		return defined('POLYLANG_VERSION')
+			&& version_compare(POLYLANG_VERSION, static::SUPPORTED_VERSION, '>=');
+	}
 
-    /**
-     * @return array
-     */
-    protected function cleanIds(array $postIds)
-    {
-        return array_filter(array_unique($postIds));
-    }
+	/**
+	 * @return array
+	 */
+	protected function cleanIds(array $postIds)
+	{
+		return array_filter(array_unique($postIds));
+	}
 }