@@ -8,135 +8,135 @@ |
||
8 | 8 | |
9 | 9 | class ReviewsHtml extends ArrayObject |
10 | 10 | { |
11 | - /** |
|
12 | - * @var array |
|
13 | - */ |
|
14 | - public $args; |
|
11 | + /** |
|
12 | + * @var array |
|
13 | + */ |
|
14 | + public $args; |
|
15 | 15 | |
16 | - /** |
|
17 | - * @var int |
|
18 | - */ |
|
19 | - public $max_num_pages; |
|
16 | + /** |
|
17 | + * @var int |
|
18 | + */ |
|
19 | + public $max_num_pages; |
|
20 | 20 | |
21 | - /** |
|
22 | - * @var string |
|
23 | - */ |
|
24 | - public $pagination; |
|
21 | + /** |
|
22 | + * @var string |
|
23 | + */ |
|
24 | + public $pagination; |
|
25 | 25 | |
26 | - /** |
|
27 | - * @var array |
|
28 | - */ |
|
29 | - public $reviews; |
|
26 | + /** |
|
27 | + * @var array |
|
28 | + */ |
|
29 | + public $reviews; |
|
30 | 30 | |
31 | - public function __construct(array $renderedReviews, $maxPageCount, array $args) |
|
32 | - { |
|
33 | - $this->args = $args; |
|
34 | - $this->max_num_pages = $maxPageCount; |
|
35 | - $this->reviews = $renderedReviews; |
|
36 | - $this->pagination = $this->buildPagination(); |
|
37 | - parent::__construct($renderedReviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS); |
|
38 | - } |
|
31 | + public function __construct(array $renderedReviews, $maxPageCount, array $args) |
|
32 | + { |
|
33 | + $this->args = $args; |
|
34 | + $this->max_num_pages = $maxPageCount; |
|
35 | + $this->reviews = $renderedReviews; |
|
36 | + $this->pagination = $this->buildPagination(); |
|
37 | + parent::__construct($renderedReviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - public function __toString() |
|
44 | - { |
|
45 | - return glsr(Template::class)->build('templates/reviews', [ |
|
46 | - 'args' => $this->args, |
|
47 | - 'context' => [ |
|
48 | - 'assigned_to' => $this->args['assigned_to'], |
|
49 | - 'category' => $this->args['category'], |
|
50 | - 'class' => $this->getClass(), |
|
51 | - 'id' => $this->args['id'], |
|
52 | - 'pagination' => $this->getPagination(), |
|
53 | - 'reviews' => $this->getReviews(), |
|
54 | - ], |
|
55 | - ]); |
|
56 | - } |
|
40 | + /** |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + public function __toString() |
|
44 | + { |
|
45 | + return glsr(Template::class)->build('templates/reviews', [ |
|
46 | + 'args' => $this->args, |
|
47 | + 'context' => [ |
|
48 | + 'assigned_to' => $this->args['assigned_to'], |
|
49 | + 'category' => $this->args['category'], |
|
50 | + 'class' => $this->getClass(), |
|
51 | + 'id' => $this->args['id'], |
|
52 | + 'pagination' => $this->getPagination(), |
|
53 | + 'reviews' => $this->getReviews(), |
|
54 | + ], |
|
55 | + ]); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getPagination() |
|
62 | - { |
|
63 | - return wp_validate_boolean($this->args['pagination']) |
|
64 | - ? $this->pagination |
|
65 | - : ''; |
|
66 | - } |
|
58 | + /** |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getPagination() |
|
62 | + { |
|
63 | + return wp_validate_boolean($this->args['pagination']) |
|
64 | + ? $this->pagination |
|
65 | + : ''; |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @return string |
|
70 | - */ |
|
71 | - public function getReviews() |
|
72 | - { |
|
73 | - $html = empty($this->reviews) |
|
74 | - ? $this->getReviewsFallback() |
|
75 | - : implode(PHP_EOL, $this->reviews); |
|
76 | - $wrapper = '<div class="glsr-reviews">%s</div>'; |
|
77 | - $wrapper = apply_filters('site-reviews/reviews/reviews-wrapper', $wrapper); |
|
78 | - return sprintf($wrapper, $html); |
|
79 | - } |
|
68 | + /** |
|
69 | + * @return string |
|
70 | + */ |
|
71 | + public function getReviews() |
|
72 | + { |
|
73 | + $html = empty($this->reviews) |
|
74 | + ? $this->getReviewsFallback() |
|
75 | + : implode(PHP_EOL, $this->reviews); |
|
76 | + $wrapper = '<div class="glsr-reviews">%s</div>'; |
|
77 | + $wrapper = apply_filters('site-reviews/reviews/reviews-wrapper', $wrapper); |
|
78 | + return sprintf($wrapper, $html); |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * @param mixed $key |
|
83 | - * @return mixed |
|
84 | - */ |
|
85 | - public function offsetGet($key) |
|
86 | - { |
|
87 | - if ('navigation' == $key) { |
|
88 | - glsr()->deprecated[] = 'The $reviewsHtml->navigation property has been been deprecated. Please use the $reviewsHtml->pagination property instead.'; |
|
89 | - return $this->pagination; |
|
90 | - } |
|
91 | - if (array_key_exists($key, $this->reviews)) { |
|
92 | - return $this->reviews[$key]; |
|
93 | - } |
|
94 | - return property_exists($this, $key) |
|
95 | - ? $this->$key |
|
96 | - : null; |
|
97 | - } |
|
81 | + /** |
|
82 | + * @param mixed $key |
|
83 | + * @return mixed |
|
84 | + */ |
|
85 | + public function offsetGet($key) |
|
86 | + { |
|
87 | + if ('navigation' == $key) { |
|
88 | + glsr()->deprecated[] = 'The $reviewsHtml->navigation property has been been deprecated. Please use the $reviewsHtml->pagination property instead.'; |
|
89 | + return $this->pagination; |
|
90 | + } |
|
91 | + if (array_key_exists($key, $this->reviews)) { |
|
92 | + return $this->reviews[$key]; |
|
93 | + } |
|
94 | + return property_exists($this, $key) |
|
95 | + ? $this->$key |
|
96 | + : null; |
|
97 | + } |
|
98 | 98 | |
99 | - /** |
|
100 | - * @return string |
|
101 | - */ |
|
102 | - protected function buildPagination() |
|
103 | - { |
|
104 | - $html = glsr(Partial::class)->build('pagination', [ |
|
105 | - 'baseUrl' => Arr::get($this->args, 'pagedUrl'), |
|
106 | - 'current' => Arr::get($this->args, 'paged'), |
|
107 | - 'total' => $this->max_num_pages, |
|
108 | - ]); |
|
109 | - $html.= sprintf('<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json']); |
|
110 | - $wrapper = '<div class="glsr-pagination">%s</div>'; |
|
111 | - $wrapper = apply_filters('site-reviews/reviews/pagination-wrapper', $wrapper); |
|
112 | - return sprintf($wrapper, $html); |
|
113 | - } |
|
99 | + /** |
|
100 | + * @return string |
|
101 | + */ |
|
102 | + protected function buildPagination() |
|
103 | + { |
|
104 | + $html = glsr(Partial::class)->build('pagination', [ |
|
105 | + 'baseUrl' => Arr::get($this->args, 'pagedUrl'), |
|
106 | + 'current' => Arr::get($this->args, 'paged'), |
|
107 | + 'total' => $this->max_num_pages, |
|
108 | + ]); |
|
109 | + $html.= sprintf('<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json']); |
|
110 | + $wrapper = '<div class="glsr-pagination">%s</div>'; |
|
111 | + $wrapper = apply_filters('site-reviews/reviews/pagination-wrapper', $wrapper); |
|
112 | + return sprintf($wrapper, $html); |
|
113 | + } |
|
114 | 114 | |
115 | - /** |
|
116 | - * @return string |
|
117 | - */ |
|
118 | - protected function getClass() |
|
119 | - { |
|
120 | - $defaults = [ |
|
121 | - 'glsr-default', |
|
122 | - ]; |
|
123 | - if ('ajax' == $this->args['pagination']) { |
|
124 | - $defaults[] = 'glsr-ajax-pagination'; |
|
125 | - } |
|
126 | - $classes = explode(' ', $this->args['class']); |
|
127 | - $classes = array_unique(array_merge($defaults, array_filter($classes))); |
|
128 | - return implode(' ', $classes); |
|
129 | - } |
|
115 | + /** |
|
116 | + * @return string |
|
117 | + */ |
|
118 | + protected function getClass() |
|
119 | + { |
|
120 | + $defaults = [ |
|
121 | + 'glsr-default', |
|
122 | + ]; |
|
123 | + if ('ajax' == $this->args['pagination']) { |
|
124 | + $defaults[] = 'glsr-ajax-pagination'; |
|
125 | + } |
|
126 | + $classes = explode(' ', $this->args['class']); |
|
127 | + $classes = array_unique(array_merge($defaults, array_filter($classes))); |
|
128 | + return implode(' ', $classes); |
|
129 | + } |
|
130 | 130 | |
131 | - /** |
|
132 | - * @return string |
|
133 | - */ |
|
134 | - protected function getReviewsFallback() |
|
135 | - { |
|
136 | - if (empty($this->args['fallback']) && glsr(OptionManager::class)->getBool('settings.reviews.fallback')) { |
|
137 | - $this->args['fallback'] = __('There are no reviews yet. Be the first one to write one.', 'site-reviews'); |
|
138 | - } |
|
139 | - $fallback = '<p class="glsr-no-margins">'.$this->args['fallback'].'</p>'; |
|
140 | - return apply_filters('site-reviews/reviews/fallback', $fallback, $this->args); |
|
141 | - } |
|
131 | + /** |
|
132 | + * @return string |
|
133 | + */ |
|
134 | + protected function getReviewsFallback() |
|
135 | + { |
|
136 | + if (empty($this->args['fallback']) && glsr(OptionManager::class)->getBool('settings.reviews.fallback')) { |
|
137 | + $this->args['fallback'] = __('There are no reviews yet. Be the first one to write one.', 'site-reviews'); |
|
138 | + } |
|
139 | + $fallback = '<p class="glsr-no-margins">'.$this->args['fallback'].'</p>'; |
|
140 | + return apply_filters('site-reviews/reviews/fallback', $fallback, $this->args); |
|
141 | + } |
|
142 | 142 | } |
@@ -8,95 +8,95 @@ |
||
8 | 8 | |
9 | 9 | class Upgrader |
10 | 10 | { |
11 | - /** |
|
12 | - * @return string |
|
13 | - */ |
|
14 | - public $currentVersion; |
|
11 | + /** |
|
12 | + * @return string |
|
13 | + */ |
|
14 | + public $currentVersion; |
|
15 | 15 | |
16 | - /** |
|
17 | - * @return void |
|
18 | - */ |
|
19 | - public function run() |
|
20 | - { |
|
21 | - $files = $this->getUpgraderFiles(); |
|
22 | - $this->currentVersion = $this->currentVersion(); |
|
23 | - array_walk($files, function ($file) { |
|
24 | - $className = str_replace('.php', '', $file); |
|
25 | - $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className); |
|
26 | - $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions |
|
27 | - if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) { |
|
28 | - return; |
|
29 | - } |
|
30 | - glsr('Modules\\Upgrader\\'.$className); |
|
31 | - glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix); |
|
32 | - }); |
|
33 | - $this->finish(); |
|
34 | - } |
|
16 | + /** |
|
17 | + * @return void |
|
18 | + */ |
|
19 | + public function run() |
|
20 | + { |
|
21 | + $files = $this->getUpgraderFiles(); |
|
22 | + $this->currentVersion = $this->currentVersion(); |
|
23 | + array_walk($files, function ($file) { |
|
24 | + $className = str_replace('.php', '', $file); |
|
25 | + $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className); |
|
26 | + $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions |
|
27 | + if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) { |
|
28 | + return; |
|
29 | + } |
|
30 | + glsr('Modules\\Upgrader\\'.$className); |
|
31 | + glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix); |
|
32 | + }); |
|
33 | + $this->finish(); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @return void |
|
38 | - */ |
|
39 | - public function finish() |
|
40 | - { |
|
41 | - if ($this->currentVersion !== glsr()->version) { |
|
42 | - $this->setReviewCounts(); |
|
43 | - $this->updateVersionFrom($this->currentVersion); |
|
44 | - } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) { |
|
45 | - $this->setReviewCounts(); |
|
46 | - } |
|
47 | - } |
|
36 | + /** |
|
37 | + * @return void |
|
38 | + */ |
|
39 | + public function finish() |
|
40 | + { |
|
41 | + if ($this->currentVersion !== glsr()->version) { |
|
42 | + $this->setReviewCounts(); |
|
43 | + $this->updateVersionFrom($this->currentVersion); |
|
44 | + } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) { |
|
45 | + $this->setReviewCounts(); |
|
46 | + } |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @return string |
|
51 | - */ |
|
52 | - protected function currentVersion() |
|
53 | - { |
|
54 | - $fallback = '0.0.0'; |
|
55 | - $majorVersions = [4, 3, 2]; |
|
56 | - foreach ($majorVersions as $majorVersion) { |
|
57 | - $settings = get_option(OptionManager::databaseKey($majorVersion)); |
|
58 | - $version = Arr::get($settings, 'version', $fallback); |
|
59 | - if (version_compare($version, $fallback, '>')) { |
|
60 | - return $version; |
|
61 | - } |
|
62 | - } |
|
63 | - return $fallback; |
|
64 | - } |
|
49 | + /** |
|
50 | + * @return string |
|
51 | + */ |
|
52 | + protected function currentVersion() |
|
53 | + { |
|
54 | + $fallback = '0.0.0'; |
|
55 | + $majorVersions = [4, 3, 2]; |
|
56 | + foreach ($majorVersions as $majorVersion) { |
|
57 | + $settings = get_option(OptionManager::databaseKey($majorVersion)); |
|
58 | + $version = Arr::get($settings, 'version', $fallback); |
|
59 | + if (version_compare($version, $fallback, '>')) { |
|
60 | + return $version; |
|
61 | + } |
|
62 | + } |
|
63 | + return $fallback; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return array |
|
68 | - */ |
|
69 | - protected function getUpgraderFiles() |
|
70 | - { |
|
71 | - $files = []; |
|
72 | - $upgradeDir = dirname(__FILE__).'/Upgrades'; |
|
73 | - if (is_dir($upgradeDir)) { |
|
74 | - $iterator = new DirectoryIterator($upgradeDir); |
|
75 | - foreach ($iterator as $fileinfo) { |
|
76 | - if ($fileinfo->isFile()) { |
|
77 | - $files[] = $fileinfo->getFilename(); |
|
78 | - } |
|
79 | - } |
|
80 | - natsort($files); |
|
81 | - } |
|
82 | - return $files; |
|
83 | - } |
|
66 | + /** |
|
67 | + * @return array |
|
68 | + */ |
|
69 | + protected function getUpgraderFiles() |
|
70 | + { |
|
71 | + $files = []; |
|
72 | + $upgradeDir = dirname(__FILE__).'/Upgrades'; |
|
73 | + if (is_dir($upgradeDir)) { |
|
74 | + $iterator = new DirectoryIterator($upgradeDir); |
|
75 | + foreach ($iterator as $fileinfo) { |
|
76 | + if ($fileinfo->isFile()) { |
|
77 | + $files[] = $fileinfo->getFilename(); |
|
78 | + } |
|
79 | + } |
|
80 | + natsort($files); |
|
81 | + } |
|
82 | + return $files; |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * @return void |
|
87 | - */ |
|
88 | - protected function setReviewCounts() |
|
89 | - { |
|
90 | - add_action('admin_init', 'glsr_calculate_ratings'); |
|
91 | - } |
|
85 | + /** |
|
86 | + * @return void |
|
87 | + */ |
|
88 | + protected function setReviewCounts() |
|
89 | + { |
|
90 | + add_action('admin_init', 'glsr_calculate_ratings'); |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * @param string $previousVersion |
|
95 | - * @return void |
|
96 | - */ |
|
97 | - protected function updateVersionFrom($previousVersion) |
|
98 | - { |
|
99 | - glsr(OptionManager::class)->set('version', glsr()->version); |
|
100 | - glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion); |
|
101 | - } |
|
93 | + /** |
|
94 | + * @param string $previousVersion |
|
95 | + * @return void |
|
96 | + */ |
|
97 | + protected function updateVersionFrom($previousVersion) |
|
98 | + { |
|
99 | + glsr(OptionManager::class)->set('version', glsr()->version); |
|
100 | + glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion); |
|
101 | + } |
|
102 | 102 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | interface PartialContract |
6 | 6 | { |
7 | - /** |
|
8 | - * @return string |
|
9 | - */ |
|
10 | - public function build(array $args = []); |
|
7 | + /** |
|
8 | + * @return string |
|
9 | + */ |
|
10 | + public function build(array $args = []); |
|
11 | 11 | } |
@@ -6,186 +6,186 @@ |
||
6 | 6 | |
7 | 7 | class Str |
8 | 8 | { |
9 | - /** |
|
10 | - * @param string $subject |
|
11 | - * @param string $search |
|
12 | - * @return string |
|
13 | - */ |
|
14 | - public static function afterLast($subject, $search) |
|
15 | - { |
|
16 | - return $search === '' |
|
17 | - ? $subject |
|
18 | - : array_reverse(explode($search, $subject))[0]; |
|
19 | - } |
|
20 | - |
|
21 | - /** |
|
22 | - * @param string $string |
|
23 | - * @return string |
|
24 | - */ |
|
25 | - public static function camelCase($string) |
|
26 | - { |
|
27 | - $string = ucwords(str_replace(['-', '_'], ' ', trim($string))); |
|
28 | - return str_replace(' ', '', $string); |
|
29 | - } |
|
30 | - |
|
31 | - /** |
|
32 | - * @param string $haystack |
|
33 | - * @param string $needle |
|
34 | - * @return bool |
|
35 | - */ |
|
36 | - public static function contains($haystack, $needle) |
|
37 | - { |
|
38 | - return false !== strpos($haystack, $needle); |
|
39 | - } |
|
40 | - |
|
41 | - /** |
|
42 | - * @param string $name |
|
43 | - * @param string $nameType first|first_initial|initials|last|last_initial |
|
44 | - * @param string $initialType period|period_space|space |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public static function convertName($name, $nameType = '', $initialType = '') |
|
48 | - { |
|
49 | - $names = preg_split('/\W/', $name, 0, PREG_SPLIT_NO_EMPTY); |
|
50 | - $firstName = array_shift($names); |
|
51 | - $lastName = array_pop($names); |
|
52 | - $initialTypes = [ |
|
53 | - 'period' => '.', |
|
54 | - 'period_space' => '. ', |
|
55 | - 'space' => ' ', |
|
56 | - ]; |
|
57 | - $initialPunctuation = (string) Arr::get($initialTypes, $initialType, ' '); |
|
58 | - if ('initials' == $nameType) { |
|
59 | - return static::convertToInitials($name, $initialPunctuation); |
|
60 | - } |
|
61 | - $nameTypes = [ |
|
62 | - 'first' => $firstName, |
|
63 | - 'first_initial' => substr($firstName, 0, 1).$initialPunctuation.$lastName, |
|
64 | - 'last' => $lastName, |
|
65 | - 'last_initial' => $firstName.' '.substr($lastName, 0, 1).$initialPunctuation, |
|
66 | - ]; |
|
67 | - return trim((string) Arr::get($nameTypes, $nameType, $name)); |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * @param string $path |
|
72 | - * @param string $prefix |
|
73 | - * @return string |
|
74 | - */ |
|
75 | - public static function convertPathToId($path, $prefix = '') |
|
76 | - { |
|
77 | - return str_replace(['[', ']'], ['-', ''], static::convertPathToName($path, $prefix)); |
|
78 | - } |
|
79 | - |
|
80 | - /** |
|
81 | - * @param string $path |
|
82 | - * @param string $prefix |
|
83 | - * @return string |
|
84 | - */ |
|
85 | - public static function convertPathToName($path, $prefix = '') |
|
86 | - { |
|
87 | - $levels = explode('.', $path); |
|
88 | - return array_reduce($levels, function ($result, $value) { |
|
89 | - return $result .= '['.$value.']'; |
|
90 | - }, $prefix); |
|
91 | - } |
|
92 | - |
|
93 | - /** |
|
94 | - * @param string $name |
|
95 | - * @param string $initialPunctuation |
|
96 | - * @return string |
|
97 | - */ |
|
98 | - public static function convertToInitials($name, $initialPunctuation = '') |
|
99 | - { |
|
100 | - preg_match_all('/(?<=\s|\b)\pL/u', $name, $matches); |
|
101 | - return array_reduce($matches[0], function ($carry, $word) use ($initialPunctuation) { |
|
102 | - return $carry.strtoupper(substr($word, 0, 1)).$initialPunctuation; |
|
103 | - }); |
|
104 | - } |
|
105 | - |
|
106 | - /** |
|
107 | - * @param string $string |
|
108 | - * @return string |
|
109 | - */ |
|
110 | - public static function dashCase($string) |
|
111 | - { |
|
112 | - return str_replace('_', '-', static::snakeCase($string)); |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * @param string $needle |
|
117 | - * @param string $haystack |
|
118 | - * @return bool |
|
119 | - */ |
|
120 | - public static function endsWith($needle, $haystack) |
|
121 | - { |
|
122 | - $length = strlen($needle); |
|
123 | - return 0 != $length |
|
124 | - ? substr($haystack, -$length) === $needle |
|
125 | - : true; |
|
126 | - } |
|
127 | - |
|
128 | - /** |
|
129 | - * @param string $prefix |
|
130 | - * @param string $string |
|
131 | - * @param string|null $trim |
|
132 | - * @return string |
|
133 | - */ |
|
134 | - public static function prefix($prefix, $string, $trim = null) |
|
135 | - { |
|
136 | - if (null === $trim) { |
|
137 | - $trim = $prefix; |
|
138 | - } |
|
139 | - return $prefix.trim(static::removePrefix($trim, $string)); |
|
140 | - } |
|
141 | - |
|
142 | - /** |
|
143 | - * @param string $prefix |
|
144 | - * @param string $string |
|
145 | - * @return string |
|
146 | - */ |
|
147 | - public static function removePrefix($prefix, $string) |
|
148 | - { |
|
149 | - return static::startsWith($prefix, $string) |
|
150 | - ? substr($string, strlen($prefix)) |
|
151 | - : $string; |
|
152 | - } |
|
153 | - |
|
154 | - /** |
|
155 | - * @param string $string |
|
156 | - * @return string |
|
157 | - */ |
|
158 | - public static function snakeCase($string) |
|
159 | - { |
|
160 | - if (!ctype_lower($string)) { |
|
161 | - $string = preg_replace('/\s+/u', '', $string); |
|
162 | - $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string); |
|
163 | - $string = function_exists('mb_strtolower') |
|
164 | - ? mb_strtolower($string, 'UTF-8') |
|
165 | - : strtolower($string); |
|
166 | - } |
|
167 | - return str_replace('-', '_', $string); |
|
168 | - } |
|
169 | - |
|
170 | - /** |
|
171 | - * @param string $needle |
|
172 | - * @param string $haystack |
|
173 | - * @return bool |
|
174 | - */ |
|
175 | - public static function startsWith($needle, $haystack) |
|
176 | - { |
|
177 | - return substr($haystack, 0, strlen($needle)) === $needle; |
|
178 | - } |
|
179 | - |
|
180 | - /** |
|
181 | - * @param string $string |
|
182 | - * @param int $length |
|
183 | - * @return string |
|
184 | - */ |
|
185 | - public static function truncate($string, $length) |
|
186 | - { |
|
187 | - return strlen($string) > $length |
|
188 | - ? substr($string, 0, $length) |
|
189 | - : $string; |
|
190 | - } |
|
9 | + /** |
|
10 | + * @param string $subject |
|
11 | + * @param string $search |
|
12 | + * @return string |
|
13 | + */ |
|
14 | + public static function afterLast($subject, $search) |
|
15 | + { |
|
16 | + return $search === '' |
|
17 | + ? $subject |
|
18 | + : array_reverse(explode($search, $subject))[0]; |
|
19 | + } |
|
20 | + |
|
21 | + /** |
|
22 | + * @param string $string |
|
23 | + * @return string |
|
24 | + */ |
|
25 | + public static function camelCase($string) |
|
26 | + { |
|
27 | + $string = ucwords(str_replace(['-', '_'], ' ', trim($string))); |
|
28 | + return str_replace(' ', '', $string); |
|
29 | + } |
|
30 | + |
|
31 | + /** |
|
32 | + * @param string $haystack |
|
33 | + * @param string $needle |
|
34 | + * @return bool |
|
35 | + */ |
|
36 | + public static function contains($haystack, $needle) |
|
37 | + { |
|
38 | + return false !== strpos($haystack, $needle); |
|
39 | + } |
|
40 | + |
|
41 | + /** |
|
42 | + * @param string $name |
|
43 | + * @param string $nameType first|first_initial|initials|last|last_initial |
|
44 | + * @param string $initialType period|period_space|space |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public static function convertName($name, $nameType = '', $initialType = '') |
|
48 | + { |
|
49 | + $names = preg_split('/\W/', $name, 0, PREG_SPLIT_NO_EMPTY); |
|
50 | + $firstName = array_shift($names); |
|
51 | + $lastName = array_pop($names); |
|
52 | + $initialTypes = [ |
|
53 | + 'period' => '.', |
|
54 | + 'period_space' => '. ', |
|
55 | + 'space' => ' ', |
|
56 | + ]; |
|
57 | + $initialPunctuation = (string) Arr::get($initialTypes, $initialType, ' '); |
|
58 | + if ('initials' == $nameType) { |
|
59 | + return static::convertToInitials($name, $initialPunctuation); |
|
60 | + } |
|
61 | + $nameTypes = [ |
|
62 | + 'first' => $firstName, |
|
63 | + 'first_initial' => substr($firstName, 0, 1).$initialPunctuation.$lastName, |
|
64 | + 'last' => $lastName, |
|
65 | + 'last_initial' => $firstName.' '.substr($lastName, 0, 1).$initialPunctuation, |
|
66 | + ]; |
|
67 | + return trim((string) Arr::get($nameTypes, $nameType, $name)); |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * @param string $path |
|
72 | + * @param string $prefix |
|
73 | + * @return string |
|
74 | + */ |
|
75 | + public static function convertPathToId($path, $prefix = '') |
|
76 | + { |
|
77 | + return str_replace(['[', ']'], ['-', ''], static::convertPathToName($path, $prefix)); |
|
78 | + } |
|
79 | + |
|
80 | + /** |
|
81 | + * @param string $path |
|
82 | + * @param string $prefix |
|
83 | + * @return string |
|
84 | + */ |
|
85 | + public static function convertPathToName($path, $prefix = '') |
|
86 | + { |
|
87 | + $levels = explode('.', $path); |
|
88 | + return array_reduce($levels, function ($result, $value) { |
|
89 | + return $result .= '['.$value.']'; |
|
90 | + }, $prefix); |
|
91 | + } |
|
92 | + |
|
93 | + /** |
|
94 | + * @param string $name |
|
95 | + * @param string $initialPunctuation |
|
96 | + * @return string |
|
97 | + */ |
|
98 | + public static function convertToInitials($name, $initialPunctuation = '') |
|
99 | + { |
|
100 | + preg_match_all('/(?<=\s|\b)\pL/u', $name, $matches); |
|
101 | + return array_reduce($matches[0], function ($carry, $word) use ($initialPunctuation) { |
|
102 | + return $carry.strtoupper(substr($word, 0, 1)).$initialPunctuation; |
|
103 | + }); |
|
104 | + } |
|
105 | + |
|
106 | + /** |
|
107 | + * @param string $string |
|
108 | + * @return string |
|
109 | + */ |
|
110 | + public static function dashCase($string) |
|
111 | + { |
|
112 | + return str_replace('_', '-', static::snakeCase($string)); |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * @param string $needle |
|
117 | + * @param string $haystack |
|
118 | + * @return bool |
|
119 | + */ |
|
120 | + public static function endsWith($needle, $haystack) |
|
121 | + { |
|
122 | + $length = strlen($needle); |
|
123 | + return 0 != $length |
|
124 | + ? substr($haystack, -$length) === $needle |
|
125 | + : true; |
|
126 | + } |
|
127 | + |
|
128 | + /** |
|
129 | + * @param string $prefix |
|
130 | + * @param string $string |
|
131 | + * @param string|null $trim |
|
132 | + * @return string |
|
133 | + */ |
|
134 | + public static function prefix($prefix, $string, $trim = null) |
|
135 | + { |
|
136 | + if (null === $trim) { |
|
137 | + $trim = $prefix; |
|
138 | + } |
|
139 | + return $prefix.trim(static::removePrefix($trim, $string)); |
|
140 | + } |
|
141 | + |
|
142 | + /** |
|
143 | + * @param string $prefix |
|
144 | + * @param string $string |
|
145 | + * @return string |
|
146 | + */ |
|
147 | + public static function removePrefix($prefix, $string) |
|
148 | + { |
|
149 | + return static::startsWith($prefix, $string) |
|
150 | + ? substr($string, strlen($prefix)) |
|
151 | + : $string; |
|
152 | + } |
|
153 | + |
|
154 | + /** |
|
155 | + * @param string $string |
|
156 | + * @return string |
|
157 | + */ |
|
158 | + public static function snakeCase($string) |
|
159 | + { |
|
160 | + if (!ctype_lower($string)) { |
|
161 | + $string = preg_replace('/\s+/u', '', $string); |
|
162 | + $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string); |
|
163 | + $string = function_exists('mb_strtolower') |
|
164 | + ? mb_strtolower($string, 'UTF-8') |
|
165 | + : strtolower($string); |
|
166 | + } |
|
167 | + return str_replace('-', '_', $string); |
|
168 | + } |
|
169 | + |
|
170 | + /** |
|
171 | + * @param string $needle |
|
172 | + * @param string $haystack |
|
173 | + * @return bool |
|
174 | + */ |
|
175 | + public static function startsWith($needle, $haystack) |
|
176 | + { |
|
177 | + return substr($haystack, 0, strlen($needle)) === $needle; |
|
178 | + } |
|
179 | + |
|
180 | + /** |
|
181 | + * @param string $string |
|
182 | + * @param int $length |
|
183 | + * @return string |
|
184 | + */ |
|
185 | + public static function truncate($string, $length) |
|
186 | + { |
|
187 | + return strlen($string) > $length |
|
188 | + ? substr($string, 0, $length) |
|
189 | + : $string; |
|
190 | + } |
|
191 | 191 | } |
@@ -6,7 +6,7 @@ |
||
6 | 6 | require_once $file; |
7 | 7 | |
8 | 8 | if (!(new GL_Plugin_Check_v4($file))->isValid()) { |
9 | - return; |
|
9 | + return; |
|
10 | 10 | } |
11 | 11 | delete_option(GeminiLabs\SiteReviews\Database\OptionManager::databaseKey(3)); |
12 | 12 | delete_option(GeminiLabs\SiteReviews\Database\OptionManager::databaseKey(4)); |
@@ -8,54 +8,54 @@ |
||
8 | 8 | |
9 | 9 | class StarRating implements PartialContract |
10 | 10 | { |
11 | - protected $prefix; |
|
12 | - protected $rating; |
|
11 | + protected $prefix; |
|
12 | + protected $rating; |
|
13 | 13 | |
14 | - /** |
|
15 | - * @return string |
|
16 | - */ |
|
17 | - public function build(array $args = []) |
|
18 | - { |
|
19 | - $this->setProperties($args); |
|
20 | - $fullStars = intval(floor($this->rating)); |
|
21 | - $halfStars = intval(ceil($this->rating - $fullStars)); |
|
22 | - $emptyStars = max(0, glsr()->constant('MAX_RATING', Rating::class) - $fullStars - $halfStars); |
|
23 | - return glsr(Template::class)->build('templates/rating/stars', [ |
|
24 | - 'context' => [ |
|
25 | - 'empty_stars' => $this->getTemplate('empty-star', $emptyStars), |
|
26 | - 'full_stars' => $this->getTemplate('full-star', $fullStars), |
|
27 | - 'half_stars' => $this->getTemplate('half-star', $halfStars), |
|
28 | - 'prefix' => $this->prefix, |
|
29 | - 'title' => sprintf(__('%s rating', 'site-reviews'), number_format_i18n($this->rating, 1)), |
|
30 | - ], |
|
31 | - ]); |
|
32 | - } |
|
14 | + /** |
|
15 | + * @return string |
|
16 | + */ |
|
17 | + public function build(array $args = []) |
|
18 | + { |
|
19 | + $this->setProperties($args); |
|
20 | + $fullStars = intval(floor($this->rating)); |
|
21 | + $halfStars = intval(ceil($this->rating - $fullStars)); |
|
22 | + $emptyStars = max(0, glsr()->constant('MAX_RATING', Rating::class) - $fullStars - $halfStars); |
|
23 | + return glsr(Template::class)->build('templates/rating/stars', [ |
|
24 | + 'context' => [ |
|
25 | + 'empty_stars' => $this->getTemplate('empty-star', $emptyStars), |
|
26 | + 'full_stars' => $this->getTemplate('full-star', $fullStars), |
|
27 | + 'half_stars' => $this->getTemplate('half-star', $halfStars), |
|
28 | + 'prefix' => $this->prefix, |
|
29 | + 'title' => sprintf(__('%s rating', 'site-reviews'), number_format_i18n($this->rating, 1)), |
|
30 | + ], |
|
31 | + ]); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param string $templateName |
|
36 | - * @param int $timesRepeated |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - protected function getTemplate($templateName, $timesRepeated) |
|
40 | - { |
|
41 | - $template = glsr(Template::class)->build('templates/rating/'.$templateName, [ |
|
42 | - 'context' => [ |
|
43 | - 'prefix' => $this->prefix, |
|
44 | - ], |
|
45 | - ]); |
|
46 | - return str_repeat($template, $timesRepeated); |
|
47 | - } |
|
34 | + /** |
|
35 | + * @param string $templateName |
|
36 | + * @param int $timesRepeated |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + protected function getTemplate($templateName, $timesRepeated) |
|
40 | + { |
|
41 | + $template = glsr(Template::class)->build('templates/rating/'.$templateName, [ |
|
42 | + 'context' => [ |
|
43 | + 'prefix' => $this->prefix, |
|
44 | + ], |
|
45 | + ]); |
|
46 | + return str_repeat($template, $timesRepeated); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @return array |
|
51 | - */ |
|
52 | - protected function setProperties(array $args) |
|
53 | - { |
|
54 | - $args = wp_parse_args($args, [ |
|
55 | - 'prefix' => glsr()->isAdmin() ? '' : 'glsr-', |
|
56 | - 'rating' => 0, |
|
57 | - ]); |
|
58 | - $this->prefix = $args['prefix']; |
|
59 | - $this->rating = (float) str_replace(',', '.', $args['rating']); |
|
60 | - } |
|
49 | + /** |
|
50 | + * @return array |
|
51 | + */ |
|
52 | + protected function setProperties(array $args) |
|
53 | + { |
|
54 | + $args = wp_parse_args($args, [ |
|
55 | + 'prefix' => glsr()->isAdmin() ? '' : 'glsr-', |
|
56 | + 'rating' => 0, |
|
57 | + ]); |
|
58 | + $this->prefix = $args['prefix']; |
|
59 | + $this->rating = (float) str_replace(',', '.', $args['rating']); |
|
60 | + } |
|
61 | 61 | } |
@@ -9,25 +9,25 @@ discard block |
||
9 | 9 | * @return mixed |
10 | 10 | */ |
11 | 11 | add_filter('plugins_loaded', function () { |
12 | - $hooks = array( |
|
13 | - 'glsr_calculate_ratings' => 1, |
|
14 | - 'glsr_create_review' => 2, |
|
15 | - 'glsr_debug' => 10, |
|
16 | - 'glsr_get' => 4, |
|
17 | - 'glsr_get_option' => 4, |
|
18 | - 'glsr_get_options' => 1, |
|
19 | - 'glsr_get_review' => 2, |
|
20 | - 'glsr_get_reviews' => 2, |
|
21 | - 'glsr_log' => 3, |
|
22 | - 'glsr_star_rating' => 2, |
|
23 | - ); |
|
24 | - foreach ($hooks as $function => $acceptedArgs) { |
|
25 | - add_filter($function, function () use ($function) { |
|
26 | - $args = func_get_args(); |
|
27 | - array_shift($args); // remove the fallback value |
|
28 | - return call_user_func_array($function, $args); |
|
29 | - }, 10, $acceptedArgs); |
|
30 | - } |
|
12 | + $hooks = array( |
|
13 | + 'glsr_calculate_ratings' => 1, |
|
14 | + 'glsr_create_review' => 2, |
|
15 | + 'glsr_debug' => 10, |
|
16 | + 'glsr_get' => 4, |
|
17 | + 'glsr_get_option' => 4, |
|
18 | + 'glsr_get_options' => 1, |
|
19 | + 'glsr_get_review' => 2, |
|
20 | + 'glsr_get_reviews' => 2, |
|
21 | + 'glsr_log' => 3, |
|
22 | + 'glsr_star_rating' => 2, |
|
23 | + ); |
|
24 | + foreach ($hooks as $function => $acceptedArgs) { |
|
25 | + add_filter($function, function () use ($function) { |
|
26 | + $args = func_get_args(); |
|
27 | + array_shift($args); // remove the fallback value |
|
28 | + return call_user_func_array($function, $args); |
|
29 | + }, 10, $acceptedArgs); |
|
30 | + } |
|
31 | 31 | }); |
32 | 32 | |
33 | 33 | /** |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | */ |
36 | 36 | function glsr($alias = null) |
37 | 37 | { |
38 | - $app = \GeminiLabs\SiteReviews\Application::load(); |
|
39 | - return !is_null($alias) |
|
40 | - ? $app->make($alias) |
|
41 | - : $app; |
|
38 | + $app = \GeminiLabs\SiteReviews\Application::load(); |
|
39 | + return !is_null($alias) |
|
40 | + ? $app->make($alias) |
|
41 | + : $app; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -48,15 +48,15 @@ discard block |
||
48 | 48 | */ |
49 | 49 | function glsr_array_column(array $array, $column) |
50 | 50 | { |
51 | - $result = array(); |
|
52 | - foreach ($array as $subarray) { |
|
53 | - $subarray = (array) $subarray; |
|
54 | - if (!isset($subarray[$column])) { |
|
55 | - continue; |
|
56 | - } |
|
57 | - $result[] = $subarray[$column]; |
|
58 | - } |
|
59 | - return $result; |
|
51 | + $result = array(); |
|
52 | + foreach ($array as $subarray) { |
|
53 | + $subarray = (array) $subarray; |
|
54 | + if (!isset($subarray[$column])) { |
|
55 | + continue; |
|
56 | + } |
|
57 | + $result[] = $subarray[$column]; |
|
58 | + } |
|
59 | + return $result; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | */ |
65 | 65 | function glsr_calculate_ratings() |
66 | 66 | { |
67 | - glsr('Controllers\AdminController')->routerCountReviews(false); |
|
68 | - glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews')); |
|
67 | + glsr('Controllers\AdminController')->routerCountReviews(false); |
|
68 | + glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews')); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -73,10 +73,10 @@ discard block |
||
73 | 73 | */ |
74 | 74 | function glsr_create_review($reviewValues = array()) |
75 | 75 | { |
76 | - $review = new \GeminiLabs\SiteReviews\Commands\CreateReview( |
|
77 | - \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($reviewValues) |
|
78 | - ); |
|
79 | - return glsr('Database\ReviewManager')->create($review); |
|
76 | + $review = new \GeminiLabs\SiteReviews\Commands\CreateReview( |
|
77 | + \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($reviewValues) |
|
78 | + ); |
|
79 | + return glsr('Database\ReviewManager')->create($review); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | */ |
85 | 85 | function glsr_current_screen() |
86 | 86 | { |
87 | - if (function_exists('get_current_screen')) { |
|
88 | - $screen = get_current_screen(); |
|
89 | - } |
|
90 | - return empty($screen) |
|
91 | - ? (object) array_fill_keys(['base', 'id', 'post_type'], null) |
|
92 | - : $screen; |
|
87 | + if (function_exists('get_current_screen')) { |
|
88 | + $screen = get_current_screen(); |
|
89 | + } |
|
90 | + return empty($screen) |
|
91 | + ? (object) array_fill_keys(['base', 'id', 'post_type'], null) |
|
92 | + : $screen; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -98,16 +98,16 @@ discard block |
||
98 | 98 | */ |
99 | 99 | function glsr_debug(...$vars) |
100 | 100 | { |
101 | - if (1 == count($vars)) { |
|
102 | - $value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8'); |
|
103 | - printf('<div class="glsr-debug"><pre>%s</pre></div>', $value); |
|
104 | - } else { |
|
105 | - echo '<div class="glsr-debug-group">'; |
|
106 | - foreach ($vars as $var) { |
|
107 | - glsr_debug($var); |
|
108 | - } |
|
109 | - echo '</div>'; |
|
110 | - } |
|
101 | + if (1 == count($vars)) { |
|
102 | + $value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8'); |
|
103 | + printf('<div class="glsr-debug"><pre>%s</pre></div>', $value); |
|
104 | + } else { |
|
105 | + echo '<div class="glsr-debug-group">'; |
|
106 | + foreach ($vars as $var) { |
|
107 | + glsr_debug($var); |
|
108 | + } |
|
109 | + echo '</div>'; |
|
110 | + } |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | function glsr_get($array, $path = '', $fallback = '') |
120 | 120 | { |
121 | - return \GeminiLabs\SiteReviews\Helpers\Arr::get($array, $path, $fallback); |
|
121 | + return \GeminiLabs\SiteReviews\Helpers\Arr::get($array, $path, $fallback); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -129,9 +129,9 @@ discard block |
||
129 | 129 | */ |
130 | 130 | function glsr_get_option($path = '', $fallback = '', $cast = '') |
131 | 131 | { |
132 | - return is_string($path) |
|
133 | - ? glsr('Database\OptionManager')->get(\GeminiLabs\SiteReviews\Helpers\Str::prefix('settings.', $path), $fallback, $cast) |
|
134 | - : $fallback; |
|
132 | + return is_string($path) |
|
133 | + ? glsr('Database\OptionManager')->get(\GeminiLabs\SiteReviews\Helpers\Str::prefix('settings.', $path), $fallback, $cast) |
|
134 | + : $fallback; |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | function glsr_get_options() |
141 | 141 | { |
142 | - return glsr('Database\OptionManager')->get('settings'); |
|
142 | + return glsr('Database\OptionManager')->get('settings'); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -148,13 +148,13 @@ discard block |
||
148 | 148 | */ |
149 | 149 | function glsr_get_review($post) |
150 | 150 | { |
151 | - if (is_numeric($post)) { |
|
152 | - $post = get_post($post); |
|
153 | - } |
|
154 | - if (!($post instanceof WP_Post)) { |
|
155 | - $post = new WP_Post((object) []); |
|
156 | - } |
|
157 | - return glsr('Database\ReviewManager')->single($post); |
|
151 | + if (is_numeric($post)) { |
|
152 | + $post = get_post($post); |
|
153 | + } |
|
154 | + if (!($post instanceof WP_Post)) { |
|
155 | + $post = new WP_Post((object) []); |
|
156 | + } |
|
157 | + return glsr('Database\ReviewManager')->single($post); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | /** |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | function glsr_get_reviews($args = array()) |
164 | 164 | { |
165 | - return glsr('Database\ReviewManager')->get(\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($args)); |
|
165 | + return glsr('Database\ReviewManager')->get(\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($args)); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
@@ -170,12 +170,12 @@ discard block |
||
170 | 170 | */ |
171 | 171 | function glsr_log() |
172 | 172 | { |
173 | - $args = func_get_args(); |
|
174 | - $console = glsr('Modules\Console'); |
|
175 | - if ($value = \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '0')) { |
|
176 | - return $console->debug($value, \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '1', [])); |
|
177 | - } |
|
178 | - return $console; |
|
173 | + $args = func_get_args(); |
|
174 | + $console = glsr('Modules\Console'); |
|
175 | + if ($value = \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '0')) { |
|
176 | + return $console->debug($value, \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '1', [])); |
|
177 | + } |
|
178 | + return $console; |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | /** |
@@ -183,5 +183,5 @@ discard block |
||
183 | 183 | */ |
184 | 184 | function glsr_star_rating($rating) |
185 | 185 | { |
186 | - return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]); |
|
186 | + return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]); |
|
187 | 187 | } |
@@ -8,141 +8,141 @@ |
||
8 | 8 | */ |
9 | 9 | class GL_Plugin_Check_v4 |
10 | 10 | { |
11 | - const MIN_PHP_VERSION = '5.6.0'; |
|
12 | - const MIN_WORDPRESS_VERSION = '4.7.0'; |
|
11 | + const MIN_PHP_VERSION = '5.6.0'; |
|
12 | + const MIN_WORDPRESS_VERSION = '4.7.0'; |
|
13 | 13 | |
14 | - /** |
|
15 | - * @var array |
|
16 | - */ |
|
17 | - public $versions; |
|
14 | + /** |
|
15 | + * @var array |
|
16 | + */ |
|
17 | + public $versions; |
|
18 | 18 | |
19 | - /** |
|
20 | - * @var string |
|
21 | - */ |
|
22 | - protected $file; |
|
19 | + /** |
|
20 | + * @var string |
|
21 | + */ |
|
22 | + protected $file; |
|
23 | 23 | |
24 | - /** |
|
25 | - * @param string $file |
|
26 | - */ |
|
27 | - public function __construct($file) |
|
28 | - { |
|
29 | - $this->file = realpath($file); |
|
30 | - $versionRequirements = get_file_data($this->file, [ |
|
31 | - 'php' => 'Requires PHP', |
|
32 | - 'wordpress' => 'Requires at least', |
|
33 | - ]); |
|
34 | - $this->versions = wp_parse_args(array_filter($versionRequirements), [ |
|
35 | - 'php' => static::MIN_PHP_VERSION, |
|
36 | - 'wordpress' => static::MIN_WORDPRESS_VERSION, |
|
37 | - ]); |
|
38 | - } |
|
24 | + /** |
|
25 | + * @param string $file |
|
26 | + */ |
|
27 | + public function __construct($file) |
|
28 | + { |
|
29 | + $this->file = realpath($file); |
|
30 | + $versionRequirements = get_file_data($this->file, [ |
|
31 | + 'php' => 'Requires PHP', |
|
32 | + 'wordpress' => 'Requires at least', |
|
33 | + ]); |
|
34 | + $this->versions = wp_parse_args(array_filter($versionRequirements), [ |
|
35 | + 'php' => static::MIN_PHP_VERSION, |
|
36 | + 'wordpress' => static::MIN_WORDPRESS_VERSION, |
|
37 | + ]); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return bool |
|
42 | - */ |
|
43 | - public function canProceed() |
|
44 | - { |
|
45 | - if ($this->isValid()) { |
|
46 | - return true; |
|
47 | - } |
|
48 | - add_action('activated_plugin', [$this, 'deactivate']); |
|
49 | - add_action('admin_notices', [$this, 'deactivate']); |
|
50 | - return false; |
|
51 | - } |
|
40 | + /** |
|
41 | + * @return bool |
|
42 | + */ |
|
43 | + public function canProceed() |
|
44 | + { |
|
45 | + if ($this->isValid()) { |
|
46 | + return true; |
|
47 | + } |
|
48 | + add_action('activated_plugin', [$this, 'deactivate']); |
|
49 | + add_action('admin_notices', [$this, 'deactivate']); |
|
50 | + return false; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @return bool |
|
55 | - */ |
|
56 | - public function isPhpValid() |
|
57 | - { |
|
58 | - return !version_compare(PHP_VERSION, $this->versions['php'], '<'); |
|
59 | - } |
|
53 | + /** |
|
54 | + * @return bool |
|
55 | + */ |
|
56 | + public function isPhpValid() |
|
57 | + { |
|
58 | + return !version_compare(PHP_VERSION, $this->versions['php'], '<'); |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * @return bool |
|
63 | - */ |
|
64 | - public function isValid() |
|
65 | - { |
|
66 | - return $this->isPhpValid() && $this->isWpValid(); |
|
67 | - } |
|
61 | + /** |
|
62 | + * @return bool |
|
63 | + */ |
|
64 | + public function isValid() |
|
65 | + { |
|
66 | + return $this->isPhpValid() && $this->isWpValid(); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * @return bool |
|
71 | - */ |
|
72 | - public function isWpValid() |
|
73 | - { |
|
74 | - global $wp_version; |
|
75 | - return !version_compare($wp_version, $this->versions['wordpress'], '<'); |
|
76 | - } |
|
69 | + /** |
|
70 | + * @return bool |
|
71 | + */ |
|
72 | + public function isWpValid() |
|
73 | + { |
|
74 | + global $wp_version; |
|
75 | + return !version_compare($wp_version, $this->versions['wordpress'], '<'); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @param string $plugin |
|
80 | - * @return void |
|
81 | - */ |
|
82 | - public function deactivate($plugin) |
|
83 | - { |
|
84 | - if ($this->isValid()) { |
|
85 | - return; |
|
86 | - } |
|
87 | - $pluginSlug = plugin_basename($this->file); |
|
88 | - if ($plugin == $pluginSlug) { |
|
89 | - $this->redirect(); //exit |
|
90 | - } |
|
91 | - $pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin'); |
|
92 | - deactivate_plugins($pluginSlug); |
|
93 | - $this->printNotice($pluginData['name']); |
|
94 | - } |
|
78 | + /** |
|
79 | + * @param string $plugin |
|
80 | + * @return void |
|
81 | + */ |
|
82 | + public function deactivate($plugin) |
|
83 | + { |
|
84 | + if ($this->isValid()) { |
|
85 | + return; |
|
86 | + } |
|
87 | + $pluginSlug = plugin_basename($this->file); |
|
88 | + if ($plugin == $pluginSlug) { |
|
89 | + $this->redirect(); //exit |
|
90 | + } |
|
91 | + $pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin'); |
|
92 | + deactivate_plugins($pluginSlug); |
|
93 | + $this->printNotice($pluginData['name']); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * @return array |
|
98 | - */ |
|
99 | - protected function getMessages() |
|
100 | - { |
|
101 | - return [ |
|
102 | - 'notice' => __('The %s plugin was deactivated.', 'site-reviews'), |
|
103 | - 'php_version' => __('PHP version', 'site-reviews'), |
|
104 | - 'rollback' => __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'), |
|
105 | - 'update_php' => __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'), |
|
106 | - 'update_wp' => __('Update WordPress', 'site-reviews'), |
|
107 | - 'wp_version' => __('WordPress version', 'site-reviews'), |
|
108 | - 'wrong_version' => __('This plugin requires %s or greater in order to work properly.', 'site-reviews'), |
|
109 | - ]; |
|
110 | - } |
|
96 | + /** |
|
97 | + * @return array |
|
98 | + */ |
|
99 | + protected function getMessages() |
|
100 | + { |
|
101 | + return [ |
|
102 | + 'notice' => __('The %s plugin was deactivated.', 'site-reviews'), |
|
103 | + 'php_version' => __('PHP version', 'site-reviews'), |
|
104 | + 'rollback' => __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'), |
|
105 | + 'update_php' => __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'), |
|
106 | + 'update_wp' => __('Update WordPress', 'site-reviews'), |
|
107 | + 'wp_version' => __('WordPress version', 'site-reviews'), |
|
108 | + 'wrong_version' => __('This plugin requires %s or greater in order to work properly.', 'site-reviews'), |
|
109 | + ]; |
|
110 | + } |
|
111 | 111 | |
112 | - /** |
|
113 | - * @param string $pluginName |
|
114 | - * @return void |
|
115 | - */ |
|
116 | - protected function printNotice($pluginName) |
|
117 | - { |
|
118 | - $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>'; |
|
119 | - $messages = $this->getMessages(); |
|
120 | - $rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName); |
|
121 | - if (!$this->isPhpValid()) { |
|
122 | - printf($noticeTemplate, |
|
123 | - sprintf($messages['notice'], $pluginName), |
|
124 | - sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']), |
|
125 | - sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage |
|
126 | - ); |
|
127 | - } elseif (!$this->isWpValid()) { |
|
128 | - printf($noticeTemplate, |
|
129 | - sprintf($messages['notice'], $pluginName), |
|
130 | - sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']), |
|
131 | - $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp']) |
|
132 | - ); |
|
133 | - } |
|
134 | - } |
|
112 | + /** |
|
113 | + * @param string $pluginName |
|
114 | + * @return void |
|
115 | + */ |
|
116 | + protected function printNotice($pluginName) |
|
117 | + { |
|
118 | + $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>'; |
|
119 | + $messages = $this->getMessages(); |
|
120 | + $rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName); |
|
121 | + if (!$this->isPhpValid()) { |
|
122 | + printf($noticeTemplate, |
|
123 | + sprintf($messages['notice'], $pluginName), |
|
124 | + sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']), |
|
125 | + sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage |
|
126 | + ); |
|
127 | + } elseif (!$this->isWpValid()) { |
|
128 | + printf($noticeTemplate, |
|
129 | + sprintf($messages['notice'], $pluginName), |
|
130 | + sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']), |
|
131 | + $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp']) |
|
132 | + ); |
|
133 | + } |
|
134 | + } |
|
135 | 135 | |
136 | - /** |
|
137 | - * @return void |
|
138 | - */ |
|
139 | - protected function redirect() |
|
140 | - { |
|
141 | - wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s', |
|
142 | - filter_input(INPUT_GET, 'plugin_status'), |
|
143 | - filter_input(INPUT_GET, 'paged'), |
|
144 | - filter_input(INPUT_GET, 's') |
|
145 | - ))); |
|
146 | - exit; |
|
147 | - } |
|
136 | + /** |
|
137 | + * @return void |
|
138 | + */ |
|
139 | + protected function redirect() |
|
140 | + { |
|
141 | + wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s', |
|
142 | + filter_input(INPUT_GET, 'plugin_status'), |
|
143 | + filter_input(INPUT_GET, 'paged'), |
|
144 | + filter_input(INPUT_GET, 's') |
|
145 | + ))); |
|
146 | + exit; |
|
147 | + } |
|
148 | 148 | } |
@@ -8,124 +8,124 @@ |
||
8 | 8 | |
9 | 9 | class NoticeController extends Controller |
10 | 10 | { |
11 | - const USER_META_KEY = '_glsr_notices'; |
|
11 | + const USER_META_KEY = '_glsr_notices'; |
|
12 | 12 | |
13 | - /** |
|
14 | - * @var array |
|
15 | - */ |
|
16 | - protected $dismissValuesMap; |
|
13 | + /** |
|
14 | + * @var array |
|
15 | + */ |
|
16 | + protected $dismissValuesMap; |
|
17 | 17 | |
18 | - public function __construct() |
|
19 | - { |
|
20 | - $this->dismissValuesMap = [ |
|
21 | - 'rebusify' => glsr()->version('major'), |
|
22 | - 'welcome' => glsr()->version('minor'), |
|
23 | - ]; |
|
24 | - } |
|
18 | + public function __construct() |
|
19 | + { |
|
20 | + $this->dismissValuesMap = [ |
|
21 | + 'rebusify' => glsr()->version('major'), |
|
22 | + 'welcome' => glsr()->version('minor'), |
|
23 | + ]; |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * @return void |
|
28 | - * @action admin_notices |
|
29 | - */ |
|
30 | - public function filterAdminNotices() |
|
31 | - { |
|
32 | - $screen = glsr_current_screen(); |
|
33 | - $this->renderWelcomeNotice($screen->post_type); |
|
34 | - $this->renderRebusifyNotice($screen->post_type); |
|
35 | - $this->renderAddonsNotice($screen->id); |
|
36 | - } |
|
26 | + /** |
|
27 | + * @return void |
|
28 | + * @action admin_notices |
|
29 | + */ |
|
30 | + public function filterAdminNotices() |
|
31 | + { |
|
32 | + $screen = glsr_current_screen(); |
|
33 | + $this->renderWelcomeNotice($screen->post_type); |
|
34 | + $this->renderRebusifyNotice($screen->post_type); |
|
35 | + $this->renderAddonsNotice($screen->id); |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * @return void |
|
40 | - */ |
|
41 | - public function routerDismissNotice(array $request) |
|
42 | - { |
|
43 | - if ($key = Arr::get($request, 'notice')) { |
|
44 | - $this->dismissNotice($key); |
|
45 | - } |
|
46 | - } |
|
38 | + /** |
|
39 | + * @return void |
|
40 | + */ |
|
41 | + public function routerDismissNotice(array $request) |
|
42 | + { |
|
43 | + if ($key = Arr::get($request, 'notice')) { |
|
44 | + $this->dismissNotice($key); |
|
45 | + } |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @param string $key |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - protected function dismissNotice($key) |
|
53 | - { |
|
54 | - $this->setUserMeta($key, $this->getVersionFor($key)); |
|
55 | - } |
|
48 | + /** |
|
49 | + * @param string $key |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + protected function dismissNotice($key) |
|
53 | + { |
|
54 | + $this->setUserMeta($key, $this->getVersionFor($key)); |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @param string $key |
|
59 | - * @param mixed $fallback |
|
60 | - * @return mixed |
|
61 | - */ |
|
62 | - protected function getUserMeta($key, $fallback) |
|
63 | - { |
|
64 | - $meta = get_user_meta(get_current_user_id(), static::USER_META_KEY, true); |
|
65 | - return Arr::get($meta, $key, $fallback); |
|
66 | - } |
|
57 | + /** |
|
58 | + * @param string $key |
|
59 | + * @param mixed $fallback |
|
60 | + * @return mixed |
|
61 | + */ |
|
62 | + protected function getUserMeta($key, $fallback) |
|
63 | + { |
|
64 | + $meta = get_user_meta(get_current_user_id(), static::USER_META_KEY, true); |
|
65 | + return Arr::get($meta, $key, $fallback); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param string $noticeKey |
|
70 | - * @return string |
|
71 | - */ |
|
72 | - protected function getVersionFor($noticeKey) |
|
73 | - { |
|
74 | - return Arr::get($this->dismissValuesMap, $noticeKey, glsr()->version('major')); |
|
75 | - } |
|
68 | + /** |
|
69 | + * @param string $noticeKey |
|
70 | + * @return string |
|
71 | + */ |
|
72 | + protected function getVersionFor($noticeKey) |
|
73 | + { |
|
74 | + return Arr::get($this->dismissValuesMap, $noticeKey, glsr()->version('major')); |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * @param string $screenId |
|
79 | - * @return void |
|
80 | - */ |
|
81 | - protected function renderAddonsNotice($screenId) |
|
82 | - { |
|
83 | - if (Application::POST_TYPE.'_page_addons' == $screenId) { |
|
84 | - glsr()->render('partials/notices/addons'); |
|
85 | - } |
|
86 | - } |
|
77 | + /** |
|
78 | + * @param string $screenId |
|
79 | + * @return void |
|
80 | + */ |
|
81 | + protected function renderAddonsNotice($screenId) |
|
82 | + { |
|
83 | + if (Application::POST_TYPE.'_page_addons' == $screenId) { |
|
84 | + glsr()->render('partials/notices/addons'); |
|
85 | + } |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @param string $screenPostType |
|
90 | - * @return void |
|
91 | - */ |
|
92 | - protected function renderRebusifyNotice($screenPostType) |
|
93 | - { |
|
94 | - if (Application::POST_TYPE == $screenPostType |
|
95 | - && version_compare($this->getVersionFor('rebusify'), $this->getUserMeta('rebusify', 0), '>') |
|
96 | - && !glsr(OptionManager::class)->getBool('settings.general.rebusify')) { |
|
97 | - glsr()->render('partials/notices/rebusify'); |
|
98 | - } |
|
99 | - } |
|
88 | + /** |
|
89 | + * @param string $screenPostType |
|
90 | + * @return void |
|
91 | + */ |
|
92 | + protected function renderRebusifyNotice($screenPostType) |
|
93 | + { |
|
94 | + if (Application::POST_TYPE == $screenPostType |
|
95 | + && version_compare($this->getVersionFor('rebusify'), $this->getUserMeta('rebusify', 0), '>') |
|
96 | + && !glsr(OptionManager::class)->getBool('settings.general.rebusify')) { |
|
97 | + glsr()->render('partials/notices/rebusify'); |
|
98 | + } |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * @param string $screenPostType |
|
103 | - * @return void |
|
104 | - */ |
|
105 | - protected function renderWelcomeNotice($screenPostType) |
|
106 | - { |
|
107 | - if (Application::POST_TYPE == $screenPostType |
|
108 | - && version_compare($this->getVersionFor('welcome'), $this->getUserMeta('welcome', 0), '>')) { |
|
109 | - $welcomeText = '0.0.0' == glsr(OptionManager::class)->get('version_upgraded_from') |
|
110 | - ? __('Thanks for installing Site Reviews %s, we hope you love it!', 'site-reviews') |
|
111 | - : __('Thanks for updating to Site Reviews %s, we hope you love the changes!', 'site-reviews'); |
|
112 | - glsr()->render('partials/notices/welcome', [ |
|
113 | - 'text' => sprintf($welcomeText, glsr()->version), |
|
114 | - ]); |
|
115 | - } |
|
116 | - } |
|
101 | + /** |
|
102 | + * @param string $screenPostType |
|
103 | + * @return void |
|
104 | + */ |
|
105 | + protected function renderWelcomeNotice($screenPostType) |
|
106 | + { |
|
107 | + if (Application::POST_TYPE == $screenPostType |
|
108 | + && version_compare($this->getVersionFor('welcome'), $this->getUserMeta('welcome', 0), '>')) { |
|
109 | + $welcomeText = '0.0.0' == glsr(OptionManager::class)->get('version_upgraded_from') |
|
110 | + ? __('Thanks for installing Site Reviews %s, we hope you love it!', 'site-reviews') |
|
111 | + : __('Thanks for updating to Site Reviews %s, we hope you love the changes!', 'site-reviews'); |
|
112 | + glsr()->render('partials/notices/welcome', [ |
|
113 | + 'text' => sprintf($welcomeText, glsr()->version), |
|
114 | + ]); |
|
115 | + } |
|
116 | + } |
|
117 | 117 | |
118 | - /** |
|
119 | - * @param string $key |
|
120 | - * @param mixed $fallback |
|
121 | - * @return mixed |
|
122 | - */ |
|
123 | - protected function setUserMeta($key, $value) |
|
124 | - { |
|
125 | - $userId = get_current_user_id(); |
|
126 | - $meta = (array) get_user_meta($userId, static::USER_META_KEY, true); |
|
127 | - $meta = array_filter(wp_parse_args($meta, [])); |
|
128 | - $meta[$key] = $value; |
|
129 | - update_user_meta($userId, static::USER_META_KEY, $meta); |
|
130 | - } |
|
118 | + /** |
|
119 | + * @param string $key |
|
120 | + * @param mixed $fallback |
|
121 | + * @return mixed |
|
122 | + */ |
|
123 | + protected function setUserMeta($key, $value) |
|
124 | + { |
|
125 | + $userId = get_current_user_id(); |
|
126 | + $meta = (array) get_user_meta($userId, static::USER_META_KEY, true); |
|
127 | + $meta = array_filter(wp_parse_args($meta, [])); |
|
128 | + $meta[$key] = $value; |
|
129 | + update_user_meta($userId, static::USER_META_KEY, $meta); |
|
130 | + } |
|
131 | 131 | } |