@@ -18,7 +18,7 @@ |
||
| 18 | 18 | 'avatar' => '', |
| 19 | 19 | 'content' => '', |
| 20 | 20 | 'custom' => '', |
| 21 | - 'date' => get_date_from_gmt( gmdate( 'Y-m-d H:i:s' )), |
|
| 21 | + 'date' => get_date_from_gmt( gmdate( 'Y-m-d H:i:s' ) ), |
|
| 22 | 22 | 'email' => '', |
| 23 | 23 | 'ip_address' => glsr( Helper::class )->getIpAddress(), |
| 24 | 24 | 'pinned' => false, |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | public function callbackRegisterSettings( $input ) |
| 19 | 19 | { |
| 20 | - if( !is_array( $input )) { |
|
| 20 | + if( !is_array( $input ) ) { |
|
| 21 | 21 | $input = ['settings' => []]; |
| 22 | 22 | } |
| 23 | 23 | if( key( $input ) == 'settings' ) { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $options = $this->sanitizeGeneral( $input, $options ); |
| 26 | 26 | $options = $this->sanitizeSubmissions( $input, $options ); |
| 27 | 27 | $options = $this->sanitizeTranslations( $input, $options ); |
| 28 | - glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' )); |
|
| 28 | + glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) ); |
|
| 29 | 29 | return $options; |
| 30 | 30 | } |
| 31 | 31 | return $input; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [ |
| 41 | 41 | 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
| 42 | - ]); |
|
| 42 | + ] ); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | if( $inputForm['support']['polylang'] == 'yes' ) { |
| 52 | 52 | if( !glsr( Polylang::class )->isActive() ) { |
| 53 | 53 | $options['settings']['general']['support']['polylang'] = 'no'; |
| 54 | - glsr( Notice::class )->addError( __( 'Please install/activate the Polylang plugin to enable integration.', 'site-reviews' )); |
|
| 54 | + glsr( Notice::class )->addError( __( 'Please install/activate the Polylang plugin to enable integration.', 'site-reviews' ) ); |
|
| 55 | 55 | } |
| 56 | 56 | else if( !glsr( Polylang::class )->isSupported() ) { |
| 57 | 57 | $options['settings']['general']['support']['polylang'] = 'no'; |
| 58 | - glsr( Notice::class )->addError( __( 'Please update the Polylang plugin to v2.3.0 or greater to enable integration.', 'site-reviews' )); |
|
| 58 | + glsr( Notice::class )->addError( __( 'Please update the Polylang plugin to v2.3.0 or greater to enable integration.', 'site-reviews' ) ); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | - if( !isset( $inputForm['notifications'] )) { |
|
| 61 | + if( !isset($inputForm['notifications']) ) { |
|
| 62 | 62 | $options['settings']['general']['notifications'] = []; |
| 63 | 63 | } |
| 64 | 64 | if( trim( $inputForm['notification_message'] ) == '' ) { |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | protected function sanitizeSubmissions( array $input, array $options ) |
| 74 | 74 | { |
| 75 | 75 | $inputForm = $input['settings']['submissions']; |
| 76 | - if( !isset( $inputForm['required'] )) { |
|
| 76 | + if( !isset($inputForm['required']) ) { |
|
| 77 | 77 | $options['settings']['submissions']['required'] = []; |
| 78 | 78 | } |
| 79 | 79 | return $options; |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | protected function sanitizeTranslations( array $input, array $options ) |
| 86 | 86 | { |
| 87 | - if( isset( $input['settings']['strings'] )) { |
|
| 88 | - $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] )); |
|
| 87 | + if( isset($input['settings']['strings']) ) { |
|
| 88 | + $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) ); |
|
| 89 | 89 | $allowedTags = ['a' => ['class' => [], 'href' => [], 'target' => []]]; |
| 90 | - array_walk( $options['settings']['strings'], function( &$string ) use( $allowedTags ) { |
|
| 91 | - if( isset( $string['s2'] )) { |
|
| 90 | + array_walk( $options['settings']['strings'], function( &$string ) use($allowedTags) { |
|
| 91 | + if( isset($string['s2']) ) { |
|
| 92 | 92 | $string['s2'] = wp_kses( $string['s2'], $allowedTags ); |
| 93 | 93 | } |
| 94 | - if( isset( $string['p2'] )) { |
|
| 94 | + if( isset($string['p2']) ) { |
|
| 95 | 95 | $string['p2'] = wp_kses( $string['p2'], $allowedTags ); |
| 96 | 96 | } |
| 97 | 97 | }); |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | $review = glsr( ReviewManager::class )->create( $command ); |
| 18 | 18 | if( !$review ) { |
| 19 | 19 | glsr( Session::class )->set( $command->form_id.'errors', [] ); |
| 20 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' )); |
|
| 20 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) ); |
|
| 21 | 21 | return; |
| 22 | 22 | } |
| 23 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
|
| 23 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) ); |
|
| 24 | 24 | glsr( Notification::class )->send( $review ); |
| 25 | 25 | if( $command->ajax_request )return; |
| 26 | - wp_safe_redirect( $this->getReferer( $command )); |
|
| 26 | + wp_safe_redirect( $this->getReferer( $command ) ); |
|
| 27 | 27 | exit; |
| 28 | 28 | } |
| 29 | 29 | |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | protected function getReferer( Command $command ) |
| 34 | 34 | { |
| 35 | - $referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ))); |
|
| 36 | - if( empty( $referer )) { |
|
| 35 | + $referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) ); |
|
| 36 | + if( empty($referer) ) { |
|
| 37 | 37 | $referer = $command->referer; |
| 38 | 38 | } |
| 39 | - if( empty( $referer )) { |
|
| 39 | + if( empty($referer) ) { |
|
| 40 | 40 | glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->info( $command ); |
| 41 | 41 | $referer = home_url(); |
| 42 | 42 | } |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | } |
| 23 | 23 | glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
| 24 | 24 | glsr( Notification::class )->send( $review ); |
| 25 | - if( $command->ajax_request )return; |
|
| 25 | + if( $command->ajax_request ) { |
|
| 26 | + return; |
|
| 27 | + } |
|
| 26 | 28 | wp_safe_redirect( $this->getReferer( $command )); |
| 27 | 29 | exit; |
| 28 | 30 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | { |
| 29 | 29 | $fields = []; |
| 30 | 30 | foreach( glsr()->config( 'forms/'.$id ) as $name => $field ) { |
| 31 | - $fields[] = new Field( wp_parse_args( $field, ['name' => $name] )); |
|
| 31 | + $fields[] = new Field( wp_parse_args( $field, ['name' => $name] ) ); |
|
| 32 | 32 | } |
| 33 | 33 | return $fields; |
| 34 | 34 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | // Database/ReviewManager.php |
| 6 | 6 | add_action( 'site-reviews/review/created', function( $review ) { |
| 7 | - if( has_action( 'site-reviews/local/review/create' )) { |
|
| 7 | + if( has_action( 'site-reviews/local/review/create' ) ) { |
|
| 8 | 8 | glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/create/review" hook instead.'; |
| 9 | 9 | do_action( 'site-reviews/local/review/create', (array)get_post( $review->ID ), (array)$review, $review->ID ); |
| 10 | 10 | } |
@@ -12,18 +12,18 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | // Handlers/CreateReview.php |
| 14 | 14 | add_action( 'site-reviews/review/submitted', function( $review ) { |
| 15 | - if( has_action( 'site-reviews/local/review/submitted' )) { |
|
| 15 | + if( has_action( 'site-reviews/local/review/submitted' ) ) { |
|
| 16 | 16 | glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.'; |
| 17 | 17 | do_action( 'site-reviews/local/review/submitted', null, $review ); |
| 18 | 18 | } |
| 19 | - if( has_filter( 'site-reviews/local/review/submitted/message' )) { |
|
| 19 | + if( has_filter( 'site-reviews/local/review/submitted/message' ) ) { |
|
| 20 | 20 | glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.'; |
| 21 | 21 | } |
| 22 | 22 | }, 9 ); |
| 23 | 23 | |
| 24 | 24 | // Database/ReviewManager.php |
| 25 | 25 | add_filter( 'site-reviews/create/review-values', function( $values, $command ) { |
| 26 | - if( has_filter( 'site-reviews/local/review' )) { |
|
| 26 | + if( has_filter( 'site-reviews/local/review' ) ) { |
|
| 27 | 27 | glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.'; |
| 28 | 28 | return apply_filters( 'site-reviews/local/review', $values, $command ); |
| 29 | 29 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | // Handlers/EnqueuePublicAssets.php |
| 34 | 34 | add_filter( 'site-reviews/enqueue/public/localize', function( $variables ) { |
| 35 | - if( has_filter( 'site-reviews/enqueue/localize' )) { |
|
| 35 | + if( has_filter( 'site-reviews/enqueue/localize' ) ) { |
|
| 36 | 36 | glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.'; |
| 37 | 37 | return apply_filters( 'site-reviews/enqueue/localize', $variables ); |
| 38 | 38 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // Modules/Rating.php |
| 43 | 43 | add_filter( 'site-reviews/rating/average', function( $average ) { |
| 44 | - if( has_filter( 'site-reviews/average/rating' )) { |
|
| 44 | + if( has_filter( 'site-reviews/average/rating' ) ) { |
|
| 45 | 45 | glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.'; |
| 46 | 46 | } |
| 47 | 47 | return $average; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | // Modules/Rating.php |
| 51 | 51 | add_filter( 'site-reviews/rating/ranking', function( $ranking ) { |
| 52 | - if( has_filter( 'site-reviews/bayesian/ranking' )) { |
|
| 52 | + if( has_filter( 'site-reviews/bayesian/ranking' ) ) { |
|
| 53 | 53 | glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.'; |
| 54 | 54 | } |
| 55 | 55 | return $ranking; |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | // Modules/Html/Partials/SiteReviews.php |
| 59 | 59 | add_filter( 'site-reviews/review/build/after', function( $renderedFields ) { |
| 60 | - if( has_filter( 'site-reviews/reviews/review/text' )) { |
|
| 60 | + if( has_filter( 'site-reviews/reviews/review/text' ) ) { |
|
| 61 | 61 | glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.'; |
| 62 | 62 | } |
| 63 | - if( has_filter( 'site-reviews/reviews/review/title' )) { |
|
| 63 | + if( has_filter( 'site-reviews/reviews/review/title' ) ) { |
|
| 64 | 64 | glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.'; |
| 65 | 65 | } |
| 66 | 66 | return $renderedFields; |
@@ -68,26 +68,26 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | // Modules/Html/Partials/SiteReviews.php |
| 70 | 70 | add_filter( 'site-reviews/review/build/before', function( $review ) { |
| 71 | - if( has_filter( 'site-reviews/rendered/review' )) { |
|
| 71 | + if( has_filter( 'site-reviews/rendered/review' ) ) { |
|
| 72 | 72 | glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.'; |
| 73 | 73 | } |
| 74 | - if( has_filter( 'site-reviews/rendered/review/meta/order' )) { |
|
| 74 | + if( has_filter( 'site-reviews/rendered/review/meta/order' ) ) { |
|
| 75 | 75 | glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).'; |
| 76 | 76 | } |
| 77 | - if( has_filter( 'site-reviews/rendered/review/order' )) { |
|
| 77 | + if( has_filter( 'site-reviews/rendered/review/order' ) ) { |
|
| 78 | 78 | glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).'; |
| 79 | 79 | } |
| 80 | - if( has_filter( 'site-reviews/rendered/review-form/login-register' )) { |
|
| 80 | + if( has_filter( 'site-reviews/rendered/review-form/login-register' ) ) { |
|
| 81 | 81 | glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).'; |
| 82 | 82 | } |
| 83 | - if( has_filter( 'site-reviews/reviews/navigation_links' )) { |
|
| 83 | + if( has_filter( 'site-reviews/reviews/navigation_links' ) ) { |
|
| 84 | 84 | glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).'; |
| 85 | 85 | } |
| 86 | 86 | return $review; |
| 87 | 87 | }, 9 ); |
| 88 | 88 | |
| 89 | 89 | add_filter( 'site-reviews/validate/custom', function( $result, $request ) { |
| 90 | - if( has_filter( 'site-reviews/validate/review/submission' )) { |
|
| 90 | + if( has_filter( 'site-reviews/validate/review/submission' ) ) { |
|
| 91 | 91 | glsr_log()->notice( 'The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.' ); |
| 92 | 92 | return apply_filters( 'site-reviews/validate/review/submission', $result, $request ); |
| 93 | 93 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | }, 9, 2 ); |
| 96 | 96 | |
| 97 | 97 | add_filter( 'site-reviews/views/file', function( $file, $view, $data ) { |
| 98 | - if( has_filter( 'site-reviews/addon/views/file' )) { |
|
| 98 | + if( has_filter( 'site-reviews/addon/views/file' ) ) { |
|
| 99 | 99 | glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.'; |
| 100 | 100 | $file = apply_filters( 'site-reviews/addon/views/file', $file, $view, $data ); |
| 101 | 101 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | }, 9, 3 ); |
| 104 | 104 | |
| 105 | 105 | add_action( 'wp_footer', function() { |
| 106 | - $notices = array_keys( array_flip( glsr()->deprecated )); |
|
| 106 | + $notices = array_keys( array_flip( glsr()->deprecated ) ); |
|
| 107 | 107 | natsort( $notices ); |
| 108 | 108 | foreach( $notices as $notice ) { |
| 109 | 109 | glsr_log()->notice( $notice ); |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | <p>{{ data.s1 }}</p> |
| 8 | 8 | </div> |
| 9 | 9 | <p class="row-actions"> |
| 10 | - <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
| 10 | + <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
| 11 | 11 | </p> |
| 12 | 12 | </td> |
| 13 | 13 | <td class="glsr-string-td2"> |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | <p>{{ data.p1 }}</p> |
| 9 | 9 | </div> |
| 10 | 10 | <p class="row-actions"> |
| 11 | - <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
| 11 | + <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
| 12 | 12 | </p> |
| 13 | 13 | </td> |
| 14 | 14 | <td class="glsr-string-td2"> |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | return $this->translate( $translation, $domain, [ |
| 20 | 20 | 'single' => $text, |
| 21 | - ]); |
|
| 21 | + ] ); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | return $this->translate( $translation, $domain, [ |
| 34 | 34 | 'context' => $context, |
| 35 | 35 | 'single' => $text, |
| 36 | - ]); |
|
| 36 | + ] ); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | 'number' => $number, |
| 51 | 51 | 'plural' => $plural, |
| 52 | 52 | 'single' => $single, |
| 53 | - ]); |
|
| 53 | + ] ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | 'number' => $number, |
| 70 | 70 | 'plural' => $plural, |
| 71 | 71 | 'single' => $single, |
| 72 | - ]); |
|
| 72 | + ] ); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | $args = $this->normalizeTranslationArgs( $args ); |
| 86 | 86 | $strings = $this->getTranslationStrings( $args['single'], $args['plural'] ); |
| 87 | - if( empty( $strings )) { |
|
| 87 | + if( empty($strings) ) { |
|
| 88 | 88 | return $original; |
| 89 | 89 | } |
| 90 | 90 | $string = current( $strings ); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | protected function getTranslationStrings( $single, $plural ) |
| 102 | 102 | { |
| 103 | - return array_filter( glsr( Translation::class )->translations(), function( $string ) use( $single, $plural ) { |
|
| 103 | + return array_filter( glsr( Translation::class )->translations(), function( $string ) use($single, $plural) { |
|
| 104 | 104 | return $string['s1'] == html_entity_decode( $single, ENT_COMPAT, 'UTF-8' ) |
| 105 | 105 | && $string['p1'] == html_entity_decode( $plural, ENT_COMPAT, 'UTF-8' ); |
| 106 | 106 | }); |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | protected function translatePlural( $domain, array $string, array $args ) |
| 128 | 128 | { |
| 129 | - if( !empty( $string['s2'] )) { |
|
| 129 | + if( !empty($string['s2']) ) { |
|
| 130 | 130 | $args['single'] = $string['s2']; |
| 131 | 131 | } |
| 132 | - if( !empty( $string['p2'] )) { |
|
| 132 | + if( !empty($string['p2']) ) { |
|
| 133 | 133 | $args['plural'] = $string['p2']; |
| 134 | 134 | } |
| 135 | 135 | return get_translations_for_domain( $domain )->translate_plural( |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | protected function translateSingle( $domain, array $string, array $args ) |
| 148 | 148 | { |
| 149 | - if( !empty( $string['s2'] )) { |
|
| 149 | + if( !empty($string['s2']) ) { |
|
| 150 | 150 | $args['single'] = $string['s2']; |
| 151 | 151 | } |
| 152 | 152 | return get_translations_for_domain( $domain )->translate( |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | $className = str_replace( '.php', '', $file ); |
| 29 | 29 | $version = str_replace( ['Upgrade_', '_'], ['', '.'], $className ); |
| 30 | 30 | $versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions |
| 31 | - if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return; |
|
| 31 | + if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ) )return; |
|
| 32 | 32 | glsr( 'Modules\\Upgrader\\'.$className ); |
| 33 | 33 | glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix ); |
| 34 | 34 | }); |
@@ -20,7 +20,9 @@ discard block |
||
| 20 | 20 | $filenames = []; |
| 21 | 21 | $iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' ); |
| 22 | 22 | foreach( $iterator as $fileinfo ) { |
| 23 | - if( !$fileinfo->isFile() )continue; |
|
| 23 | + if( !$fileinfo->isFile() ) { |
|
| 24 | + continue; |
|
| 25 | + } |
|
| 24 | 26 | $filenames[] = $fileinfo->getFilename(); |
| 25 | 27 | } |
| 26 | 28 | natsort( $filenames ); |
@@ -28,7 +30,9 @@ discard block |
||
| 28 | 30 | $className = str_replace( '.php', '', $file ); |
| 29 | 31 | $version = str_replace( ['Upgrade_', '_'], ['', '.'], $className ); |
| 30 | 32 | $versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions |
| 31 | - if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return; |
|
| 33 | + if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' )) { |
|
| 34 | + return; |
|
| 35 | + } |
|
| 32 | 36 | glsr( 'Modules\\Upgrader\\'.$className ); |
| 33 | 37 | glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix ); |
| 34 | 38 | }); |