devops: Test Scripts updated. (#702)

* devops: Test Scripts updated.

* chore: WPCS compliance met.

Author: kidunot89

bin/_lib.sh

@@ -2,12 +2,7 @@
 
 set +u
 
-install_wordpress() {
-	if [ -f $WP_CORE_DIR/wp-config.php ]; then
-		echo "Wordpress already installed."
-		return;
-	fi
-
+composer_wordpress_config() {
 	# Set the wordpress install directory and plugin paths in the composer.json
 	composer config --unset extra.wordpress-install-dir;
 	composer config extra.wordpress-install-dir $WP_CORE_DIR;
@@ -19,14 +14,30 @@ install_wordpress() {
 	\"$THEMES_DIR/{\$name}/\": [\"type:wordpress-theme\"]
 }"
 
+	# Set WPackagist repository
+	composer config repositories.wpackagist composer https://wpackagist.org
+
+	# Enable plugins
+	composer config --no-plugins allow-plugins.composer/installers true
+	composer config --no-plugins allow-plugins.johnpbloch/wordpress-core-installer true
+}
+
+install_wordpress() {
+	if [ -f $WP_CORE_DIR/wp-config.php ]; then
+		echo "Wordpress already installed."
+		return;
+	fi
+
+	composer_wordpress_config
+
 	# Install Wordpress + integrated plugins for testing/development.
 	composer install
 	composer require --dev -W \
 		johnpbloch/wordpress:* \
         wp-graphql/wp-graphql-jwt-authentication \
         wpackagist-plugin/woocommerce \
         wpackagist-plugin/woocommerce-gateway-stripe \
-        wpackagist-plugin/wp-graphql:* \
+        wpackagist-plugin/wp-graphql \
         wpackagist-theme/twentytwentyone \
 		wp-cli/wp-cli-bundle
 }
@@ -52,8 +63,11 @@ install_local_test_library() {
 	# Install testing library dependencies.
 	composer install
 	composer require --dev \
-		lucatume/wp-browser \
-		codeception/module-asserts:^1.0 \
+		lucatume/wp-browser:^3.1 \
+		codeception/codeception:^4.2 \
+		symfony/finder:* \
+		codeception/lib-asserts:^1.0 \
+		codeception/module-asserts:^1.3.1 \
 		codeception/module-rest:^2.0 \
 		codeception/util-universalframework:^1.0  \
 		wp-graphql/wp-graphql-testcase:^2.3 \
@@ -82,12 +96,25 @@ remove_local_test_library() {
 	# Remove testing library dependencies.
 	composer remove --dev wp-graphql/wp-graphql-testcase \
 		codeception/module-asserts \
+		codeception/codeception \
+		codeception/lib-asserts \
+		symfony/finder \
 		codeception/module-rest \
 		codeception/util-universalframework \
 		lucatume/wp-browser \
 		stripe/stripe-php
 }
 
+cleanup_composer_file() {
+	echo "Removing extra config..."
+	composer config --unset extra
+	echo "Removing repositories..."
+	composer config --unset repositories
+
+	composer config --unset config.allow-plugins
+	echo "composer.json cleaned!"
+}
+
 cleanup_local_files() {
 	if [ -n "$(ls -A $WP_CORE_DIR)" ]; then
 		echo "Removing final test files..."
@@ -98,7 +125,7 @@ cleanup_local_files() {
 	fi
 
 	echo "Rebuilding lock file..."
-	rm -rf $PROJECT_ROOT_DIR/vendor $PROJECT_ROOT_DIR/composer.lock
+	rm -rf $PROJECT_ROOT_DIR/vendor
 	composer install --no-dev
 }
 

bin/cleanup.local.sh

@@ -25,13 +25,12 @@ remove_wordpress
 # Delete symlink to
 remove_project_symlink
 
-# Remove "extra" config.
-composer config --unset extra.wordpress-install-dir
-composer config --unset extra.installer-paths
-
 # Remove testing dependencies from Composer.
 remove_local_test_library
 
+# Clean composer.json.
+cleanup_composer_file
+
 # Delete any missed files in the removal of the local installation.
 # And rebuild composer.lock
 cleanup_local_files

composer.json

@@ -20,12 +20,6 @@
             "role": "Lead developer"
         }
     ],
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://wpackagist.org"
-        }
-    ],
     "require": {
         "php": ">=7.1.0",
         "firebase/php-jwt": "^6.1.0"
@@ -39,27 +33,24 @@
         "process-timeout": 0,
         "sort-packages": true,
         "allow-plugins": {
-            "johnpbloch/wordpress-core-installer": true,
-            "composer/installers": true
+            "johnpbloch/wordpress-core-installer": true
         }
     },
     "autoload-dev": {
         "files": [
             "tests/_data/config.php"
         ],
         "psr-4": {
-          "Tests\\WPGraphQL\\WooCommerce\\": "tests/_support/"
+            "Tests\\WPGraphQL\\WooCommerce\\": "tests/_support/"
         }
     },
