From 4daca6dde078ae448e5896dd18cb1841e0a19e8a Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Wed, 2 Sep 2020 10:56:26 +0300
Subject: [PATCH] phpcs

---
 .../src/Settings/class-sectionrenderer.php    | 41 -------------
 .../src/Settings/class-sectionsrenderer.php   | 58 +++++++++++++++++++
 .../src/Settings/class-settingsrenderer.php   |  5 +-
 .../src/class-wcgatewaymodule.php             |  8 +--
 4 files changed, 65 insertions(+), 47 deletions(-)
 delete mode 100644 modules/ppcp-wc-gateway/src/Settings/class-sectionrenderer.php
 create mode 100644 modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php

diff --git a/modules/ppcp-wc-gateway/src/Settings/class-sectionrenderer.php b/modules/ppcp-wc-gateway/src/Settings/class-sectionrenderer.php
deleted file mode 100644
index 489622e72..000000000
--- a/modules/ppcp-wc-gateway/src/Settings/class-sectionrenderer.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-declare( strict_types=1 );
-
-namespace Inpsyde\PayPalCommerce\WcGateway\Settings;
-
-
-use Inpsyde\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
-
-class SectionsRenderer {
-
-	public const KEY = 'ppcp-tab';
-
-	public function should_render() : bool {
-
-		global $current_section;
-		return $current_section === PayPalGateway::ID;
-	}
-	public function render() {
-		if (! $this->should_render()) {
-			return;
-		}
-
-		$current = ! isset($_GET[self::KEY]) ? 'paypal' : sanitize_text_field(wp_unslash($_GET[self::KEY]));
-		$sections = [
-			'paypal' => __( 'PayPal', 'paypal-for-woocommerce' ),
-			'dcc'    => __( 'Credit Card', 'paypal-for-woocommerce' ),
-		];
-
-		echo '<ul class="subsubsub">';
-
-		$array_keys = array_keys( $sections );
-
-		foreach ( $sections as $id => $label ) {
-			$url = admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&' . self::KEY . '=' . $id );
-			echo '<li><a href="' . $url . '" class="' . ( $current == $id ? 'current' : '' ) . '">' . esc_html($label) . '</a> ' . ( end( $array_keys ) == $id ? '' : '|' ) . ' </li>';
-		}
-
-		echo '</ul><br class="clear" />';
-		return;
-	}
-}
\ No newline at end of file
diff --git a/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php
new file mode 100644
index 000000000..b0c1e64b4
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Renders the Sections Tab.
+ *
+ * @package Inpsyde\PayPalCommerce\WcGateway\Settings
+ */
+
+declare( strict_types=1 );
+
+namespace Inpsyde\PayPalCommerce\WcGateway\Settings;
+
+use Inpsyde\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+
+/**
+ * Class SectionsRenderer
+ */
+class SectionsRenderer {
+
+	public const KEY = 'ppcp-tab';
+
+	/**
+	 * Whether the sections tab should be rendered.
+	 *
+	 * @return bool
+	 */
+	public function should_render() : bool {
+
+		global $current_section;
+		return PayPalGateway::ID === $current_section;
+	}
+
+	/**
+	 * Renders the Sections tab.
+	 */
+	public function render() {
+		if ( ! $this->should_render() ) {
+			return;
+		}
+
+		//phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$current  = ! isset( $_GET[ self::KEY ] ) ? 'paypal' : sanitize_text_field( wp_unslash( $_GET[ self::KEY ] ) );
+		$sections = array(
+			'paypal' => __( 'PayPal', 'paypal-for-woocommerce' ),
+			'dcc'    => __( 'Credit Card', 'paypal-for-woocommerce' ),
+		);
+
+		echo '<ul class="subsubsub">';
+
+		$array_keys = array_keys( $sections );
+
+		foreach ( $sections as $id => $label ) {
+			$url = admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&' . self::KEY . '=' . $id );
+			echo '<li><a href="' . esc_url( $url ) . '" class="' . ( $current === $id ? 'current' : '' ) . '">' . esc_html( $label ) . '</a> ' . ( end( $array_keys ) === $id ? '' : '|' ) . ' </li>';
+		}
+
+		echo '</ul><br class="clear" />';
+	}
+}
diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
index 53625e725..fb0654a3c 100644
--- a/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
@@ -212,8 +212,9 @@ class SettingsRenderer {
 	 */
 	public function render() {
 
-	    $is_dcc = isset($_GET[SectionsRenderer::KEY]) && 'dcc' === sanitize_text_field(wp_unslash($_GET[SectionsRenderer::KEY]));
-		$nonce = wp_create_nonce( SettingsListener::NONCE );
+	    //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$is_dcc = isset( $_GET[ SectionsRenderer::KEY ] ) && 'dcc' === sanitize_text_field( wp_unslash( $_GET[ SectionsRenderer::KEY ] ) );
+		$nonce  = wp_create_nonce( SettingsListener::NONCE );
 		?>
 		<input type="hidden" name="ppcp-nonce" value="<?php echo esc_attr( $nonce ); ?>">
 		<?php
diff --git a/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php b/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
index 2c0bb1f09..accc32bbe 100644
--- a/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
+++ b/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
@@ -59,8 +59,8 @@ class WcGatewayModule implements ModuleInterface {
 
 		add_action(
 			'woocommerce_sections_checkout',
-			function() use ($container) {
-				$section_renderer = $container->get('wcgateway.settings.sections-renderer');
+			function() use ( $container ) {
+				$section_renderer = $container->get( 'wcgateway.settings.sections-renderer' );
 				/**
 				 * The Section Renderer.
 				 *
@@ -173,13 +173,13 @@ class WcGatewayModule implements ModuleInterface {
 				$methods[]   = $container->get( 'wcgateway.paypal-gateway' );
 				$dcc_applies = $container->get( 'api.helpers.dccapplies' );
 
-				$screen = ! function_exists('get_current_screen') ? (object) ['id' => 'front'] : get_current_screen();
+				$screen = ! function_exists( 'get_current_screen' ) ? (object) array( 'id' => 'front' ) : get_current_screen();
 				/**
 				 * The DCC Applies object.
 				 *
 				 * @var DccApplies $dcc_applies
 				 */
-				if ( $screen->id !== 'woocommerce_page_wc-settings' && $dcc_applies->for_country_currency() ) {
+				if ( 'woocommerce_page_wc-settings' !== $screen->id && $dcc_applies->for_country_currency() ) {
 					$methods[] = $container->get( 'wcgateway.credit-card-gateway' );
 				}
 				return (array) $methods;