@@ -10,9 +10,9 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * @return array |
| 12 | 12 | */ |
| 13 | - public function filterEditorSettings(array $settings) |
|
| 13 | + public function filterEditorSettings( array $settings ) |
|
| 14 | 14 | { |
| 15 | - if ($this->isReviewEditable()) { |
|
| 15 | + if( $this->isReviewEditable() ) { |
|
| 16 | 16 | $settings = [ |
| 17 | 17 | 'media_buttons' => false, |
| 18 | 18 | 'quicktags' => false, |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | * @param string $html |
| 28 | 28 | * @return string |
| 29 | 29 | */ |
| 30 | - public function filterEditorTextarea($html) |
|
| 30 | + public function filterEditorTextarea( $html ) |
|
| 31 | 31 | { |
| 32 | - if ($this->isReviewEditable()) { |
|
| 33 | - $html = str_replace('<textarea', '<div id="ed_toolbar"></div><textarea', $html); |
|
| 32 | + if( $this->isReviewEditable() ) { |
|
| 33 | + $html = str_replace( '<textarea', '<div id="ed_toolbar"></div><textarea', $html ); |
|
| 34 | 34 | } |
| 35 | 35 | return $html; |
| 36 | 36 | } |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function removeAutosave() |
| 42 | 42 | { |
| 43 | - if (!$this->isReviewEditor() || $this->isReviewEditable()) { |
|
| 43 | + if( !$this->isReviewEditor() || $this->isReviewEditable() ) { |
|
| 44 | 44 | return; |
| 45 | 45 | } |
| 46 | - wp_deregister_script('autosave'); |
|
| 46 | + wp_deregister_script( 'autosave' ); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function removeMetaBoxes() |
| 53 | 53 | { |
| 54 | - remove_meta_box('slugdiv', Application::POST_TYPE, 'advanced'); |
|
| 54 | + remove_meta_box( 'slugdiv', Application::POST_TYPE, 'advanced' ); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function removePostTypeSupport() |
| 61 | 61 | { |
| 62 | - if (!$this->isReviewEditor() || $this->isReviewEditable()) { |
|
| 62 | + if( !$this->isReviewEditor() || $this->isReviewEditable() ) { |
|
| 63 | 63 | return; |
| 64 | 64 | } |
| 65 | - remove_post_type_support(Application::POST_TYPE, 'title'); |
|
| 66 | - remove_post_type_support(Application::POST_TYPE, 'editor'); |
|
| 65 | + remove_post_type_support( Application::POST_TYPE, 'title' ); |
|
| 66 | + remove_post_type_support( Application::POST_TYPE, 'editor' ); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | protected function isReviewEditable() |
| 73 | 73 | { |
| 74 | - $postId = intval(filter_input(INPUT_GET, 'post')); |
|
| 74 | + $postId = intval( filter_input( INPUT_GET, 'post' ) ); |
|
| 75 | 75 | return $postId > 0 |
| 76 | - && 'local' == glsr(Database::class)->get($postId, 'review_type') |
|
| 76 | + && 'local' == glsr( Database::class )->get( $postId, 'review_type' ) |
|
| 77 | 77 | && $this->isReviewEditor(); |
| 78 | 78 | } |
| 79 | 79 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function getFromEmail() |
| 35 | 35 | { |
| 36 | - return glsr(OptionManager::class)->getWP('admin_email'); |
|
| 36 | + return glsr( OptionManager::class )->getWP( 'admin_email' ); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -41,6 +41,6 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | protected function getFromName() |
| 43 | 43 | { |
| 44 | - return wp_specialchars_decode(glsr(OptionManager::class)->getWP('blogname'), ENT_QUOTES); |
|
| 44 | + return wp_specialchars_decode( glsr( OptionManager::class )->getWP( 'blogname' ), ENT_QUOTES ); |
|
| 45 | 45 | } |
| 46 | 46 | } |
@@ -1,4 +1,4 @@ |
||
| 1 | -<?php defined('WPINC') || die; ?> |
|
| 1 | +<?php defined( 'WPINC' ) || die; ?> |
|
| 2 | 2 | |
| 3 | 3 | <p class="about-description">If you are using any Site Reviews code snippets or have built any custom integrations with Site Reviews, please make sure to read this upgrade guide.</p> |
| 4 | 4 | <div class="is-fullwidth"> |
@@ -1,21 +1,21 @@ |
||
| 1 | -<?php defined('WPINC') || die; ?> |
|
| 1 | +<?php defined( 'WPINC' ) || die; ?> |
|
| 2 | 2 | |
| 3 | 3 | <div class="wrap"> |
| 4 | - <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1> |
|
| 4 | + <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1> |
|
| 5 | 5 | <?= $notices; ?> |
| 6 | 6 | <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper"> |
| 7 | - <?php foreach ($tabs as $id => $title) : ?> |
|
| 7 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
| 8 | 8 | <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a> |
| 9 | 9 | <?php endforeach; ?> |
| 10 | 10 | </h2> |
| 11 | 11 | <form class="glsr-form" action="options.php" enctype="multipart/form-data" method="post"> |
| 12 | - <?php foreach ($tabs as $id => $title) : ?> |
|
| 12 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
| 13 | 13 | <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>"> |
| 14 | - <?= $settings->buildFields($id); ?> |
|
| 14 | + <?= $settings->buildFields( $id ); ?> |
|
| 15 | 15 | </div> |
| 16 | 16 | <?php endforeach; ?> |
| 17 | 17 | <input type="hidden" name="_active_tab"> |
| 18 | - <?php settings_fields(glsr()->id.'-settings'); ?> |
|
| 18 | + <?php settings_fields( glsr()->id.'-settings' ); ?> |
|
| 19 | 19 | <?php submit_button(); ?> |
| 20 | 20 | </form> |
| 21 | 21 | </div> |
@@ -1,16 +1,16 @@ |
||
| 1 | -<?php defined('WPINC') || die; ?> |
|
| 1 | +<?php defined( 'WPINC' ) || die; ?> |
|
| 2 | 2 | |
| 3 | 3 | <div class="wrap"> |
| 4 | - <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1> |
|
| 4 | + <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1> |
|
| 5 | 5 | <?= $notices; ?> |
| 6 | 6 | <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper"> |
| 7 | - <?php foreach ($tabs as $id => $title) : ?> |
|
| 7 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
| 8 | 8 | <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a> |
| 9 | 9 | <?php endforeach; ?> |
| 10 | 10 | </h2> |
| 11 | - <?php foreach ($tabs as $id => $title) : ?> |
|
| 11 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
| 12 | 12 | <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>"> |
| 13 | - <?php $template->render('pages/tools/'.$id, $data); ?> |
|
| 13 | + <?php $template->render( 'pages/tools/'.$id, $data ); ?> |
|
| 14 | 14 | </div> |
| 15 | 15 | <?php endforeach; ?> |
| 16 | 16 | <input type="hidden" name="_active_tab"> |
@@ -11,29 +11,29 @@ |
||
| 11 | 11 | * @param int $postId |
| 12 | 12 | * @return void |
| 13 | 13 | */ |
| 14 | - public function saveAssignedToMetabox($postId) |
|
| 14 | + public function saveAssignedToMetabox( $postId ) |
|
| 15 | 15 | { |
| 16 | - if (!wp_verify_nonce(Helper::filterInput('_nonce-assigned-to'), 'assigned_to')) { |
|
| 16 | + if( !wp_verify_nonce( Helper::filterInput( '_nonce-assigned-to' ), 'assigned_to' ) ) { |
|
| 17 | 17 | return; |
| 18 | 18 | } |
| 19 | - $assignedTo = strval(Helper::filterInput('assigned_to')); |
|
| 20 | - glsr(Database::class)->update($postId, 'assigned_to', $assignedTo); |
|
| 19 | + $assignedTo = strval( Helper::filterInput( 'assigned_to' ) ); |
|
| 20 | + glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo ); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * @param int $postId |
| 25 | 25 | * @return mixed |
| 26 | 26 | */ |
| 27 | - public function saveResponseMetabox($postId) |
|
| 27 | + public function saveResponseMetabox( $postId ) |
|
| 28 | 28 | { |
| 29 | - if (!wp_verify_nonce(Helper::filterInput('_nonce-response'), 'response')) { |
|
| 29 | + if( !wp_verify_nonce( Helper::filterInput( '_nonce-response' ), 'response' ) ) { |
|
| 30 | 30 | return; |
| 31 | 31 | } |
| 32 | - $response = strval(Helper::filterInput('response')); |
|
| 33 | - glsr(Database::class)->update($postId, 'response', trim(wp_kses($response, [ |
|
| 32 | + $response = strval( Helper::filterInput( 'response' ) ); |
|
| 33 | + glsr( Database::class )->update( $postId, 'response', trim( wp_kses( $response, [ |
|
| 34 | 34 | 'a' => ['href' => [], 'title' => []], |
| 35 | 35 | 'em' => [], |
| 36 | 36 | 'strong' => [], |
| 37 | - ]))); |
|
| 37 | + ] ) ) ); |
|
| 38 | 38 | } |
| 39 | 39 | } |
@@ -37,18 +37,18 @@ discard block |
||
| 37 | 37 | * @param string $method |
| 38 | 38 | * @return static |
| 39 | 39 | */ |
| 40 | - public function __call($method, array $arguments) |
|
| 40 | + public function __call( $method, array $arguments ) |
|
| 41 | 41 | { |
| 42 | - return $this->setProperty($method, Arr::get($arguments, 0)); |
|
| 42 | + return $this->setProperty( $method, Arr::get( $arguments, 0 ) ); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * @param string $type |
| 47 | 47 | */ |
| 48 | - public function __construct($type = null) |
|
| 48 | + public function __construct( $type = null ) |
|
| 49 | 49 | { |
| 50 | - $this->type = !is_string($type) |
|
| 51 | - ? (new ReflectionClass($this))->getShortName() |
|
| 50 | + $this->type = !is_string( $type ) |
|
| 51 | + ? (new ReflectionClass( $this ))->getShortName() |
|
| 52 | 52 | : $type; |
| 53 | 53 | $this->setAllowedProperties(); |
| 54 | 54 | } |
@@ -64,10 +64,10 @@ discard block |
||
| 64 | 64 | /** |
| 65 | 65 | * @return static |
| 66 | 66 | */ |
| 67 | - public function addProperties(array $properties) |
|
| 67 | + public function addProperties( array $properties ) |
|
| 68 | 68 | { |
| 69 | - foreach ($properties as $property => $value) { |
|
| 70 | - $this->setProperty($property, $value); |
|
| 69 | + foreach( $properties as $property => $value ) { |
|
| 70 | + $this->setProperty( $property, $value ); |
|
| 71 | 71 | } |
| 72 | 72 | return $this; |
| 73 | 73 | } |
@@ -93,9 +93,9 @@ discard block |
||
| 93 | 93 | * @param mixed $default |
| 94 | 94 | * @return mixed |
| 95 | 95 | */ |
| 96 | - public function getProperty($property, $default = null) |
|
| 96 | + public function getProperty( $property, $default = null ) |
|
| 97 | 97 | { |
| 98 | - return Arr::get($this->properties, $property, $default); |
|
| 98 | + return Arr::get( $this->properties, $property, $default ); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -111,10 +111,10 @@ discard block |
||
| 111 | 111 | * @param mixed $callback |
| 112 | 112 | * @return static |
| 113 | 113 | */ |
| 114 | - public function doIf($condition, $callback) |
|
| 114 | + public function doIf( $condition, $callback ) |
|
| 115 | 115 | { |
| 116 | - if ($condition) { |
|
| 117 | - $callback($this); |
|
| 116 | + if( $condition ) { |
|
| 117 | + $callback( $this ); |
|
| 118 | 118 | } |
| 119 | 119 | return $this; |
| 120 | 120 | } |
@@ -131,18 +131,18 @@ discard block |
||
| 131 | 131 | * @param mixed $offset |
| 132 | 132 | * @return bool |
| 133 | 133 | */ |
| 134 | - public function offsetExists($offset) |
|
| 134 | + public function offsetExists( $offset ) |
|
| 135 | 135 | { |
| 136 | - return array_key_exists($offset, $this->properties); |
|
| 136 | + return array_key_exists( $offset, $this->properties ); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
| 140 | 140 | * @param string $offset |
| 141 | 141 | * @return mixed |
| 142 | 142 | */ |
| 143 | - public function offsetGet($offset) |
|
| 143 | + public function offsetGet( $offset ) |
|
| 144 | 144 | { |
| 145 | - return $this->getProperty($offset); |
|
| 145 | + return $this->getProperty( $offset ); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | /** |
@@ -150,16 +150,16 @@ discard block |
||
| 150 | 150 | * @param mixed $value |
| 151 | 151 | * @return void |
| 152 | 152 | */ |
| 153 | - public function offsetSet($offset, $value) |
|
| 153 | + public function offsetSet( $offset, $value ) |
|
| 154 | 154 | { |
| 155 | - $this->setProperty($offset, $value); |
|
| 155 | + $this->setProperty( $offset, $value ); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
| 159 | 159 | * @param string $offset |
| 160 | 160 | * @return void |
| 161 | 161 | */ |
| 162 | - public function offsetUnset($offset) |
|
| 162 | + public function offsetUnset( $offset ) |
|
| 163 | 163 | { |
| 164 | 164 | unset($this->properties[$offset]); |
| 165 | 165 | } |
@@ -169,11 +169,11 @@ discard block |
||
| 169 | 169 | * @param mixed $value |
| 170 | 170 | * @return static |
| 171 | 171 | */ |
| 172 | - public function setProperty($property, $value) |
|
| 172 | + public function setProperty( $property, $value ) |
|
| 173 | 173 | { |
| 174 | - if (!in_array($property, $this->allowed) |
|
| 175 | - && 'UnknownType' != (new ReflectionClass($this))->getShortName()) { |
|
| 176 | - glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property'); |
|
| 174 | + if( !in_array( $property, $this->allowed ) |
|
| 175 | + && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) { |
|
| 176 | + glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' ); |
|
| 177 | 177 | return $this; |
| 178 | 178 | } |
| 179 | 179 | $this->properties[$property] = $value; |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | return [ |
| 189 | 189 | '@context' => $this->getContext(), |
| 190 | 190 | '@type' => $this->getType(), |
| 191 | - ] + $this->serializeProperty($this->getProperties()); |
|
| 191 | + ] + $this->serializeProperty( $this->getProperties() ); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
@@ -196,8 +196,8 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | public function toScript() |
| 198 | 198 | { |
| 199 | - return sprintf('<script type="application/ld+json">%s</script>', |
|
| 200 | - json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) |
|
| 199 | + return sprintf( '<script type="application/ld+json">%s</script>', |
|
| 200 | + json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES ) |
|
| 201 | 201 | ); |
| 202 | 202 | } |
| 203 | 203 | |
@@ -205,20 +205,20 @@ discard block |
||
| 205 | 205 | * @param array|null $parents |
| 206 | 206 | * @return array |
| 207 | 207 | */ |
| 208 | - protected function getParents($parents = null) |
|
| 208 | + protected function getParents( $parents = null ) |
|
| 209 | 209 | { |
| 210 | - if (!isset($parents)) { |
|
| 210 | + if( !isset($parents) ) { |
|
| 211 | 211 | $parents = $this->parents; |
| 212 | 212 | } |
| 213 | 213 | $newParents = $parents; |
| 214 | - foreach ($parents as $parent) { |
|
| 215 | - $parentClass = Helper::buildClassName($parent, __NAMESPACE__); |
|
| 216 | - if (!class_exists($parentClass)) { |
|
| 214 | + foreach( $parents as $parent ) { |
|
| 215 | + $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ ); |
|
| 216 | + if( !class_exists( $parentClass ) ) { |
|
| 217 | 217 | continue; |
| 218 | 218 | } |
| 219 | - $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents)); |
|
| 219 | + $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) ); |
|
| 220 | 220 | } |
| 221 | - return array_values(array_unique($newParents)); |
|
| 221 | + return array_values( array_unique( $newParents ) ); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | /** |
@@ -227,12 +227,12 @@ discard block |
||
| 227 | 227 | protected function setAllowedProperties() |
| 228 | 228 | { |
| 229 | 229 | $parents = $this->getParents(); |
| 230 | - foreach ($parents as $parent) { |
|
| 231 | - $parentClass = Helper::buildClassName($parent, __NAMESPACE__); |
|
| 232 | - if (!class_exists($parentClass)) { |
|
| 230 | + foreach( $parents as $parent ) { |
|
| 231 | + $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ ); |
|
| 232 | + if( !class_exists( $parentClass ) ) { |
|
| 233 | 233 | continue; |
| 234 | 234 | } |
| 235 | - $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed))); |
|
| 235 | + $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) ); |
|
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | |
@@ -240,19 +240,19 @@ discard block |
||
| 240 | 240 | * @param mixed $property |
| 241 | 241 | * @return array|string |
| 242 | 242 | */ |
| 243 | - protected function serializeProperty($property) |
|
| 243 | + protected function serializeProperty( $property ) |
|
| 244 | 244 | { |
| 245 | - if (is_array($property)) { |
|
| 246 | - return array_map([$this, 'serializeProperty'], $property); |
|
| 245 | + if( is_array( $property ) ) { |
|
| 246 | + return array_map( [$this, 'serializeProperty'], $property ); |
|
| 247 | 247 | } |
| 248 | - if ($property instanceof Type) { |
|
| 248 | + if( $property instanceof Type ) { |
|
| 249 | 249 | $property = $property->toArray(); |
| 250 | 250 | unset($property['@context']); |
| 251 | 251 | } |
| 252 | - if ($property instanceof DateTimeInterface) { |
|
| 253 | - $property = $property->format(DateTime::ATOM); |
|
| 252 | + if( $property instanceof DateTimeInterface ) { |
|
| 253 | + $property = $property->format( DateTime::ATOM ); |
|
| 254 | 254 | } |
| 255 | - if (is_object($property)) { |
|
| 255 | + if( is_object( $property ) ) { |
|
| 256 | 256 | throw new InvalidProperty(); |
| 257 | 257 | } |
| 258 | 258 | return $property; |
@@ -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 | } |
@@ -21,29 +21,29 @@ discard block |
||
| 21 | 21 | * @param array $args |
| 22 | 22 | * @return |
| 23 | 23 | */ |
| 24 | - public function __call($method, $args = []) |
|
| 24 | + public function __call( $method, $args = [] ) |
|
| 25 | 25 | { |
| 26 | - if ($this->isIntegrated() && method_exists($this->integration, $method)) { |
|
| 27 | - return call_user_func_array([$this->integration, $method], $args); |
|
| 26 | + if( $this->isIntegrated() && method_exists( $this->integration, $method ) ) { |
|
| 27 | + return call_user_func_array( [$this->integration, $method], $args ); |
|
| 28 | 28 | } |
| 29 | - return Arr::get($args, 0, false); |
|
| 29 | + return Arr::get( $args, 0, false ); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * @param string $integration |
| 34 | 34 | * @return false|\GeminiLabs\SiteReviews\Modules\Multilingual\Polylang|\GeminiLabs\SiteReviews\Modules\Multilingual\Wpml |
| 35 | 35 | */ |
| 36 | - public function getIntegration($integration = '') |
|
| 36 | + public function getIntegration( $integration = '' ) |
|
| 37 | 37 | { |
| 38 | - if (empty($integration)) { |
|
| 39 | - $integration = glsr(OptionManager::class)->get('settings.general.multilingual'); |
|
| 38 | + if( empty($integration) ) { |
|
| 39 | + $integration = glsr( OptionManager::class )->get( 'settings.general.multilingual' ); |
|
| 40 | 40 | } |
| 41 | - if (!empty($integration)) { |
|
| 42 | - $integrationClass = 'GeminiLabs\SiteReviews\Modules\Multilingual\\'.ucfirst($integration); |
|
| 43 | - if (class_exists($integrationClass)) { |
|
| 44 | - return glsr($integrationClass); |
|
| 41 | + if( !empty($integration) ) { |
|
| 42 | + $integrationClass = 'GeminiLabs\SiteReviews\Modules\Multilingual\\'.ucfirst( $integration ); |
|
| 43 | + if( class_exists( $integrationClass ) ) { |
|
| 44 | + return glsr( $integrationClass ); |
|
| 45 | 45 | } |
| 46 | - glsr_log()->error($integrationClass.' does not exist'); |
|
| 46 | + glsr_log()->error( $integrationClass.' does not exist' ); |
|
| 47 | 47 | } |
| 48 | 48 | return false; |
| 49 | 49 | } |
@@ -53,10 +53,10 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function isIntegrated() |
| 55 | 55 | { |
| 56 | - if (!empty($this->integration)) { |
|
| 56 | + if( !empty($this->integration) ) { |
|
| 57 | 57 | return true; |
| 58 | 58 | } |
| 59 | - if ($integration = $this->getIntegration()) { |
|
| 59 | + if( $integration = $this->getIntegration() ) { |
|
| 60 | 60 | $this->integration = $integration; |
| 61 | 61 | return true; |
| 62 | 62 | } |