-    "extra": {
-    },
     "scripts": {
         "installTestEnv": "bash bin/install-test-env.local.sh",
         "runPreCommitCleanup": "bash bin/cleanup.local.sh",
         "runWPUnitTest": "vendor/bin/codecept run wpunit",
         "dBuild": "env $(sed -e '/^#/d' .env.testing) docker-compose build",
         "dRunApp": "env $(sed -e '/^#/d' .env.testing) docker-compose up testable_app app_db mailhog",
-        "dRunTestingDb":"if [ ! \"$(docker ps -a | grep testing_db)\" ]; then env $(sed -e '/^#/d' .env.testing) docker-compose up -d testing_db; fi",
+        "dRunTestingDb": "if [ ! \"$(docker ps -a | grep testing_db)\" ]; then env $(sed -e '/^#/d' .env.testing) docker-compose up -d testing_db; fi",
         "dSetMainDb": "docker-compose exec testable_app ./setup-database.sh main",
         "dSetTestingDb": "docker-compose exec testable_app wait-for-it -s -t 300 testing_db:3306 -- ./setup-database.sh testing",
         "dRunTest": [
@@ -69,30 +60,31 @@
         ],
         "dRunTestStandalone": "env $(sed -e '/^#/d' .env.testing) docker-compose run --rm run_tests",
         "dDestroy": "docker-compose down -v",
-        "lint": "vendor/bin/phpcs -vp ."
+        "lint": "vendor/bin/phpcs -vp .",
+        "fix": "vendor/bin/phpcbf -vp ."
     },
     "support": {
         "issues": "https://github.com/wp-graphql/wp-graphql-woocommerce/issues",
         "source": "https://github.com/wp-graphql/wp-graphql-woocommerce"
     },
     "archive": {
-      "name": "wp-graphql-wooocommerce",
-      "exclude": [
-        "/.*",
-        "/bin",
-        "/docs",
-        "/local",
-        "/plugin-build",
-        "/tests",
-        "!/vendor",
-        "/codeception.dist.yml",
-        "/codeception.yml",
-        "/composer.json",
-        "/composer.lock",
-        "/docker-compose.yml",
-        "/Dockerfile",
-        "/netlify.toml",
-        "/README.md"
-      ]
+        "name": "wp-graphql-wooocommerce",
+        "exclude": [
+            "/.*",
+            "/bin",
+            "/docs",
+            "/local",
+            "/plugin-build",
+            "/tests",
+            "!/vendor",
+            "/codeception.dist.yml",
+            "/codeception.yml",
+            "/composer.json",
+            "/composer.lock",
+            "/docker-compose.yml",
+            "/Dockerfile",
+            "/netlify.toml",
+            "/README.md"
+        ]
     }
 }

composer.lock

@@ -4,8 +4,6 @@ services:
   # Main application database.
   app_db:
     image: mysql
-    volumes:
-      - app_db_data
     command: --default-authentication-plugin=mysql_native_password
     environment:
       MYSQL_ROOT_PASSWORD: ${ROOT_PASSWORD:-password}
