Merge pull request #6 from woocommerce/phpcs-fixes

Fix remaining coding standards issues
woocommerce · Sep 17, 2020 · 1dc9a05 · 1dc9a05
2 parents 96556d5 + 23f7219
commit 1dc9a05
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 53 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,5 +18,5 @@ script: |
 
   if [ "$CHANGED_FILES" != "" ]; then
     composer global require woocommerce/woocommerce-sniffs --update-with-all-dependencies
-    .config/composer/vendor/bin/phpcs -p $CHANGED_FILES
+    $HOME/.config/composer/vendor/bin/phpcs -p $CHANGED_FILES
   fi
diff --git a/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php b/modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
@@ -94,7 +94,7 @@ static function ( $notices ) use ( $container ): array {
 			}
 		);
 		add_action(
-			'woocommerce-paypal-commerce-gateway.deactivate',
+			'woocommerce_paypal_commerce_gateway_deactivate',
 			static function () use ( $container ) {
 				delete_option( Settings::KEY );
 				delete_option( PayPalRequestIdRepository::KEY );

diff --git a/modules/ppcp-webhooks/src/class-webhookmodule.php b/modules/ppcp-webhooks/src/class-webhookmodule.php
@@ -64,7 +64,7 @@ static function () use ( $container ) {
 		);
 
 		add_action(
-			'woocommerce-paypal-commerce-gateway.deactivate',
+			'woocommerce_paypal_commerce_gateway_deactivate',
 			static function () use ( $container ) {
 				$registrar = $container->get( 'webhook.registrar' );
 				/**

diff --git a/woocommerce-paypal-commerce-gateway.php b/woocommerce-paypal-commerce-gateway.php
@@ -1,17 +1,18 @@
-<?php # -*- coding: utf-8 -*-
-declare( strict_types = 1 );
-
+<?php
 /**
  * Plugin Name: PayPal Payments for WooCommerce
  * Plugin URI:  TODO
- * Description: PayPal's latest complete payments processing solution. Accept PayPal. PayPal Credit, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
+ * Description: PayPal's latest complete payments processing solution. Accept PayPal, PayPal Credit, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
  * Version:     dev-master
  * Author:      WooCommerce
  * Author URI:  https://inpsyde.com/
  * License:     GPL-2.0
  * Text Domain: paypal-payments-for-woocommerce
+ *
+ * @package WooCommerce\PayPalCommerce
  */
 
+declare( strict_types = 1 );
 
 namespace WooCommerce\PayPalCommerce;
 
@@ -21,54 +22,56 @@
 use Dhii\Container\ProxyContainer;
 use Dhii\Modular\Module\ModuleInterface;
 
-(function () {
+( function () {
 	include __DIR__ . '/vendor/autoload.php';
 
-    function init()
-    {
-        static $initialized;
-        if (!$initialized) {
-            $modules = [new PluginModule()];
-            foreach (glob(plugin_dir_path(__FILE__).'modules/*/module.php') as $moduleFile) {
-                $modules[] = (@require $moduleFile)();
-            }
-            $providers = [];
-            foreach ($modules as $module) {
-                /* @var $module ModuleInterface */
-                $providers[] = $module->setup();
-            }
-            $proxy = new ProxyContainer();
-            $provider = new CompositeCachingServiceProvider($providers);
-            $container = new CachingContainer(new DelegatingContainer($provider));
-            $proxy->setInnerContainer($container);
-            foreach ($modules as $module) {
-                /* @var $module ModuleInterface */
-                $module->run($container);
-            }
-            $initialized = true;
+	/**
+	 * Initialize the plugin and its modules.
+	 */
+	function init() {
+		static $initialized;
+		if ( ! $initialized ) {
+			$modules = array( new PluginModule() );
+			foreach ( glob( plugin_dir_path( __FILE__ ) . 'modules/*/module.php' ) as $module_file ) {
+				$modules[] = ( require $module_file )();
+			}
+			$providers = array();
+			foreach ( $modules as $module ) {
+				/* @var $module ModuleInterface module */
+				$providers[] = $module->setup();
+			}
+			$proxy     = new ProxyContainer();
+			$provider  = new CompositeCachingServiceProvider( $providers );
+			$container = new CachingContainer( new DelegatingContainer( $provider ) );
+			$proxy->setInnerContainer( $container );
+			foreach ( $modules as $module ) {
+				/* @var $module ModuleInterface module */
+				$module->run( $container );
+			}
+			$initialized = true;
 
-        }
-    }
+		}
+	}
 
-    add_action(
-        'plugins_loaded',
-        function () {
-            init();
-        }
-    );
-    register_activation_hook(
-        __FILE__,
-        function () {
-            init();
-            do_action('woocommerce-paypal-commerce-gateway.activate');
-        }
-    );
-    register_deactivation_hook(
-        __FILE__,
-        function () {
-            init();
-            do_action('woocommerce-paypal-commerce-gateway.deactivate');
-        }
-    );
+	add_action(
+		'plugins_loaded',
+		function () {
+			init();
+		}
+	);
+	register_activation_hook(
+		__FILE__,
+		function () {
+			init();
+			do_action( 'woocommerce_paypal_commerce_gateway_activate' );
+		}
+	);
+	register_deactivation_hook(
+		__FILE__,
+		function () {
+			init();
+			do_action( 'woocommerce_paypal_commerce_gateway_deactivate' );
+		}
+	);
 
-})();
+} )();