Merge pull request #327 from wp-graphql/release/v0.6.0

Release v0.6.0

Author: kidunot89

.env.dist

@@ -30,5 +30,4 @@ CORE_BRANCH=develop
 JWT_AUTH_BRANCH=develop
 STRIPE_GATEWAY=1
 GRAPHQL_JWT_AUTH_SECRET_KEY=testingtesting123
-STRIPE_API_PUBLISHABLE_KEY=test_key
-STRIPE_API_SECRET_KEY=test_secret
+SKIP_TESTS_CLEANUP=1

.github/workflows/build-release.yml

@@ -0,0 +1,49 @@
+name: build_release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build_release:
+    name: "Build Release"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.3
+          extensions: mbstring, intl
+          tools: composer
+
+      - name: Install dependencies
+        run: composer install --no-dev
+
+      - name: List files
+        run: ls -laR
+
+      - name: Generate draft release
+        uses: meeDamian/[email protected]
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: true
+          draft: true
+          title: "Release {{ github.ref }}"
+          gzip: true
+          files: >
+            includes/
+            vendor/
+            .distignore
+            access-functions.php
+            CHANGELOG.md
+            class-inflect.php
+            LICENSE
+            logo.svg
+            README.md
+            README.txt
+            SECURITY.md
+            wp-graphql-woocommerce.php

.github/workflows/testing-integration.yml renamed to .github/workflows/continous-integration.yml

@@ -1,4 +1,4 @@
-name: Testing Integration
+name: continuous_integration
 
 on:
   schedule:
@@ -7,15 +7,17 @@ on:
     branches:
       - develop
       - master
+      - release/v0.6.0
   pull_request:
     branches:
       - develop
+      - release/v0.6.0
     paths:
       - '**.php'
       - '!docs/**'
 
 jobs:
-  run:
+  continuous_integration:
     env:
       STRIPE_API_PUBLISHABLE_KEY: ${{ secrets.STRIPE_API_PUBLISHABLE_KEY }}
       STRIPE_API_SECRET_KEY: ${{ secrets.STRIPE_API_SECRET_KEY }}
@@ -47,6 +49,20 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: json, mbstring
 
+      - name: Get Composer Cache Directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-dev
+
       - name: Build "testing" Docker Image
         env:
           PHP_VERSION: ${{ matrix.php }}

.github/workflows/wordpress-coding-standards.yml renamed to .github/workflows/lint-code.yml

@@ -1,26 +1,29 @@
-name: WordPress Coding Standards
+name: lint_code
 
 on:
   push:
     branches:
       - develop
       - master
+      - release/v0.6.0
   pull_request:
     branches:
       - develop
+      - release/v0.6.0
     paths:
       - '**.php'
       - '!docs/**'
 
 jobs:
-  run:
+  lint_code:
     runs-on: ubuntu-latest
+    name: "Lint code with PHPCS"
     steps:
       - name: Checkout
         uses: actions/checkout@v1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: 7.3
           extensions: mbstring, intl
@@ -32,11 +35,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require \
-          squizlabs/php_codesniffer \
-          phpcompatibility/phpcompatibility-wp wp-coding-standards/wpcs \
-          dealerdirect/phpcodesniffer-composer-installer
-          composer install --no-dev
+          composer install
 
       - name: Cache dependencies
         uses: actions/cache@v1
@@ -46,4 +45,4 @@ jobs:
           restore-keys: ${{ runner.os }}-composer
 
       - name: Run PHP CodeSniffer
-        run: vendor/bin/phpcs
+        run: composer lint

.phpcs.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="WordPress Coding Standards based custom ruleset for your plugin">
+	<config name="installed_paths" value="vendor/wp-coding-standards/wpcs" />
 	<description>Generally-applicable sniffs for WordPress plugins.</description>
 
 	<!-- What to scan -->
@@ -19,15 +20,16 @@
 	<arg name="colors"/>
 	<arg name="extensions" value="php"/>
 	<arg name="parallel" value="8"/><!-- Enables parallel processing when available for faster results. -->
-
 	<!-- Rules: Check PHP version compatibility -->
 	<!-- https://github.com/PHPCompatibility/PHPCompatibility#sniffing-your-code-for-compatibility-with-specific-php-versions -->
 	<config name="testVersion" value="7.0-"/>
-	<!-- https://github.com/PHPCompatibility/PHPCompatibilityWP -->
-	<rule ref="PHPCompatibilityWP"/>
 
 	<!-- Rules: WordPress Coding Standards -->
 	<!-- https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards -->
+	<rule ref="WordPress-Core" />
+	<rule ref="WordPress-Docs" />
+	<rule ref="WordPress-Extra" />
+
 	<!-- https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki/Customizable-sniff-properties -->
 	<config name="minimum_supported_wp_version" value="4.9"/>
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">

README.md