@@ -43,7 +41,8 @@ services:
     env_file: .env.testing
     environment:
       APACHE_RUN_USER: "#1000" # Ensure Apache can write to the filesystem.
-      XDEBUG_CONFIG: remote_host=10.0.0.52 idekey=vscode
+      DOCKER_GATEWAY_HOST: "172.17.0.1"
+      XDEBUG_CONFIG: remote_host=${DOCKER_GATEWAY_HOST:-host.docker.internal} idekey=vscode
     networks:
       development:
     ports:
@@ -99,6 +98,3 @@ services:
 networks:
   development:
   testing:
-
-volumes:
-  app_db_data: {}

docker-compose.yml

@@ -114,29 +114,29 @@ private static function get_customer_order_connection( $resolver, $customer ) {
 		}
 
 		$meta_query = false;
-		if ( ! empty ( $customer->get_id() ) ) {
+		if ( ! empty( $customer->get_id() ) ) {
 			$meta_query = [
 				[
-					'key'          => '_customer_user',
-					'value'        => $customer->get_id(),
-					'compare'      => '=',
+					'key'     => '_customer_user',
+					'value'   => $customer->get_id(),
+					'compare' => '=',
 				],
 			];
-		} else if ( ! empty( $customer->get_billing_email() ) ) {
+		} elseif ( ! empty( $customer->get_billing_email() ) ) {
 			$meta_query = [
 				'relation' => 'AND',
 				[
-					'key'          => '_billing_email',
-					'value'        => $customer->get_billing_email(),
-					'compare'      => '=',
+					'key'     => '_billing_email',
+					'value'   => $customer->get_billing_email(),
+					'compare' => '=',
 				],
 				[
-					'key'          => '_customer_user',
-					'value'        => 0,
-					'compare'      => '=',
-				]
+					'key'     => '_customer_user',
+					'value'   => 0,
+					'compare' => '=',
+				],
 			];
-		}
+		}//end if
 
 		// Bail if needed info not found on customer object.
 		if ( false === $meta_query ) {

includes/connection/class-orders.php

@@ -366,11 +366,11 @@ public static function set_ordering_query_args( $resolver, $args ) {
 				'_wc_average_rating',
 				'_sale_price_dates_from',
 				'_sale_price_dates_to',
-				'total_sales'
+				'total_sales',
 			];
-			$sort_fields = apply_filters( 'graphql_woocommerce_products_add_sort_fields', $default_fields );
+			$sort_fields    = apply_filters( 'graphql_woocommerce_products_add_sort_fields', $default_fields );
 			foreach ( $args['where']['orderby'] as $orderby_input ) {
-				if (in_array($orderby_input['field'], $sort_fields)){
+				if ( in_array( $orderby_input['field'], $sort_fields, true ) ) {
 					$order = $orderby_input['order'];
 
 					if ( $backward ) {
@@ -546,7 +546,7 @@ public static function get_connection_args(): array {
 	 * @return array Query arguments.
 	 */
 	public static function map_input_fields_to_wp_query( $query_args, $args, $source, $all_args, $context, $info, $post_type ) {
-		$post_type = is_array( $post_type ) ? $post_type : array( $post_type );
+		$post_type = is_array( $post_type ) ? $post_type : [ $post_type ];
 		if ( ! in_array( 'product', $post_type, true ) && ! in_array( 'product_variation', $post_type, true ) ) {
 			return $query_args;
 		}

includes/connection/class-products.php

@@ -340,7 +340,7 @@ public function add_tax( $order, $args = [], $save = true ) {
 	}
 
 	public function set_to_customer_billing_address( $order, $customer, $save = true ) {
-		$order    = \wc_get_order( $order );
+		$order = \wc_get_order( $order );
 		if ( ! $customer ) {
 			return $order;
 		}
@@ -366,7 +366,7 @@ public function set_to_customer_billing_address( $order, $customer, $save = true
 	}
 
 	public function set_to_customer_shipping_address( $order, $customer, $save = true ) {
-		$order    = \wc_get_order( $order );
+		$order = \wc_get_order( $order );
 		if ( ! $customer ) {
 			return $order;
 		}