@@ -29,17 +29,17 @@ discard block |
||
29 | 29 | * @param string $name |
30 | 30 | * @return void|array |
31 | 31 | */ |
32 | - public function __call($name, array $args = []) |
|
32 | + public function __call( $name, array $args = [] ) |
|
33 | 33 | { |
34 | - if (!method_exists($this, $name) || !in_array($name, $this->callable)) { |
|
34 | + if( !method_exists( $this, $name ) || !in_array( $name, $this->callable ) ) { |
|
35 | 35 | return; |
36 | 36 | } |
37 | - $args[0] = $this->mapKeys(Arr::get($args, 0, [])); |
|
38 | - $defaults = call_user_func_array([$this, $name], $args); |
|
39 | - $hookName = (new ReflectionClass($this))->getShortName(); |
|
40 | - $hookName = str_replace('Defaults', '', $hookName); |
|
41 | - $hookName = Str::dashCase($hookName); |
|
42 | - return apply_filters('site-reviews/defaults/'.$hookName, $defaults, $name); |
|
37 | + $args[0] = $this->mapKeys( Arr::get( $args, 0, [] ) ); |
|
38 | + $defaults = call_user_func_array( [$this, $name], $args ); |
|
39 | + $hookName = (new ReflectionClass( $this ))->getShortName(); |
|
40 | + $hookName = str_replace( 'Defaults', '', $hookName ); |
|
41 | + $hookName = Str::dashCase( $hookName ); |
|
42 | + return apply_filters( 'site-reviews/defaults/'.$hookName, $defaults, $name ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -50,38 +50,38 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * @return array |
52 | 52 | */ |
53 | - protected function filter(array $values = []) |
|
53 | + protected function filter( array $values = [] ) |
|
54 | 54 | { |
55 | - return $this->normalize($this->merge(array_filter($values)), $values); |
|
55 | + return $this->normalize( $this->merge( array_filter( $values ) ), $values ); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
59 | 59 | * @return string |
60 | 60 | */ |
61 | - protected function filteredJson(array $values = []) |
|
61 | + protected function filteredJson( array $values = [] ) |
|
62 | 62 | { |
63 | 63 | $defaults = $this->flattenArray( |
64 | - array_diff_key($this->defaults(), array_flip($this->guarded)) |
|
64 | + array_diff_key( $this->defaults(), array_flip( $this->guarded ) ) |
|
65 | 65 | ); |
66 | 66 | $values = $this->flattenArray( |
67 | - shortcode_atts($defaults, $values) |
|
67 | + shortcode_atts( $defaults, $values ) |
|
68 | 68 | ); |
69 | - $filtered = array_filter(array_diff_assoc($values, $defaults), function ($value) { |
|
70 | - return !$this->isEmpty($value); |
|
69 | + $filtered = array_filter( array_diff_assoc( $values, $defaults ), function( $value ) { |
|
70 | + return !$this->isEmpty( $value ); |
|
71 | 71 | }); |
72 | - return json_encode($filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); |
|
72 | + return json_encode( $filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
76 | 76 | * @return array |
77 | 77 | */ |
78 | - protected function flattenArray(array $values) |
|
78 | + protected function flattenArray( array $values ) |
|
79 | 79 | { |
80 | - array_walk($values, function (&$value) { |
|
81 | - if (!is_array($value)) { |
|
80 | + array_walk( $values, function( &$value ) { |
|
81 | + if( !is_array( $value ) ) { |
|
82 | 82 | return; |
83 | 83 | } |
84 | - $value = implode(',', $value); |
|
84 | + $value = implode( ',', $value ); |
|
85 | 85 | }); |
86 | 86 | return $values; |
87 | 87 | } |
@@ -90,18 +90,18 @@ discard block |
||
90 | 90 | * @param mixed $var |
91 | 91 | * @return bool |
92 | 92 | */ |
93 | - protected function isEmpty($var) |
|
93 | + protected function isEmpty( $var ) |
|
94 | 94 | { |
95 | - return !is_numeric($var) && !is_bool($var) && empty($var); |
|
95 | + return !is_numeric( $var ) && !is_bool( $var ) && empty($var); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | 99 | * @return array |
100 | 100 | */ |
101 | - protected function mapKeys(array $args) |
|
101 | + protected function mapKeys( array $args ) |
|
102 | 102 | { |
103 | - foreach ($this->mapped as $old => $new) { |
|
104 | - if (array_key_exists($old, $args)) { |
|
103 | + foreach( $this->mapped as $old => $new ) { |
|
104 | + if( array_key_exists( $old, $args ) ) { |
|
105 | 105 | $args[$new] = $args[$old]; |
106 | 106 | unset($args[$old]); |
107 | 107 | } |
@@ -112,26 +112,26 @@ discard block |
||
112 | 112 | /** |
113 | 113 | * @return array |
114 | 114 | */ |
115 | - protected function merge(array $values = []) |
|
115 | + protected function merge( array $values = [] ) |
|
116 | 116 | { |
117 | - return $this->normalize(wp_parse_args($values, $this->defaults()), $values); |
|
117 | + return $this->normalize( wp_parse_args( $values, $this->defaults() ), $values ); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | 121 | * @return array |
122 | 122 | */ |
123 | - protected function normalize(array $values, array $originalValues) |
|
123 | + protected function normalize( array $values, array $originalValues ) |
|
124 | 124 | { |
125 | - $values['json'] = $this->filteredJson($originalValues); |
|
125 | + $values['json'] = $this->filteredJson( $originalValues ); |
|
126 | 126 | return $values; |
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
130 | 130 | * @return array |
131 | 131 | */ |
132 | - protected function restrict(array $values = []) |
|
132 | + protected function restrict( array $values = [] ) |
|
133 | 133 | { |
134 | - return $this->normalize(shortcode_atts($this->defaults(), $values), $values); |
|
134 | + return $this->normalize( shortcode_atts( $this->defaults(), $values ), $values ); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -139,6 +139,6 @@ discard block |
||
139 | 139 | */ |
140 | 140 | protected function unguarded() |
141 | 141 | { |
142 | - return array_diff_key($this->defaults(), array_flip($this->guarded)); |
|
142 | + return array_diff_key( $this->defaults(), array_flip( $this->guarded ) ); |
|
143 | 143 | } |
144 | 144 | } |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | * @param string $test |
13 | 13 | * @return string |
14 | 14 | */ |
15 | - public function filterPostStatusLabels($translation, $text) |
|
15 | + public function filterPostStatusLabels( $translation, $text ) |
|
16 | 16 | { |
17 | 17 | $replacements = $this->getStatusLabels(); |
18 | - return array_key_exists($text, $replacements) |
|
18 | + return array_key_exists( $text, $replacements ) |
|
19 | 19 | ? $replacements[$text] |
20 | 20 | : $translation; |
21 | 21 | } |
@@ -23,18 +23,18 @@ discard block |
||
23 | 23 | /** |
24 | 24 | * @return array |
25 | 25 | */ |
26 | - public function filterUpdateMessages(array $messages) |
|
26 | + public function filterUpdateMessages( array $messages ) |
|
27 | 27 | { |
28 | 28 | $post = get_post(); |
29 | - if (!($post instanceof WP_Post)) { |
|
29 | + if( !($post instanceof WP_Post) ) { |
|
30 | 30 | return; |
31 | 31 | } |
32 | 32 | $strings = $this->getReviewLabels(); |
33 | - $restored = filter_input(INPUT_GET, 'revision'); |
|
34 | - if ($revisionTitle = wp_post_revision_title(intval($restored), false)) { |
|
35 | - $restored = sprintf($strings['restored'], $revisionTitle); |
|
33 | + $restored = filter_input( INPUT_GET, 'revision' ); |
|
34 | + if( $revisionTitle = wp_post_revision_title( intval( $restored ), false ) ) { |
|
35 | + $restored = sprintf( $strings['restored'], $revisionTitle ); |
|
36 | 36 | } |
37 | - $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date)); |
|
37 | + $scheduled_date = date_i18n( 'M j, Y @ H:i', strtotime( $post->post_date ) ); |
|
38 | 38 | $messages[Application::POST_TYPE] = [ |
39 | 39 | 1 => $strings['updated'], |
40 | 40 | 4 => $strings['updated'], |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | 6 => $strings['published'], |
43 | 43 | 7 => $strings['saved'], |
44 | 44 | 8 => $strings['submitted'], |
45 | - 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'), |
|
45 | + 9 => sprintf( $strings['scheduled'], '<strong>'.$scheduled_date.'</strong>' ), |
|
46 | 46 | 10 => $strings['draft_updated'], |
47 | 47 | 50 => $strings['approved'], |
48 | 48 | 51 => $strings['unapproved'], |
@@ -58,13 +58,13 @@ discard block |
||
58 | 58 | { |
59 | 59 | global $wp_scripts; |
60 | 60 | $strings = [ |
61 | - 'savePending' => __('Save as Unapproved', 'site-reviews'), |
|
62 | - 'published' => __('Approved', 'site-reviews'), |
|
61 | + 'savePending' => __( 'Save as Unapproved', 'site-reviews' ), |
|
62 | + 'published' => __( 'Approved', 'site-reviews' ), |
|
63 | 63 | ]; |
64 | - if (isset($wp_scripts->registered['post']->extra['data'])) { |
|
64 | + if( isset($wp_scripts->registered['post']->extra['data']) ) { |
|
65 | 65 | $l10n = &$wp_scripts->registered['post']->extra['data']; |
66 | - foreach ($strings as $search => $replace) { |
|
67 | - $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n); |
|
66 | + foreach( $strings as $search => $replace ) { |
|
67 | + $l10n = preg_replace( '/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n ); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | } |
@@ -75,18 +75,18 @@ discard block |
||
75 | 75 | protected function getReviewLabels() |
76 | 76 | { |
77 | 77 | return [ |
78 | - 'approved' => __('Review has been approved and published.', 'site-reviews'), |
|
79 | - 'draft_updated' => __('Review draft updated.', 'site-reviews'), |
|
80 | - 'preview' => __('Preview review', 'site-reviews'), |
|
81 | - 'published' => __('Review approved and published.', 'site-reviews'), |
|
82 | - 'restored' => __('Review restored to revision from %s.', 'site-reviews'), |
|
83 | - 'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'), |
|
84 | - 'saved' => __('Review saved.', 'site-reviews'), |
|
85 | - 'scheduled' => __('Review scheduled for: %s.', 'site-reviews'), |
|
86 | - 'submitted' => __('Review submitted.', 'site-reviews'), |
|
87 | - 'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'), |
|
88 | - 'updated' => __('Review updated.', 'site-reviews'), |
|
89 | - 'view' => __('View review', 'site-reviews'), |
|
78 | + 'approved' => __( 'Review has been approved and published.', 'site-reviews' ), |
|
79 | + 'draft_updated' => __( 'Review draft updated.', 'site-reviews' ), |
|
80 | + 'preview' => __( 'Preview review', 'site-reviews' ), |
|
81 | + 'published' => __( 'Review approved and published.', 'site-reviews' ), |
|
82 | + 'restored' => __( 'Review restored to revision from %s.', 'site-reviews' ), |
|
83 | + 'reverted' => __( 'Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews' ), |
|
84 | + 'saved' => __( 'Review saved.', 'site-reviews' ), |
|
85 | + 'scheduled' => __( 'Review scheduled for: %s.', 'site-reviews' ), |
|
86 | + 'submitted' => __( 'Review submitted.', 'site-reviews' ), |
|
87 | + 'unapproved' => __( 'Review has been unapproved and is now pending.', 'site-reviews' ), |
|
88 | + 'updated' => __( 'Review updated.', 'site-reviews' ), |
|
89 | + 'view' => __( 'View review', 'site-reviews' ), |
|
90 | 90 | ]; |
91 | 91 | } |
92 | 92 | |
@@ -97,14 +97,14 @@ discard block |
||
97 | 97 | protected function getStatusLabels() |
98 | 98 | { |
99 | 99 | static $labels; |
100 | - if (empty($labels)) { |
|
100 | + if( empty($labels) ) { |
|
101 | 101 | $labels = [ |
102 | - 'Pending' => __('Unapproved', 'site-reviews'), |
|
103 | - 'Pending Review' => __('Unapproved', 'site-reviews'), |
|
104 | - 'Privately Published' => __('Privately Approved', 'site-reviews'), |
|
105 | - 'Publish' => __('Approve', 'site-reviews'), |
|
106 | - 'Published' => __('Approved', 'site-reviews'), |
|
107 | - 'Save as Pending' => __('Save as Unapproved', 'site-reviews'), |
|
102 | + 'Pending' => __( 'Unapproved', 'site-reviews' ), |
|
103 | + 'Pending Review' => __( 'Unapproved', 'site-reviews' ), |
|
104 | + 'Privately Published' => __( 'Privately Approved', 'site-reviews' ), |
|
105 | + 'Publish' => __( 'Approve', 'site-reviews' ), |
|
106 | + 'Published' => __( 'Approved', 'site-reviews' ), |
|
107 | + 'Save as Pending' => __( 'Save as Unapproved', 'site-reviews' ), |
|
108 | 108 | ]; |
109 | 109 | } |
110 | 110 | return $labels; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public static function load() |
47 | 47 | { |
48 | - if (empty(static::$instance)) { |
|
48 | + if( empty(static::$instance) ) { |
|
49 | 49 | static::$instance = new static(); |
50 | 50 | } |
51 | 51 | return static::$instance; |
@@ -55,16 +55,16 @@ discard block |
||
55 | 55 | * @param string $property |
56 | 56 | * @return mixed |
57 | 57 | */ |
58 | - public function __get($property) |
|
58 | + public function __get( $property ) |
|
59 | 59 | { |
60 | - if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) { |
|
60 | + if( property_exists( $this, $property ) && !in_array( $property, static::PROTECTED_PROPERTIES ) ) { |
|
61 | 61 | return $this->$property; |
62 | 62 | } |
63 | - $constant = 'static::'.strtoupper(Str::snakeCase($property)); |
|
64 | - if (defined($constant)) { |
|
65 | - return constant($constant); |
|
63 | + $constant = 'static::'.strtoupper( Str::snakeCase( $property ) ); |
|
64 | + if( defined( $constant ) ) { |
|
65 | + return constant( $constant ); |
|
66 | 66 | } |
67 | - return Arr::get($this->storage, $property, null); |
|
67 | + return Arr::get( $this->storage, $property, null ); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | * @param string $value |
73 | 73 | * @return void |
74 | 74 | */ |
75 | - public function __set($property, $value) |
|
75 | + public function __set( $property, $value ) |
|
76 | 76 | { |
77 | - if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) { |
|
77 | + if( !property_exists( $this, $property ) || in_array( $property, static::PROTECTED_PROPERTIES ) ) { |
|
78 | 78 | $this->storage[$property] = $value; |
79 | - } elseif (!isset($this->$property)) { |
|
79 | + } elseif( !isset($this->$property) ) { |
|
80 | 80 | $this->$property = $value; |
81 | 81 | } else { |
82 | - throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property)); |
|
82 | + throw new Exception( sprintf( 'The "%s" property cannot be changed once set.', $property ) ); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @param mixed $concrete |
90 | 90 | * @return mixed |
91 | 91 | */ |
92 | - public function bind($alias, $concrete) |
|
92 | + public function bind( $alias, $concrete ) |
|
93 | 93 | { |
94 | 94 | $this->services[$alias] = $concrete; |
95 | 95 | } |
@@ -99,21 +99,21 @@ discard block |
||
99 | 99 | * @param mixed $abstract |
100 | 100 | * @return mixed |
101 | 101 | */ |
102 | - public function make($abstract) |
|
102 | + public function make( $abstract ) |
|
103 | 103 | { |
104 | - if (!isset($this->services[$abstract])) { |
|
105 | - $abstract = $this->addNamespace($abstract); |
|
104 | + if( !isset($this->services[$abstract]) ) { |
|
105 | + $abstract = $this->addNamespace( $abstract ); |
|
106 | 106 | } |
107 | - if (isset($this->services[$abstract])) { |
|
107 | + if( isset($this->services[$abstract]) ) { |
|
108 | 108 | $abstract = $this->services[$abstract]; |
109 | 109 | } |
110 | - if (is_callable($abstract)) { |
|
111 | - return call_user_func_array($abstract, [$this]); |
|
110 | + if( is_callable( $abstract ) ) { |
|
111 | + return call_user_func_array( $abstract, [$this] ); |
|
112 | 112 | } |
113 | - if (is_object($abstract)) { |
|
113 | + if( is_object( $abstract ) ) { |
|
114 | 114 | return $abstract; |
115 | 115 | } |
116 | - return $this->resolve($abstract); |
|
116 | + return $this->resolve( $abstract ); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -127,9 +127,9 @@ discard block |
||
127 | 127 | /** |
128 | 128 | * @return mixed |
129 | 129 | */ |
130 | - public function sessionGet($key, $fallback = '') |
|
130 | + public function sessionGet( $key, $fallback = '' ) |
|
131 | 131 | { |
132 | - $value = Arr::get($this->session, $key, $fallback); |
|
132 | + $value = Arr::get( $this->session, $key, $fallback ); |
|
133 | 133 | unset($this->session[$key]); |
134 | 134 | return $value; |
135 | 135 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | /** |
138 | 138 | * @return void |
139 | 139 | */ |
140 | - public function sessionSet($key, $value) |
|
140 | + public function sessionSet( $key, $value ) |
|
141 | 141 | { |
142 | 142 | $this->session[$key] = $value; |
143 | 143 | } |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * @param callable|string|null $binding |
149 | 149 | * @return void |
150 | 150 | */ |
151 | - public function singleton($alias, $binding) |
|
151 | + public function singleton( $alias, $binding ) |
|
152 | 152 | { |
153 | - $this->bind($alias, $this->make($binding)); |
|
153 | + $this->bind( $alias, $this->make( $binding ) ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -158,9 +158,9 @@ discard block |
||
158 | 158 | * @param string $abstract |
159 | 159 | * @return string |
160 | 160 | */ |
161 | - protected function addNamespace($abstract) |
|
161 | + protected function addNamespace( $abstract ) |
|
162 | 162 | { |
163 | - if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) { |
|
163 | + if( !Str::contains( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) { |
|
164 | 164 | $abstract = __NAMESPACE__.'\\'.$abstract; |
165 | 165 | } |
166 | 166 | return $abstract; |
@@ -172,21 +172,21 @@ discard block |
||
172 | 172 | * @return mixed |
173 | 173 | * @throws Exception |
174 | 174 | */ |
175 | - protected function resolve($concrete) |
|
175 | + protected function resolve( $concrete ) |
|
176 | 176 | { |
177 | - if ($concrete instanceof Closure) { |
|
178 | - return $concrete($this); |
|
177 | + if( $concrete instanceof Closure ) { |
|
178 | + return $concrete( $this ); |
|
179 | 179 | } |
180 | - $reflector = new ReflectionClass($concrete); |
|
181 | - if (!$reflector->isInstantiable()) { |
|
182 | - throw new Exception('Target ['.$concrete.'] is not instantiable.'); |
|
180 | + $reflector = new ReflectionClass( $concrete ); |
|
181 | + if( !$reflector->isInstantiable() ) { |
|
182 | + throw new Exception( 'Target ['.$concrete.'] is not instantiable.' ); |
|
183 | 183 | } |
184 | 184 | $constructor = $reflector->getConstructor(); |
185 | - if (empty($constructor)) { |
|
185 | + if( empty($constructor) ) { |
|
186 | 186 | return new $concrete(); |
187 | 187 | } |
188 | 188 | return $reflector->newInstanceArgs( |
189 | - $this->resolveDependencies($constructor->getParameters()) |
|
189 | + $this->resolveDependencies( $constructor->getParameters() ) |
|
190 | 190 | ); |
191 | 191 | } |
192 | 192 | |
@@ -195,12 +195,12 @@ discard block |
||
195 | 195 | * @return mixed |
196 | 196 | * @throws Exception |
197 | 197 | */ |
198 | - protected function resolveClass(ReflectionParameter $parameter) |
|
198 | + protected function resolveClass( ReflectionParameter $parameter ) |
|
199 | 199 | { |
200 | 200 | try { |
201 | - return $this->make($parameter->getClass()->name); |
|
202 | - } catch (Exception $error) { |
|
203 | - if ($parameter->isOptional()) { |
|
201 | + return $this->make( $parameter->getClass()->name ); |
|
202 | + } catch( Exception $error ) { |
|
203 | + if( $parameter->isOptional() ) { |
|
204 | 204 | return $parameter->getDefaultValue(); |
205 | 205 | } |
206 | 206 | throw $error; |
@@ -211,13 +211,13 @@ discard block |
||
211 | 211 | * Resolve all of the dependencies from the ReflectionParameters. |
212 | 212 | * @return array |
213 | 213 | */ |
214 | - protected function resolveDependencies(array $dependencies) |
|
214 | + protected function resolveDependencies( array $dependencies ) |
|
215 | 215 | { |
216 | 216 | $results = []; |
217 | - foreach ($dependencies as $dependency) { |
|
218 | - $results[] = !is_null($class = $dependency->getClass()) |
|
219 | - ? $this->resolveClass($dependency) |
|
220 | - : $this->resolveDependency($dependency); |
|
217 | + foreach( $dependencies as $dependency ) { |
|
218 | + $results[] = !is_null( $class = $dependency->getClass() ) |
|
219 | + ? $this->resolveClass( $dependency ) |
|
220 | + : $this->resolveDependency( $dependency ); |
|
221 | 221 | } |
222 | 222 | return $results; |
223 | 223 | } |
@@ -226,9 +226,9 @@ discard block |
||
226 | 226 | * Resolve a single ReflectionParameter dependency. |
227 | 227 | * @return array|null |
228 | 228 | */ |
229 | - protected function resolveDependency(ReflectionParameter $parameter) |
|
229 | + protected function resolveDependency( ReflectionParameter $parameter ) |
|
230 | 230 | { |
231 | - if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) { |
|
231 | + if( $parameter->isArray() && $parameter->isDefaultValueAvailable() ) { |
|
232 | 232 | return $parameter->getDefaultValue(); |
233 | 233 | } |
234 | 234 | return null; |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | public function all() |
31 | 31 | { |
32 | 32 | $translations = $this->translations(); |
33 | - $entries = $this->filter($translations, $this->entries())->results(); |
|
34 | - array_walk($translations, function (&$entry) use ($entries) { |
|
35 | - $entry['desc'] = array_key_exists($entry['id'], $entries) |
|
36 | - ? $this->getEntryString($entries[$entry['id']], 'msgctxt') |
|
33 | + $entries = $this->filter( $translations, $this->entries() )->results(); |
|
34 | + array_walk( $translations, function( &$entry ) use ($entries) { |
|
35 | + $entry['desc'] = array_key_exists( $entry['id'], $entries ) |
|
36 | + ? $this->getEntryString( $entries[$entry['id']], 'msgctxt' ) |
|
37 | 37 | : ''; |
38 | 38 | }); |
39 | 39 | return $translations; |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function entries() |
46 | 46 | { |
47 | - if (!isset($this->entries)) { |
|
48 | - $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot'); |
|
49 | - $entries = $this->extractEntriesFromPotFile($potFile); |
|
50 | - $entries = apply_filters('site-reviews/translation/entries', $entries); |
|
47 | + if( !isset($this->entries) ) { |
|
48 | + $potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' ); |
|
49 | + $entries = $this->extractEntriesFromPotFile( $potFile ); |
|
50 | + $entries = apply_filters( 'site-reviews/translation/entries', $entries ); |
|
51 | 51 | $this->entries = $entries; |
52 | 52 | } |
53 | 53 | return $this->entries; |
@@ -58,24 +58,24 @@ discard block |
||
58 | 58 | * @param array|null $entries |
59 | 59 | * @return static |
60 | 60 | */ |
61 | - public function exclude($entriesToExclude = null, $entries = null) |
|
61 | + public function exclude( $entriesToExclude = null, $entries = null ) |
|
62 | 62 | { |
63 | - return $this->filter($entriesToExclude, $entries, false); |
|
63 | + return $this->filter( $entriesToExclude, $entries, false ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | 67 | * @param string $potFile |
68 | 68 | * @return array |
69 | 69 | */ |
70 | - public function extractEntriesFromPotFile($potFile, array $entries = []) |
|
70 | + public function extractEntriesFromPotFile( $potFile, array $entries = [] ) |
|
71 | 71 | { |
72 | 72 | try { |
73 | - $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries()); |
|
74 | - foreach ($potEntries as $key => $entry) { |
|
75 | - $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry; |
|
73 | + $potEntries = $this->normalize( Parser::parseFile( $potFile )->getEntries() ); |
|
74 | + foreach( $potEntries as $key => $entry ) { |
|
75 | + $entries[html_entity_decode( $key, ENT_COMPAT, 'UTF-8' )] = $entry; |
|
76 | 76 | } |
77 | - } catch (Exception $e) { |
|
78 | - glsr_log()->error($e->getMessage()); |
|
77 | + } catch( Exception $e ) { |
|
78 | + glsr_log()->error( $e->getMessage() ); |
|
79 | 79 | } |
80 | 80 | return $entries; |
81 | 81 | } |
@@ -86,18 +86,18 @@ discard block |
||
86 | 86 | * @param bool $intersect |
87 | 87 | * @return static |
88 | 88 | */ |
89 | - public function filter($filterWith = null, $entries = null, $intersect = true) |
|
89 | + public function filter( $filterWith = null, $entries = null, $intersect = true ) |
|
90 | 90 | { |
91 | - if (!is_array($entries)) { |
|
91 | + if( !is_array( $entries ) ) { |
|
92 | 92 | $entries = $this->results; |
93 | 93 | } |
94 | - if (!is_array($filterWith)) { |
|
94 | + if( !is_array( $filterWith ) ) { |
|
95 | 95 | $filterWith = $this->translations(); |
96 | 96 | } |
97 | - $keys = array_flip(glsr_array_column($filterWith, 'id')); |
|
97 | + $keys = array_flip( glsr_array_column( $filterWith, 'id' ) ); |
|
98 | 98 | $this->results = $intersect |
99 | - ? array_intersect_key($entries, $keys) |
|
100 | - : array_diff_key($entries, $keys); |
|
99 | + ? array_intersect_key( $entries, $keys ) |
|
100 | + : array_diff_key( $entries, $keys ); |
|
101 | 101 | return $this; |
102 | 102 | } |
103 | 103 | |
@@ -105,20 +105,20 @@ discard block |
||
105 | 105 | * @param string $template |
106 | 106 | * @return string |
107 | 107 | */ |
108 | - public function render($template, array $entry) |
|
108 | + public function render( $template, array $entry ) |
|
109 | 109 | { |
110 | 110 | $data = array_combine( |
111 | - array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)), |
|
111 | + array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ), |
|
112 | 112 | $entry |
113 | 113 | ); |
114 | 114 | $data['data.class'] = $data['data.error'] = ''; |
115 | - if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) { |
|
115 | + if( false === array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' ) ) ) { |
|
116 | 116 | $data['data.class'] = 'is-invalid'; |
117 | - $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews'); |
|
117 | + $data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' ); |
|
118 | 118 | } |
119 | - return glsr(Template::class)->build('partials/translations/'.$template, [ |
|
120 | - 'context' => array_map('esc_html', $data), |
|
121 | - ]); |
|
119 | + return glsr( Template::class )->build( 'partials/translations/'.$template, [ |
|
120 | + 'context' => array_map( 'esc_html', $data ), |
|
121 | + ] ); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -128,10 +128,10 @@ discard block |
||
128 | 128 | public function renderAll() |
129 | 129 | { |
130 | 130 | $rendered = ''; |
131 | - foreach ($this->all() as $index => $entry) { |
|
131 | + foreach( $this->all() as $index => $entry ) { |
|
132 | 132 | $entry['index'] = $index; |
133 | 133 | $entry['prefix'] = OptionManager::databaseKey(); |
134 | - $rendered.= $this->render($entry['type'], $entry); |
|
134 | + $rendered .= $this->render( $entry['type'], $entry ); |
|
135 | 135 | } |
136 | 136 | return $rendered; |
137 | 137 | } |
@@ -140,25 +140,25 @@ discard block |
||
140 | 140 | * @param bool $resetAfterRender |
141 | 141 | * @return string |
142 | 142 | */ |
143 | - public function renderResults($resetAfterRender = true) |
|
143 | + public function renderResults( $resetAfterRender = true ) |
|
144 | 144 | { |
145 | 145 | $rendered = ''; |
146 | - foreach ($this->results as $id => $entry) { |
|
146 | + foreach( $this->results as $id => $entry ) { |
|
147 | 147 | $data = [ |
148 | - 'desc' => $this->getEntryString($entry, 'msgctxt'), |
|
148 | + 'desc' => $this->getEntryString( $entry, 'msgctxt' ), |
|
149 | 149 | 'id' => $id, |
150 | - 'p1' => $this->getEntryString($entry, 'msgid_plural'), |
|
151 | - 's1' => $this->getEntryString($entry, 'msgid'), |
|
150 | + 'p1' => $this->getEntryString( $entry, 'msgid_plural' ), |
|
151 | + 's1' => $this->getEntryString( $entry, 'msgid' ), |
|
152 | 152 | ]; |
153 | 153 | $text = !empty($data['p1']) |
154 | - ? sprintf('%s | %s', $data['s1'], $data['p1']) |
|
154 | + ? sprintf( '%s | %s', $data['s1'], $data['p1'] ) |
|
155 | 155 | : $data['s1']; |
156 | - $rendered.= $this->render('result', [ |
|
157 | - 'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), |
|
158 | - 'text' => wp_strip_all_tags($text), |
|
159 | - ]); |
|
156 | + $rendered .= $this->render( 'result', [ |
|
157 | + 'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ), |
|
158 | + 'text' => wp_strip_all_tags( $text ), |
|
159 | + ] ); |
|
160 | 160 | } |
161 | - if ($resetAfterRender) { |
|
161 | + if( $resetAfterRender ) { |
|
162 | 162 | $this->reset(); |
163 | 163 | } |
164 | 164 | return $rendered; |
@@ -186,18 +186,18 @@ discard block |
||
186 | 186 | * @param string $needle |
187 | 187 | * @return static |
188 | 188 | */ |
189 | - public function search($needle = '') |
|
189 | + public function search( $needle = '' ) |
|
190 | 190 | { |
191 | 191 | $this->reset(); |
192 | - $needle = trim(strtolower($needle)); |
|
193 | - foreach ($this->entries() as $key => $entry) { |
|
194 | - $single = strtolower($this->getEntryString($entry, 'msgid')); |
|
195 | - $plural = strtolower($this->getEntryString($entry, 'msgid_plural')); |
|
196 | - if (strlen($needle) < static::SEARCH_THRESHOLD) { |
|
197 | - if (in_array($needle, [$single, $plural])) { |
|
192 | + $needle = trim( strtolower( $needle ) ); |
|
193 | + foreach( $this->entries() as $key => $entry ) { |
|
194 | + $single = strtolower( $this->getEntryString( $entry, 'msgid' ) ); |
|
195 | + $plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) ); |
|
196 | + if( strlen( $needle ) < static::SEARCH_THRESHOLD ) { |
|
197 | + if( in_array( $needle, [$single, $plural] ) ) { |
|
198 | 198 | $this->results[$key] = $entry; |
199 | 199 | } |
200 | - } elseif (Str::contains(sprintf('%s %s', $single, $plural), $needle)) { |
|
200 | + } elseif( Str::contains( sprintf( '%s %s', $single, $plural ), $needle ) ) { |
|
201 | 201 | $this->results[$key] = $entry; |
202 | 202 | } |
203 | 203 | } |
@@ -211,10 +211,10 @@ discard block |
||
211 | 211 | public function translations() |
212 | 212 | { |
213 | 213 | static $translations; |
214 | - if (empty($translations)) { |
|
215 | - $settings = glsr(OptionManager::class)->get('settings'); |
|
214 | + if( empty($translations) ) { |
|
215 | + $settings = glsr( OptionManager::class )->get( 'settings' ); |
|
216 | 216 | $translations = isset($settings['strings']) |
217 | - ? $this->normalizeSettings((array) $settings['strings']) |
|
217 | + ? $this->normalizeSettings( (array)$settings['strings'] ) |
|
218 | 218 | : []; |
219 | 219 | } |
220 | 220 | return $translations; |
@@ -224,28 +224,28 @@ discard block |
||
224 | 224 | * @param string $key |
225 | 225 | * @return string |
226 | 226 | */ |
227 | - protected function getEntryString(array $entry, $key) |
|
227 | + protected function getEntryString( array $entry, $key ) |
|
228 | 228 | { |
229 | 229 | return isset($entry[$key]) |
230 | - ? implode('', (array) $entry[$key]) |
|
230 | + ? implode( '', (array)$entry[$key] ) |
|
231 | 231 | : ''; |
232 | 232 | } |
233 | 233 | |
234 | 234 | /** |
235 | 235 | * @return array |
236 | 236 | */ |
237 | - protected function normalize(array $entries) |
|
237 | + protected function normalize( array $entries ) |
|
238 | 238 | { |
239 | 239 | $keys = [ |
240 | 240 | 'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]', |
241 | 241 | ]; |
242 | - array_walk($entries, function (&$entry) use ($keys) { |
|
243 | - foreach ($keys as $key) { |
|
242 | + array_walk( $entries, function( &$entry ) use ($keys) { |
|
243 | + foreach( $keys as $key ) { |
|
244 | 244 | try { |
245 | - $entry = $this->normalizeEntryString($entry, $key); |
|
246 | - } catch (\TypeError $error) { |
|
247 | - glsr_log()->once('error', 'Translation/normalize', $error); |
|
248 | - glsr_log()->once('debug', 'Translation/normalize', $entry); |
|
245 | + $entry = $this->normalizeEntryString( $entry, $key ); |
|
246 | + } catch( \TypeError $error ) { |
|
247 | + glsr_log()->once( 'error', 'Translation/normalize', $error ); |
|
248 | + glsr_log()->once( 'debug', 'Translation/normalize', $entry ); |
|
249 | 249 | } |
250 | 250 | } |
251 | 251 | }); |
@@ -256,10 +256,10 @@ discard block |
||
256 | 256 | * @param string $key |
257 | 257 | * @return array |
258 | 258 | */ |
259 | - protected function normalizeEntryString(array $entry, $key) |
|
259 | + protected function normalizeEntryString( array $entry, $key ) |
|
260 | 260 | { |
261 | - if (isset($entry[$key])) { |
|
262 | - $entry[$key] = $this->getEntryString($entry, $key); |
|
261 | + if( isset($entry[$key]) ) { |
|
262 | + $entry[$key] = $this->getEntryString( $entry, $key ); |
|
263 | 263 | } |
264 | 264 | return $entry; |
265 | 265 | } |
@@ -267,15 +267,15 @@ discard block |
||
267 | 267 | /** |
268 | 268 | * @return array |
269 | 269 | */ |
270 | - protected function normalizeSettings(array $strings) |
|
270 | + protected function normalizeSettings( array $strings ) |
|
271 | 271 | { |
272 | - $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], ''); |
|
273 | - $strings = array_filter($strings, 'is_array'); |
|
274 | - foreach ($strings as &$string) { |
|
272 | + $defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' ); |
|
273 | + $strings = array_filter( $strings, 'is_array' ); |
|
274 | + foreach( $strings as &$string ) { |
|
275 | 275 | $string['type'] = isset($string['p1']) ? 'plural' : 'single'; |
276 | - $string = wp_parse_args($string, $defaultString); |
|
276 | + $string = wp_parse_args( $string, $defaultString ); |
|
277 | 277 | } |
278 | - return array_filter($strings, function ($string) { |
|
278 | + return array_filter( $strings, function( $string ) { |
|
279 | 279 | return !empty($string['id']); |
280 | 280 | }); |
281 | 281 | } |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | * @param mixed $data |
67 | 67 | * @return array |
68 | 68 | */ |
69 | - public function validate($data, array $rules = []) |
|
69 | + public function validate( $data, array $rules = [] ) |
|
70 | 70 | { |
71 | - $this->normalizeData($data); |
|
72 | - $this->setRules($rules); |
|
73 | - foreach ($this->rules as $attribute => $rules) { |
|
74 | - foreach ($rules as $rule) { |
|
75 | - $this->validateAttribute($attribute, $rule); |
|
76 | - if ($this->shouldStopValidating($attribute)) { |
|
71 | + $this->normalizeData( $data ); |
|
72 | + $this->setRules( $rules ); |
|
73 | + foreach( $this->rules as $attribute => $rules ) { |
|
74 | + foreach( $rules as $rule ) { |
|
75 | + $this->validateAttribute( $attribute, $rule ); |
|
76 | + if( $this->shouldStopValidating( $attribute ) ) { |
|
77 | 77 | break; |
78 | 78 | } |
79 | 79 | } |
@@ -88,18 +88,18 @@ discard block |
||
88 | 88 | * @return void |
89 | 89 | * @throws BadMethodCallException |
90 | 90 | */ |
91 | - public function validateAttribute($attribute, $rule) |
|
91 | + public function validateAttribute( $attribute, $rule ) |
|
92 | 92 | { |
93 | - list($rule, $parameters) = $this->parseRule($rule); |
|
94 | - if ('' == $rule) { |
|
93 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
94 | + if( '' == $rule ) { |
|
95 | 95 | return; |
96 | 96 | } |
97 | - $value = $this->getValue($attribute); |
|
98 | - if (!method_exists($this, $method = 'validate'.$rule)) { |
|
99 | - throw new BadMethodCallException("Method [$method] does not exist."); |
|
97 | + $value = $this->getValue( $attribute ); |
|
98 | + if( !method_exists( $this, $method = 'validate'.$rule ) ) { |
|
99 | + throw new BadMethodCallException( "Method [$method] does not exist." ); |
|
100 | 100 | } |
101 | - if (!$this->$method($value, $attribute, $parameters)) { |
|
102 | - $this->addFailure($attribute, $rule, $parameters); |
|
101 | + if( !$this->$method( $value, $attribute, $parameters ) ) { |
|
102 | + $this->addFailure( $attribute, $rule, $parameters ); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | * @param string $rule |
110 | 110 | * @return void |
111 | 111 | */ |
112 | - protected function addError($attribute, $rule, array $parameters) |
|
112 | + protected function addError( $attribute, $rule, array $parameters ) |
|
113 | 113 | { |
114 | - $message = $this->getMessage($attribute, $rule, $parameters); |
|
114 | + $message = $this->getMessage( $attribute, $rule, $parameters ); |
|
115 | 115 | $this->errors[$attribute][] = $message; |
116 | 116 | } |
117 | 117 | |
@@ -121,9 +121,9 @@ discard block |
||
121 | 121 | * @param string $rule |
122 | 122 | * @return void |
123 | 123 | */ |
124 | - protected function addFailure($attribute, $rule, array $parameters) |
|
124 | + protected function addFailure( $attribute, $rule, array $parameters ) |
|
125 | 125 | { |
126 | - $this->addError($attribute, $rule, $parameters); |
|
126 | + $this->addError( $attribute, $rule, $parameters ); |
|
127 | 127 | $this->failedRules[$attribute][$rule] = $parameters; |
128 | 128 | } |
129 | 129 | |
@@ -132,9 +132,9 @@ discard block |
||
132 | 132 | * @param string $attribute |
133 | 133 | * @return string |
134 | 134 | */ |
135 | - protected function getAttributeType($attribute) |
|
135 | + protected function getAttributeType( $attribute ) |
|
136 | 136 | { |
137 | - return !$this->hasRule($attribute, $this->numericRules) |
|
137 | + return !$this->hasRule( $attribute, $this->numericRules ) |
|
138 | 138 | ? 'length' |
139 | 139 | : ''; |
140 | 140 | } |
@@ -145,13 +145,13 @@ discard block |
||
145 | 145 | * @param string $rule |
146 | 146 | * @return string|null |
147 | 147 | */ |
148 | - protected function getMessage($attribute, $rule, array $parameters) |
|
148 | + protected function getMessage( $attribute, $rule, array $parameters ) |
|
149 | 149 | { |
150 | - if (in_array($rule, $this->sizeRules)) { |
|
151 | - return $this->getSizeMessage($attribute, $rule, $parameters); |
|
150 | + if( in_array( $rule, $this->sizeRules ) ) { |
|
151 | + return $this->getSizeMessage( $attribute, $rule, $parameters ); |
|
152 | 152 | } |
153 | - $lowerRule = Str::snakeCase($rule); |
|
154 | - return $this->translator($lowerRule, $parameters); |
|
153 | + $lowerRule = Str::snakeCase( $rule ); |
|
154 | + return $this->translator( $lowerRule, $parameters ); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -160,15 +160,15 @@ discard block |
||
160 | 160 | * @param string|array $rules |
161 | 161 | * @return array|null |
162 | 162 | */ |
163 | - protected function getRule($attribute, $rules) |
|
163 | + protected function getRule( $attribute, $rules ) |
|
164 | 164 | { |
165 | - if (!array_key_exists($attribute, $this->rules)) { |
|
165 | + if( !array_key_exists( $attribute, $this->rules ) ) { |
|
166 | 166 | return; |
167 | 167 | } |
168 | - $rules = (array) $rules; |
|
169 | - foreach ($this->rules[$attribute] as $rule) { |
|
170 | - list($rule, $parameters) = $this->parseRule($rule); |
|
171 | - if (in_array($rule, $rules)) { |
|
168 | + $rules = (array)$rules; |
|
169 | + foreach( $this->rules[$attribute] as $rule ) { |
|
170 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
171 | + if( in_array( $rule, $rules ) ) { |
|
172 | 172 | return [$rule, $parameters]; |
173 | 173 | } |
174 | 174 | } |
@@ -180,17 +180,17 @@ discard block |
||
180 | 180 | * @param mixed $value |
181 | 181 | * @return mixed |
182 | 182 | */ |
183 | - protected function getSize($attribute, $value) |
|
183 | + protected function getSize( $attribute, $value ) |
|
184 | 184 | { |
185 | - $hasNumeric = $this->hasRule($attribute, $this->numericRules); |
|
186 | - if (is_numeric($value) && $hasNumeric) { |
|
185 | + $hasNumeric = $this->hasRule( $attribute, $this->numericRules ); |
|
186 | + if( is_numeric( $value ) && $hasNumeric ) { |
|
187 | 187 | return $value; |
188 | - } elseif (is_array($value)) { |
|
189 | - return count($value); |
|
188 | + } elseif( is_array( $value ) ) { |
|
189 | + return count( $value ); |
|
190 | 190 | } |
191 | - return function_exists('mb_strlen') |
|
192 | - ? mb_strlen($value) |
|
193 | - : strlen($value); |
|
191 | + return function_exists( 'mb_strlen' ) |
|
192 | + ? mb_strlen( $value ) |
|
193 | + : strlen( $value ); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | /** |
@@ -199,11 +199,11 @@ discard block |
||
199 | 199 | * @param string $rule |
200 | 200 | * @return string|null |
201 | 201 | */ |
202 | - protected function getSizeMessage($attribute, $rule, array $parameters) |
|
202 | + protected function getSizeMessage( $attribute, $rule, array $parameters ) |
|
203 | 203 | { |
204 | - $type = $this->getAttributeType($attribute); |
|
205 | - $lowerRule = Str::snakeCase($rule.$type); |
|
206 | - return $this->translator($lowerRule, $parameters); |
|
204 | + $type = $this->getAttributeType( $attribute ); |
|
205 | + $lowerRule = Str::snakeCase( $rule.$type ); |
|
206 | + return $this->translator( $lowerRule, $parameters ); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
@@ -211,9 +211,9 @@ discard block |
||
211 | 211 | * @param string $attribute |
212 | 212 | * @return mixed |
213 | 213 | */ |
214 | - protected function getValue($attribute) |
|
214 | + protected function getValue( $attribute ) |
|
215 | 215 | { |
216 | - if (isset($this->data[$attribute])) { |
|
216 | + if( isset($this->data[$attribute]) ) { |
|
217 | 217 | return $this->data[$attribute]; |
218 | 218 | } |
219 | 219 | } |
@@ -224,9 +224,9 @@ discard block |
||
224 | 224 | * @param string|array $rules |
225 | 225 | * @return bool |
226 | 226 | */ |
227 | - protected function hasRule($attribute, $rules) |
|
227 | + protected function hasRule( $attribute, $rules ) |
|
228 | 228 | { |
229 | - return !is_null($this->getRule($attribute, $rules)); |
|
229 | + return !is_null( $this->getRule( $attribute, $rules ) ); |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | * @param mixed $data |
235 | 235 | * @return void |
236 | 236 | */ |
237 | - protected function normalizeData($data) |
|
237 | + protected function normalizeData( $data ) |
|
238 | 238 | { |
239 | - $this->data = is_object($data) |
|
240 | - ? get_object_vars($data) |
|
239 | + $this->data = is_object( $data ) |
|
240 | + ? get_object_vars( $data ) |
|
241 | 241 | : $data; |
242 | 242 | } |
243 | 243 | |
@@ -247,11 +247,11 @@ discard block |
||
247 | 247 | * @param string $parameter |
248 | 248 | * @return array |
249 | 249 | */ |
250 | - protected function parseParameters($rule, $parameter) |
|
250 | + protected function parseParameters( $rule, $parameter ) |
|
251 | 251 | { |
252 | - return 'regex' == strtolower($rule) |
|
252 | + return 'regex' == strtolower( $rule ) |
|
253 | 253 | ? [$parameter] |
254 | - : str_getcsv($parameter); |
|
254 | + : str_getcsv( $parameter ); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
@@ -259,14 +259,14 @@ discard block |
||
259 | 259 | * @param string $rule |
260 | 260 | * @return array |
261 | 261 | */ |
262 | - protected function parseRule($rule) |
|
262 | + protected function parseRule( $rule ) |
|
263 | 263 | { |
264 | 264 | $parameters = []; |
265 | - if (Str::contains($rule, ':')) { |
|
266 | - list($rule, $parameter) = explode(':', $rule, 2); |
|
267 | - $parameters = $this->parseParameters($rule, $parameter); |
|
265 | + if( Str::contains( $rule, ':' ) ) { |
|
266 | + list($rule, $parameter) = explode( ':', $rule, 2 ); |
|
267 | + $parameters = $this->parseParameters( $rule, $parameter ); |
|
268 | 268 | } |
269 | - $rule = Str::camelCase($rule); |
|
269 | + $rule = Str::camelCase( $rule ); |
|
270 | 270 | return [$rule, $parameters]; |
271 | 271 | } |
272 | 272 | |
@@ -274,11 +274,11 @@ discard block |
||
274 | 274 | * Set the validation rules. |
275 | 275 | * @return void |
276 | 276 | */ |
277 | - protected function setRules(array $rules) |
|
277 | + protected function setRules( array $rules ) |
|
278 | 278 | { |
279 | - foreach ($rules as $key => $rule) { |
|
280 | - $rules[$key] = is_string($rule) |
|
281 | - ? explode('|', $rule) |
|
279 | + foreach( $rules as $key => $rule ) { |
|
280 | + $rules[$key] = is_string( $rule ) |
|
281 | + ? explode( '|', $rule ) |
|
282 | 282 | : $rule; |
283 | 283 | } |
284 | 284 | $this->rules = $rules; |
@@ -289,11 +289,11 @@ discard block |
||
289 | 289 | * @param string $attribute |
290 | 290 | * @return bool |
291 | 291 | */ |
292 | - protected function shouldStopValidating($attribute) |
|
292 | + protected function shouldStopValidating( $attribute ) |
|
293 | 293 | { |
294 | - return $this->hasRule($attribute, $this->implicitRules) |
|
294 | + return $this->hasRule( $attribute, $this->implicitRules ) |
|
295 | 295 | && isset($this->failedRules[$attribute]) |
296 | - && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules); |
|
296 | + && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules ); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | /** |
@@ -302,11 +302,11 @@ discard block |
||
302 | 302 | * @param string $attribute |
303 | 303 | * @return void|string |
304 | 304 | */ |
305 | - protected function translator($key, array $parameters) |
|
305 | + protected function translator( $key, array $parameters ) |
|
306 | 306 | { |
307 | - $strings = glsr(ValidationStringsDefaults::class)->defaults(); |
|
308 | - if (isset($strings[$key])) { |
|
309 | - return $this->replace($strings[$key], $parameters); |
|
307 | + $strings = glsr( ValidationStringsDefaults::class )->defaults(); |
|
308 | + if( isset($strings[$key]) ) { |
|
309 | + return $this->replace( $strings[$key], $parameters ); |
|
310 | 310 | } |
311 | 311 | return 'error'; |
312 | 312 | } |
@@ -11,31 +11,31 @@ discard block |
||
11 | 11 | * @param string $domain |
12 | 12 | * @return string |
13 | 13 | */ |
14 | - public function translate($original, $domain, array $args) |
|
14 | + public function translate( $original, $domain, array $args ) |
|
15 | 15 | { |
16 | - $domains = apply_filters('site-reviews/translator/domains', [Application::ID]); |
|
17 | - if (!in_array($domain, $domains)) { |
|
16 | + $domains = apply_filters( 'site-reviews/translator/domains', [Application::ID] ); |
|
17 | + if( !in_array( $domain, $domains ) ) { |
|
18 | 18 | return $original; |
19 | 19 | } |
20 | - $args = $this->normalizeTranslationArgs($args); |
|
21 | - $strings = $this->getTranslationStrings($args['single'], $args['plural']); |
|
22 | - if (empty($strings)) { |
|
20 | + $args = $this->normalizeTranslationArgs( $args ); |
|
21 | + $strings = $this->getTranslationStrings( $args['single'], $args['plural'] ); |
|
22 | + if( empty($strings) ) { |
|
23 | 23 | return $original; |
24 | 24 | } |
25 | - $string = current($strings); |
|
25 | + $string = current( $strings ); |
|
26 | 26 | return 'plural' == $string['type'] |
27 | - ? $this->translatePlural($domain, $string, $args) |
|
28 | - : $this->translateSingle($domain, $string, $args); |
|
27 | + ? $this->translatePlural( $domain, $string, $args ) |
|
28 | + : $this->translateSingle( $domain, $string, $args ); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
32 | 32 | * Used when search/replacing a default text-domain translation |
33 | 33 | * @return string |
34 | 34 | */ |
35 | - public function getTranslation(array $args) |
|
35 | + public function getTranslation( array $args ) |
|
36 | 36 | { |
37 | - $args = $this->normalizeTranslationArgs($args); |
|
38 | - return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']); |
|
37 | + $args = $this->normalizeTranslationArgs( $args ); |
|
38 | + return get_translations_for_domain( Application::ID )->translate_plural( $args['single'], $args['plural'], $args['number'] ); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | * @param string $plural |
44 | 44 | * @return array |
45 | 45 | */ |
46 | - protected function getTranslationStrings($single, $plural) |
|
46 | + protected function getTranslationStrings( $single, $plural ) |
|
47 | 47 | { |
48 | - return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) { |
|
49 | - return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8') |
|
50 | - && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8'); |
|
48 | + return array_filter( glsr( Translation::class )->translations(), function( $string ) use ($single, $plural) { |
|
49 | + return $string['s1'] == html_entity_decode( $single, ENT_COMPAT, 'UTF-8' ) |
|
50 | + && $string['p1'] == html_entity_decode( $plural, ENT_COMPAT, 'UTF-8' ); |
|
51 | 51 | }); |
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @return array |
56 | 56 | */ |
57 | - protected function normalizeTranslationArgs(array $args) |
|
57 | + protected function normalizeTranslationArgs( array $args ) |
|
58 | 58 | { |
59 | 59 | $defaults = [ |
60 | 60 | 'context' => '', |
@@ -62,22 +62,22 @@ discard block |
||
62 | 62 | 'plural' => '', |
63 | 63 | 'single' => '', |
64 | 64 | ]; |
65 | - return shortcode_atts($defaults, $args); |
|
65 | + return shortcode_atts( $defaults, $args ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
69 | 69 | * @param string $domain |
70 | 70 | * @return string |
71 | 71 | */ |
72 | - protected function translatePlural($domain, array $string, array $args) |
|
72 | + protected function translatePlural( $domain, array $string, array $args ) |
|
73 | 73 | { |
74 | - if (!empty($string['s2'])) { |
|
74 | + if( !empty($string['s2']) ) { |
|
75 | 75 | $args['single'] = $string['s2']; |
76 | 76 | } |
77 | - if (!empty($string['p2'])) { |
|
77 | + if( !empty($string['p2']) ) { |
|
78 | 78 | $args['plural'] = $string['p2']; |
79 | 79 | } |
80 | - return get_translations_for_domain($domain)->translate_plural( |
|
80 | + return get_translations_for_domain( $domain )->translate_plural( |
|
81 | 81 | $args['single'], |
82 | 82 | $args['plural'], |
83 | 83 | $args['number'], |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | * @param string $domain |
90 | 90 | * @return string |
91 | 91 | */ |
92 | - protected function translateSingle($domain, array $string, array $args) |
|
92 | + protected function translateSingle( $domain, array $string, array $args ) |
|
93 | 93 | { |
94 | - if (!empty($string['s2'])) { |
|
94 | + if( !empty($string['s2']) ) { |
|
95 | 95 | $args['single'] = $string['s2']; |
96 | 96 | } |
97 | - return get_translations_for_domain($domain)->translate( |
|
97 | + return get_translations_for_domain( $domain )->translate( |
|
98 | 98 | $args['single'], |
99 | 99 | $args['context'] |
100 | 100 | ); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public $translator; |
17 | 17 | |
18 | - public function __construct(Translator $translator) |
|
18 | + public function __construct( Translator $translator ) |
|
19 | 19 | { |
20 | 20 | $this->translator = $translator; |
21 | 21 | } |
@@ -25,15 +25,15 @@ discard block |
||
25 | 25 | * @return array |
26 | 26 | * @filter bulk_post_updated_messages |
27 | 27 | */ |
28 | - public function filterBulkUpdateMessages($messages, array $counts) |
|
28 | + public function filterBulkUpdateMessages( $messages, array $counts ) |
|
29 | 29 | { |
30 | - $messages = Arr::consolidateArray($messages); |
|
30 | + $messages = Arr::consolidateArray( $messages ); |
|
31 | 31 | $messages[Application::POST_TYPE] = [ |
32 | - 'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'), |
|
33 | - 'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'), |
|
34 | - 'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'), |
|
35 | - 'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'), |
|
36 | - 'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'), |
|
32 | + 'updated' => _n( '%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews' ), |
|
33 | + 'locked' => _n( '%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews' ), |
|
34 | + 'deleted' => _n( '%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews' ), |
|
35 | + 'trashed' => _n( '%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews' ), |
|
36 | + 'untrashed' => _n( '%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews' ), |
|
37 | 37 | ]; |
38 | 38 | return $messages; |
39 | 39 | } |
@@ -45,9 +45,9 @@ discard block |
||
45 | 45 | * @return string |
46 | 46 | * @filter gettext |
47 | 47 | */ |
48 | - public function filterGettext($translation, $text, $domain) |
|
48 | + public function filterGettext( $translation, $text, $domain ) |
|
49 | 49 | { |
50 | - return apply_filters('site-reviews/gettext/'.$domain, $translation, $text); |
|
50 | + return apply_filters( 'site-reviews/gettext/'.$domain, $translation, $text ); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | * @return string |
57 | 57 | * @filter site-reviews/gettext/site-reviews |
58 | 58 | */ |
59 | - public function filterGettextSiteReviews($translation, $text) |
|
59 | + public function filterGettextSiteReviews( $translation, $text ) |
|
60 | 60 | { |
61 | - return $this->translator->translate($translation, Application::ID, [ |
|
61 | + return $this->translator->translate( $translation, Application::ID, [ |
|
62 | 62 | 'single' => $text, |
63 | - ]); |
|
63 | + ] ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | * @return string |
72 | 72 | * @filter gettext_with_context |
73 | 73 | */ |
74 | - public function filterGettextWithContext($translation, $text, $context, $domain) |
|
74 | + public function filterGettextWithContext( $translation, $text, $context, $domain ) |
|
75 | 75 | { |
76 | - return apply_filters('site-reviews/gettext_with_context/'.$domain, $translation, $text, $context); |
|
76 | + return apply_filters( 'site-reviews/gettext_with_context/'.$domain, $translation, $text, $context ); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | * @return string |
84 | 84 | * @filter site-reviews/gettext_with_context/site-reviews |
85 | 85 | */ |
86 | - public function filterGettextWithContextSiteReviews($translation, $text, $context) |
|
86 | + public function filterGettextWithContextSiteReviews( $translation, $text, $context ) |
|
87 | 87 | { |
88 | - return $this->translator->translate($translation, Application::ID, [ |
|
88 | + return $this->translator->translate( $translation, Application::ID, [ |
|
89 | 89 | 'context' => $context, |
90 | 90 | 'single' => $text, |
91 | - ]); |
|
91 | + ] ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -100,9 +100,9 @@ discard block |
||
100 | 100 | * @return string |
101 | 101 | * @filter ngettext |
102 | 102 | */ |
103 | - public function filterNgettext($translation, $single, $plural, $number, $domain) |
|
103 | + public function filterNgettext( $translation, $single, $plural, $number, $domain ) |
|
104 | 104 | { |
105 | - return apply_filters('site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number); |
|
105 | + return apply_filters( 'site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number ); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -113,13 +113,13 @@ discard block |
||
113 | 113 | * @return string |
114 | 114 | * @filter site-reviews/ngettext/site-reviews |
115 | 115 | */ |
116 | - public function filterNgettextSiteReviews($translation, $single, $plural, $number) |
|
116 | + public function filterNgettextSiteReviews( $translation, $single, $plural, $number ) |
|
117 | 117 | { |
118 | - return $this->translator->translate($translation, Application::ID, [ |
|
118 | + return $this->translator->translate( $translation, Application::ID, [ |
|
119 | 119 | 'number' => $number, |
120 | 120 | 'plural' => $plural, |
121 | 121 | 'single' => $single, |
122 | - ]); |
|
122 | + ] ); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
@@ -132,9 +132,9 @@ discard block |
||
132 | 132 | * @return string |
133 | 133 | * @filter ngettext_with_context |
134 | 134 | */ |
135 | - public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain) |
|
135 | + public function filterNgettextWithContext( $translation, $single, $plural, $number, $context, $domain ) |
|
136 | 136 | { |
137 | - return apply_filters('site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context); |
|
137 | + return apply_filters( 'site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context ); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
@@ -146,14 +146,14 @@ discard block |
||
146 | 146 | * @return string |
147 | 147 | * @filter site-reviews/ngettext_with_context/site-reviews |
148 | 148 | */ |
149 | - public function filterNgettextWithContextSiteReviews($translation, $single, $plural, $number, $context) |
|
149 | + public function filterNgettextWithContextSiteReviews( $translation, $single, $plural, $number, $context ) |
|
150 | 150 | { |
151 | - return $this->translator->translate($translation, Application::ID, [ |
|
151 | + return $this->translator->translate( $translation, Application::ID, [ |
|
152 | 152 | 'context' => $context, |
153 | 153 | 'number' => $number, |
154 | 154 | 'plural' => $plural, |
155 | 155 | 'single' => $single, |
156 | - ]); |
|
156 | + ] ); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -162,11 +162,11 @@ discard block |
||
162 | 162 | * @return array |
163 | 163 | * @filter display_post_states |
164 | 164 | */ |
165 | - public function filterPostStates($postStates, $post) |
|
165 | + public function filterPostStates( $postStates, $post ) |
|
166 | 166 | { |
167 | - $postStates = Arr::consolidateArray($postStates); |
|
168 | - if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) { |
|
169 | - $postStates['pending'] = __('Unapproved', 'site-reviews'); |
|
167 | + $postStates = Arr::consolidateArray( $postStates ); |
|
168 | + if( Application::POST_TYPE == Arr::get( $post, 'post_type' ) && array_key_exists( 'pending', $postStates ) ) { |
|
169 | + $postStates['pending'] = __( 'Unapproved', 'site-reviews' ); |
|
170 | 170 | } |
171 | 171 | return $postStates; |
172 | 172 | } |
@@ -178,10 +178,10 @@ discard block |
||
178 | 178 | * @filter site-reviews/gettext/default |
179 | 179 | * @filter site-reviews/gettext_with_context/default |
180 | 180 | */ |
181 | - public function filterPostStatusLabels($translation, $text) |
|
181 | + public function filterPostStatusLabels( $translation, $text ) |
|
182 | 182 | { |
183 | 183 | return $this->canModifyTranslation() |
184 | - ? glsr(Labels::class)->filterPostStatusLabels($translation, $text) |
|
184 | + ? glsr( Labels::class )->filterPostStatusLabels( $translation, $text ) |
|
185 | 185 | : $translation; |
186 | 186 | } |
187 | 187 | |
@@ -193,22 +193,22 @@ discard block |
||
193 | 193 | * @return string |
194 | 194 | * @filter site-reviews/ngettext/default |
195 | 195 | */ |
196 | - public function filterPostStatusText($translation, $single, $plural, $number) |
|
196 | + public function filterPostStatusText( $translation, $single, $plural, $number ) |
|
197 | 197 | { |
198 | - if ($this->canModifyTranslation()) { |
|
198 | + if( $this->canModifyTranslation() ) { |
|
199 | 199 | $strings = [ |
200 | - 'Published' => __('Approved', 'site-reviews'), |
|
201 | - 'Pending' => __('Unapproved', 'site-reviews'), |
|
200 | + 'Published' => __( 'Approved', 'site-reviews' ), |
|
201 | + 'Pending' => __( 'Unapproved', 'site-reviews' ), |
|
202 | 202 | ]; |
203 | - foreach ($strings as $search => $replace) { |
|
204 | - if (!Str::contains($single, $search)) { |
|
203 | + foreach( $strings as $search => $replace ) { |
|
204 | + if( !Str::contains( $single, $search ) ) { |
|
205 | 205 | continue; |
206 | 206 | } |
207 | - return $this->translator->getTranslation([ |
|
207 | + return $this->translator->getTranslation( [ |
|
208 | 208 | 'number' => $number, |
209 | - 'plural' => str_replace($search, $replace, $plural), |
|
210 | - 'single' => str_replace($search, $replace, $single), |
|
211 | - ]); |
|
209 | + 'plural' => str_replace( $search, $replace, $plural ), |
|
210 | + 'single' => str_replace( $search, $replace, $single ), |
|
211 | + ] ); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | return $translation; |
@@ -220,8 +220,8 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function translatePostStatusLabels() |
222 | 222 | { |
223 | - if ($this->canModifyTranslation()) { |
|
224 | - glsr(Labels::class)->translatePostStatusLabels(); |
|
223 | + if( $this->canModifyTranslation() ) { |
|
224 | + glsr( Labels::class )->translatePostStatusLabels(); |
|
225 | 225 | } |
226 | 226 | } |
227 | 227 | |
@@ -232,6 +232,6 @@ discard block |
||
232 | 232 | { |
233 | 233 | $screen = glsr_current_screen(); |
234 | 234 | return Application::POST_TYPE == $screen->post_type |
235 | - && in_array($screen->base, ['edit', 'post']); |
|
235 | + && in_array( $screen->base, ['edit', 'post'] ); |
|
236 | 236 | } |
237 | 237 | } |
@@ -28,14 +28,14 @@ discard block |
||
28 | 28 | * @return string |
29 | 29 | * @filter script_loader_tag |
30 | 30 | */ |
31 | - public function filterEnqueuedScripts($tag, $handle) |
|
31 | + public function filterEnqueuedScripts( $tag, $handle ) |
|
32 | 32 | { |
33 | 33 | $scripts = [Application::ID.'/google-recaptcha']; |
34 | - if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) { |
|
35 | - $tag = str_replace(' src=', ' async src=', $tag); |
|
34 | + if( in_array( $handle, apply_filters( 'site-reviews/async-scripts', $scripts ) ) ) { |
|
35 | + $tag = str_replace( ' src=', ' async src=', $tag ); |
|
36 | 36 | } |
37 | - if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) { |
|
38 | - $tag = str_replace(' src=', ' defer src=', $tag); |
|
37 | + if( in_array( $handle, apply_filters( 'site-reviews/defer-scripts', $scripts ) ) ) { |
|
38 | + $tag = str_replace( ' src=', ' defer src=', $tag ); |
|
39 | 39 | } |
40 | 40 | return $tag; |
41 | 41 | } |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | * @return array |
45 | 45 | * @filter site-reviews/config/forms/submission-form |
46 | 46 | */ |
47 | - public function filterFieldOrder(array $config) |
|
47 | + public function filterFieldOrder( array $config ) |
|
48 | 48 | { |
49 | - $order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config)); |
|
50 | - return array_intersect_key(array_merge(array_flip($order), $config), $config); |
|
49 | + $order = (array)apply_filters( 'site-reviews/submission-form/order', array_keys( $config ) ); |
|
50 | + return array_intersect_key( array_merge( array_flip( $order ), $config ), $config ); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -55,18 +55,18 @@ discard block |
||
55 | 55 | * @return string |
56 | 56 | * @filter site-reviews/render/view |
57 | 57 | */ |
58 | - public function filterRenderView($view) |
|
58 | + public function filterRenderView( $view ) |
|
59 | 59 | { |
60 | - return glsr(Style::class)->filterView($view); |
|
60 | + return glsr( Style::class )->filterView( $view ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
64 | 64 | * @return void |
65 | 65 | * @action site-reviews/builder |
66 | 66 | */ |
67 | - public function modifyBuilder(Builder $instance) |
|
67 | + public function modifyBuilder( Builder $instance ) |
|
68 | 68 | { |
69 | - call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]); |
|
69 | + call_user_func_array( [glsr( Style::class ), 'modifyField'], [$instance] ); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -75,18 +75,18 @@ discard block |
||
75 | 75 | */ |
76 | 76 | public function renderSchema() |
77 | 77 | { |
78 | - glsr(Schema::class)->render(); |
|
78 | + glsr( Schema::class )->render(); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
82 | 82 | * @return CreateReview |
83 | 83 | */ |
84 | - public function routerSubmitReview(array $request) |
|
84 | + public function routerSubmitReview( array $request ) |
|
85 | 85 | { |
86 | - $validated = glsr(ValidateReview::class)->validate($request); |
|
87 | - $command = new CreateReview($validated->request); |
|
88 | - if (empty($validated->error) && !$validated->recaptchaIsUnset) { |
|
89 | - $this->execute($command); |
|
86 | + $validated = glsr( ValidateReview::class )->validate( $request ); |
|
87 | + $command = new CreateReview( $validated->request ); |
|
88 | + if( empty($validated->error) && !$validated->recaptchaIsUnset ) { |
|
89 | + $this->execute( $command ); |
|
90 | 90 | } |
91 | 91 | return $command; |
92 | 92 | } |
@@ -11,24 +11,24 @@ discard block |
||
11 | 11 | */ |
12 | 12 | public function getCloudflareIps() |
13 | 13 | { |
14 | - if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) { |
|
15 | - $ipAddresses = array_fill_keys(['v4', 'v6'], []); |
|
16 | - foreach (array_keys($ipAddresses) as $version) { |
|
14 | + if( false === ($ipAddresses = get_transient( Application::ID.'_cloudflare_ips' )) ) { |
|
15 | + $ipAddresses = array_fill_keys( ['v4', 'v6'], [] ); |
|
16 | + foreach( array_keys( $ipAddresses ) as $version ) { |
|
17 | 17 | $url = 'https://www.cloudflare.com/ips-'.$version; |
18 | - $response = wp_remote_get($url, ['sslverify' => false]); |
|
19 | - if (is_wp_error($response)) { |
|
20 | - glsr_log()->error($response->get_error_message()); |
|
18 | + $response = wp_remote_get( $url, ['sslverify' => false] ); |
|
19 | + if( is_wp_error( $response ) ) { |
|
20 | + glsr_log()->error( $response->get_error_message() ); |
|
21 | 21 | continue; |
22 | 22 | } |
23 | - if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) { |
|
24 | - glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']'); |
|
23 | + if( '200' != ($statusCode = wp_remote_retrieve_response_code( $response )) ) { |
|
24 | + glsr_log()->error( 'Unable to connect to '.$url.' ['.$statusCode.']' ); |
|
25 | 25 | continue; |
26 | 26 | } |
27 | 27 | $ipAddresses[$version] = array_filter( |
28 | - (array) preg_split('/\R/', wp_remote_retrieve_body($response)) |
|
28 | + (array)preg_split( '/\R/', wp_remote_retrieve_body( $response ) ) |
|
29 | 29 | ); |
30 | 30 | } |
31 | - set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS); |
|
31 | + set_transient( Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS ); |
|
32 | 32 | } |
33 | 33 | return $ipAddresses; |
34 | 34 | } |
@@ -37,16 +37,16 @@ discard block |
||
37 | 37 | * @param string $metaKey |
38 | 38 | * @return array |
39 | 39 | */ |
40 | - public function getReviewCountsFor($metaKey) |
|
40 | + public function getReviewCountsFor( $metaKey ) |
|
41 | 41 | { |
42 | - $counts = wp_cache_get(Application::ID, $metaKey.'_count'); |
|
43 | - if (false === $counts) { |
|
42 | + $counts = wp_cache_get( Application::ID, $metaKey.'_count' ); |
|
43 | + if( false === $counts ) { |
|
44 | 44 | $counts = []; |
45 | - $results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey); |
|
46 | - foreach ($results as $result) { |
|
45 | + $results = glsr( SqlQueries::class )->getReviewCountsFor( $metaKey ); |
|
46 | + foreach( $results as $result ) { |
|
47 | 47 | $counts[$result->name] = $result->num_posts; |
48 | 48 | } |
49 | - wp_cache_set(Application::ID, $counts, $metaKey.'_count'); |
|
49 | + wp_cache_set( Application::ID, $counts, $metaKey.'_count' ); |
|
50 | 50 | } |
51 | 51 | return $counts; |
52 | 52 | } |
@@ -56,12 +56,12 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function getRemotePostTest() |
58 | 58 | { |
59 | - if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) { |
|
60 | - $response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/'); |
|
61 | - $test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299)) |
|
59 | + if( false === ($test = get_transient( Application::ID.'_remote_post_test' )) ) { |
|
60 | + $response = wp_remote_post( 'https://api.wordpress.org/stats/php/1.0/' ); |
|
61 | + $test = !is_wp_error( $response ) && in_array( $response['response']['code'], range( 200, 299 ) ) |
|
62 | 62 | ? 'Works' |
63 | 63 | : 'Does not work'; |
64 | - set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS); |
|
64 | + set_transient( Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS ); |
|
65 | 65 | } |
66 | 66 | return $test; |
67 | 67 | } |