@@ -11,7 +11,7 @@
 2. Install & activate [WPGraphQL](https://www.wpgraphql.com/)
 3. Clone or download the zip of this repository into your WordPress plugin directory & activate the **WP GraphQL WooCommerce** plugin.
 4. (Optional) Install & activate [WPGraphQL-JWT-Authentication](https://github.com/wp-graphql/wp-graphql-jwt-authentication) to add a `login` mutation that returns a JSON Web Token.
-5. (Optional) Install & activate [WPGraphQL-CORS](https://github.com/funkhaus/wp-graphql-cors) to add an extra layer of security using HTTP CORS and some of WPGraphQL advanced functionality. 
+5. (Optional) Install & activate [WPGraphQL-CORS](https://github.com/funkhaus/wp-graphql-cors) to add an extra layer of security using HTTP CORS and some of WPGraphQL advanced functionality.
 
 ## What does this plugin do?
 It adds WooCommerce functionality to the WPGraphQL schema using WooCommerce's [CRUD](https://github.com/woocommerce/woocommerce/wiki/CRUD-Objects-in-3.0) objects.
@@ -37,6 +37,10 @@ Feel free to test out the extension using this [GraphiQL Playground](https://woo
 
 ## Follow [![alt text](http://i.imgur.com/tXSoThF.png)](https://twitter.com/woographql)[![alt text](http://i.imgur.com/P3YfQoD.png)](https://www.facebook.com/woographql)
 
+## Demo/Examples
+
+## Who using WooGraphQL
+
 ## Contributors
 
 ### Code Contributors

README.txt

@@ -1,16 +1,16 @@
-=== WP GraphQL WooCommerce ===
-Contributors: kidunot89, ranaaterning, jasonbahl, saleebm
-Tags: GraphQL, WooCommerce, WPGraphQL
-Requires at least: 4.9
-Tested up to: 5.2
-Requires PHP: 7.0
-Requires WooCommerce: 3.0.0
-Requires WPGraphQL: 0.8.0+
-Works with WPGraphQL-JWT-Authentication: 0.4.0+
-Stable tag: 0.5.1
-License: GPL-3
-License URI: https://www.gnu.org/licenses/gpl-3.0.html
-Maintained at: https://github.com/wp-graphql/wp-graphql-woocommerce
-
-== Description ==
-Adds WooCommerce functionality to the WPGraphQL schema.
+=== WP GraphQL WooCommerce ===
+Contributors: kidunot89, ranaaterning, jasonbahl, saleebm
+Tags: GraphQL, WooCommerce, WPGraphQL
+Requires at least: 4.9
+Tested up to: 5.2
+Requires PHP: 7.0
+Requires WooCommerce: 4.7.0
+Requires WPGraphQL: 0.13.4+
+Works with WPGraphQL-JWT-Authentication: 0.4.0+
+Stable tag: 0.6.0
+License: GPL-3
+License URI: https://www.gnu.org/licenses/gpl-3.0.html
+Maintained at: https://github.com/wp-graphql/wp-graphql-woocommerce
+
+== Description ==
+Adds WooCommerce functionality to the WPGraphQL schema.

bin/run-docker.sh

@@ -2,6 +2,17 @@
 
 set -eu
 
+print_usage_instructions() {
+	echo "Usage: $0 build|run [-e=env-file ] [-a|-t]";
+	exit 1
+}
+
+if [ -z "$1" ]; then
+	print_usage_instructions
+fi
+
+env_file=".env.dist";
+
 subcommand=$1; shift
 case "$subcommand" in
     "build" )
@@ -20,23 +31,30 @@ case "$subcommand" in
                     --build-arg WP_VERSION=${WP_VERSION-5.4} \
                     --build-arg PHP_VERSION=${PHP_VERSION-7.4} \
                     .
-                
+
                 docker build -f docker/testing.Dockerfile \
                     -t woographql-testing:latest \
                     --build-arg USE_XDEBUG=${USE_XDEBUG-} \
                     .
                     ;;
-                \? ) echo "Usage: $0 build [-a|-t]";;
-                * ) echo "Usage: $0 build [-a|-t]";;
+                \? ) print_usage_instructions;;
+                * ) print_usage_instructions;;
             esac
         done
         shift $((OPTIND -1))
         ;;
     "run" )
-        while getopts ":a:t" opt; do
+        while getopts "e:at" opt; do
             case ${opt} in
-                a ) docker-compose up -d --scale testing=0 --build;;
+				e )
+				env_file=${OPTARG};
+				if [ ! -f $env_file ]; then
+					echo "No file found at $env_file"
+				fi
+				;;
+                a ) docker-compose up --scale testing=0;;
                 t )
+				source ${env_file}
                 docker-compose run --rm \
                     -e STRIPE_API_PUBLISHABLE_KEY=${STRIPE_API_PUBLISHABLE_KEY-} \
                     -e STRIPE_API_SECRET_KEY=${STRIPE_API_SECRET_KEY-} \
@@ -46,13 +64,13 @@ case "$subcommand" in
                     -e SKIP_TESTS_CLEANUP=${SKIP_TESTS_CLEANUP-} \
                     testing --scale app=0
                     ;;
-                \? ) echo "Usage: $0 run [-a|-t]";;
-                * ) echo "Usage: $0 run [-a|-t]";;
+                \? ) print_usage_instructions;;
+                * ) print_usage_instructions;;
             esac
         done
         shift $((OPTIND -1))
         ;;
 
-    \? ) echo "Usage: $0 <build|run> [-a|-t]";;
-    * ) echo "Usage: $0 <build|run> [-a|-t]";;
+    \? ) print_usage_instructions;;
+    * ) print_usage_instructions;;
 esac