Skip to content

Commit

Permalink
fix linting regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
jazzsequence committed Jun 28, 2024
1 parent d7d9d8c commit e39ee71
Show file tree
Hide file tree
Showing 11 changed files with 300 additions and 352 deletions.
16 changes: 8 additions & 8 deletions inc/compatibility/base.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ protected function run_fix_everytime() {
* @return void
*/
protected function persist_data( array $plugin_methods = [] ) {
$pantheon_applied_fixes = get_option( 'pantheon_applied_fixes' ) ?: [];
$old = $pantheon_applied_fixes[ static::$plugin_slug ] ?? [];
$pantheon_applied_fixes = get_option( 'pantheon_applied_fixes' ) ?: [];
$old = $pantheon_applied_fixes[ static::$plugin_slug ] ?? [];
$pantheon_applied_fixes[ static::$plugin_slug ] = [
'plugin_slug' => static::$plugin_slug,
'plugin_name' => static::$plugin_name,
'plugin_status' => $plugin_methods ? 'automated' : 'waiting',
'plugin_message' => 'Manual fixes can be safely removed.',
'plugin_class' => static::class,
'plugin_methods' => implode( ',', $plugin_methods ),
'plugin_slug' => static::$plugin_slug,
'plugin_name' => static::$plugin_name,
'plugin_status' => $plugin_methods ? 'automated' : 'waiting',
'plugin_message' => 'Manual fixes can be safely removed.',
'plugin_class' => static::class,
'plugin_methods' => implode( ',', $plugin_methods ),
'plugin_timestamp' => time(),
];
// Update the option with the modified array.
Expand Down
34 changes: 17 additions & 17 deletions inc/compatibility/class-compatibilityfactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,22 @@ private function require_files() {
private function setup_targets() {
static::$targets = [
AcceleratedMobilePages::class => [ 'slug' => 'accelerated-mobile-pages/accelerated-mobile-pages.php' ],
Auth0::class => [ 'slug' => 'auth0/WP_Auth0.php' ],
Autoptimize::class => [ 'slug' => 'autoptimize/autoptimize.php' ],
BetterSearchReplace::class => [ 'slug' => 'better-search-replace/better-search-replace.php' ],
BrokenLinkChecker::class => [ 'slug' => 'broken-link-checker/broken-link-checker.php' ],
ContactFormSeven::class => [ 'slug' => 'contact-form-7/wp-contact-form-7.php' ],
EventEspresso::class => [ 'slug' => 'event-espresso-decaf/espresso.php' ],
FastVelocityMinify::class => [ 'slug' => 'fast-velocity-minify/fvm.php' ],
ForceLogin::class => [ 'slug' => 'wp-force-login/wp-force-login.php' ],
OfficialFacebookPixel::class => [ 'slug' => 'official-facebook-pixel/facebook-for-wordpress.php' ],
Polylang::class => [ 'slug' => 'polylang/polylang.php' ],
Redirection::class => [ 'slug' => 'redirection/redirection.php' ],
SliderRevolution::class => [ 'slug' => 'slider-revolution/slider-revolution.php' ],
TweetOldPost::class => [ 'slug' => 'tweet-old-post/tweet-old-post.php' ],
WPRocket::class => [ 'slug' => 'wp-rocket/wp-rocket.php' ],
WooZone::class => [ 'slug' => 'woozone/plugin.php' ],
YITHWoocommerce::class => [ 'slug' => 'yith-woocommerce-request-a-quote/yith-woocommerce-request-a-quote.php' ],
Auth0::class => [ 'slug' => 'auth0/WP_Auth0.php' ],
Autoptimize::class => [ 'slug' => 'autoptimize/autoptimize.php' ],
BetterSearchReplace::class => [ 'slug' => 'better-search-replace/better-search-replace.php' ],
BrokenLinkChecker::class => [ 'slug' => 'broken-link-checker/broken-link-checker.php' ],
ContactFormSeven::class => [ 'slug' => 'contact-form-7/wp-contact-form-7.php' ],
EventEspresso::class => [ 'slug' => 'event-espresso-decaf/espresso.php' ],
FastVelocityMinify::class => [ 'slug' => 'fast-velocity-minify/fvm.php' ],
ForceLogin::class => [ 'slug' => 'wp-force-login/wp-force-login.php' ],
OfficialFacebookPixel::class => [ 'slug' => 'official-facebook-pixel/facebook-for-wordpress.php' ],
Polylang::class => [ 'slug' => 'polylang/polylang.php' ],
Redirection::class => [ 'slug' => 'redirection/redirection.php' ],
SliderRevolution::class => [ 'slug' => 'slider-revolution/slider-revolution.php' ],
TweetOldPost::class => [ 'slug' => 'tweet-old-post/tweet-old-post.php' ],
WPRocket::class => [ 'slug' => 'wp-rocket/wp-rocket.php' ],
WooZone::class => [ 'slug' => 'woozone/plugin.php' ],
YITHWoocommerce::class => [ 'slug' => 'yith-woocommerce-request-a-quote/yith-woocommerce-request-a-quote.php' ],
];
$this->add_names_to_targets();
}
Expand All @@ -116,7 +116,7 @@ private function add_names_to_targets() {
return;
}

$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin['slug'] );
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin['slug'] );
$plugin['name'] = $plugin_data['Name'];
} );
}
Expand Down
3 changes: 1 addition & 2 deletions inc/compatibility/class-fastvelocityminify.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@ public function apply_fix() {
/**
* @return void
*/
public function remove_fix() {
}
public function remove_fix() {}
}
3 changes: 1 addition & 2 deletions inc/compatibility/class-officialfacebookpixel.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ public function apply_fix() {
/**
* @return void
*/
public function remove_fix() {
}
public function remove_fix() {}
}
3 changes: 1 addition & 2 deletions inc/compatibility/class-polylang.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ public function apply_fix() {
/**
* @return void
*/
public function remove_fix() {
}
public function remove_fix() {}
}
3 changes: 1 addition & 2 deletions inc/compatibility/class-sliderrevolution.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ public function apply_fix() {
/**
* @return void
*/
public function remove_fix() {
}
public function remove_fix() {}
}
3 changes: 1 addition & 2 deletions inc/compatibility/class-woozone.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ public function apply_fix() {
/**
* @return void
*/
public function remove_fix() {
}
public function remove_fix() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static function apply() {
return;
}
http_response_code( 301 );
$protocol = ( 0 === stripos( $_SERVER['SERVER_PROTOCOL'], 'https' ) ) ? 'https://' : 'http://';
$protocol = ( 0 === stripos( $_SERVER['SERVER_PROTOCOL'], 'https' ) ) ? 'https://' : 'http://';
$redirect_header_value = $protocol . PANTHEON_HOSTNAME . $_SERVER['REQUEST_URI'] . '/amp';
header( 'Location: ' . $redirect_header_value );

Expand Down
9 changes: 4 additions & 5 deletions inc/compatibility/fixes/class-auth0fix.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public static function apply() {
/**
* @return void
*/
public static function remove() {
}
public static function remove() {}

/**
* @return void
Expand All @@ -42,9 +41,9 @@ public static function fix() {
return;
}

$sdk = wpAuth0()->getSdk();
$config = $sdk->configuration();
$storage_id = 'STYXKEY_' . $config->getSessionStorageId();
$sdk = wpAuth0()->getSdk();
$config = $sdk->configuration();
$storage_id = 'STYXKEY_' . $config->getSessionStorageId();
$transient_id = 'STYXKEY_' . $config->getTransientStorageId();
$config->setSessionStorageId( $storage_id );
$config->setTransientStorageId( $transient_id );
Expand Down
7 changes: 3 additions & 4 deletions inc/compatibility/fixes/class-yithchangepdflocationfix.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public static function apply() {
/**
* @return void
*/
public static function remove() {
}
public static function remove() {}

/**
* Changes PDF cache location for YITH WooCommerce extensions.
Expand All @@ -37,8 +36,8 @@ public static function remove() {
* @return array The updated config with writable path.
*/
public function yith_mpdf_change_tmp_dir( array $args ): array {
$upload_dir = wp_upload_dir();
$upload_dir = $upload_dir['basedir'];
$upload_dir = wp_upload_dir();
$upload_dir = $upload_dir['basedir'];
$args['tempDir'] = $upload_dir . '/yith-mpdf-tmp/';

return $args;
Expand Down
Loading

0 comments on commit e39ee71

Please # to comment.