feat: QL Events settings tab added and schema organized

.env.testing

@@ -17,7 +17,7 @@ WP_TEST_DB_PORT=3306
 WP_TEST_DB_USER=wordpress
 WP_TEST_DB_PASSWORD=password
 ROOT_PASSWORD=password
-WP_TABLE_PREFIX=wp_
+WP_TABLE_PREFIX=test_
 SKIP_DB_CREATE=true
 SKIP_WP_SETUP=true
 

.env.testing.tric

@@ -37,7 +37,7 @@ WP_DB_PORT=3306
 
 # The databse is served from the Docker `db` container.
 # See `dev/docker/ci-compose.yml` for more information.
-WP_TABLE_PREFIX=wp_
+WP_TABLE_PREFIX=test_
 WP_DB_HOST=db
 WP_DB_NAME=test
 WP_DB_USER=root

.github/workflows/tests-php-alt.yml

@@ -19,19 +19,25 @@ jobs:
     strategy:
       matrix:
         php: ['8.1', '8.0', '7.4']
-        wordpress: ['6.1', '5.9', '5.6']
+        wordpress: ['6.2', '6.1', '6.0']
         composer_version: ['v2']
         include:
           - php: '7.4'
-            wordpress: '5.9'
+            wordpress: '6.1'
             coverage: '--coverage --coverage-xml'
-            xdebug: 1
+            xdebug: '2.9.6'
           - php: '8.1'
-            wordpress: '5.6'
+            wordpress: '6.0'
             debug: '--debug'
+          - php: '7.4'
+            xdebug: '3.1.6'
+          - php: '8.0'
+            xdebug: '3.1.6'
+          - php: '8.1'
+            xdebug: '3.2.1'
 
       fail-fast: false
-    name: WordPress ${{ matrix.wordpress }} on PHP ${{ matrix.php }}
+    name: Testing QL Events in WordPress v${{ matrix.wordpress }} running on PHP ${{ matrix.php }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -45,8 +51,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
 
-
       - name: Install dependencies
+        env:
+          WP_VERSION: ${{ matrix.wordpress }}
         run: |
           cp .env.testing .env
           rm -rf composer.lock
@@ -55,10 +62,9 @@ jobs:
 
       - name: Run Tests w/ Docker.
         env:
-          USING_XDEBUG: ${{ matrix.xdebug }}
+          XDEBUG_VERSION: ${{ matrix.xdebug }}
           WP_VERSION: ${{ matrix.wordpress }}
           PHP_VERSION: ${{ matrix.php }}
-
         run: composer run-codeception -- ${{ matrix.coverage }} ${{ matrix.debug }}
 
       - name: Push Codecoverage to Coveralls.io

Dockerfile

@@ -1,5 +1,4 @@
-ARG PHP_VERSION=7.4
-
+ARG PHP_VERSION
 FROM wordpress:php${PHP_VERSION}-apache
 
 ARG XDEBUG_VERSION=2.9.6
@@ -15,7 +14,8 @@ COPY local/php.ini /usr/local/etc/php/php.ini
 
 # Setup xdebug. The latest version supported by PHP 5.6 is 2.5.5.
 RUN	pecl install "xdebug-${XDEBUG_VERSION}"; \
-	docker-php-ext-enable xdebug
+	docker-php-ext-enable xdebug; \
+	echo "xdebug.mode=coverage" >> /usr/local/etc/php/conf.d/xdebug.ini;
 
 # Install PDO MySQL driver.
 RUN docker-php-ext-install \

access-functions.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * This file contains access functions for various class methods
+ *
+ * @package WPGraphQL\QL_Events
+ * @since 0.1.0
+ */
+
+if ( ! function_exists( 'ql_events_setting' ) ) :
+	/**
+	 * Get an option value from QL Events settings
+	 *
+	 * @param string $option_name  The key of the option to return.
+	 * @param mixed  $default      The default value the setting should return if no value is set.
+	 * @param string $section_name The settings section name.
+	 *
+	 * @return mixed|string|int|boolean
+	 */
+	function ql_events_setting( string $option_name, $default = '', $section_name = 'ql_events_settings' ) {
+		$section_fields = get_option( $section_name );
+
+		/**
+		 * Filter the section fields
+		 *
+		 * @param array  $section_fields The values of the fields stored for the section
+		 * @param string $section_name   The name of the section
+		 * @param mixed  $default        The default value for the option being retrieved
+		 */
+		$section_fields = apply_filters( 'ql_events_settings_section_fields', $section_fields, $section_name, $default );
+
+		/**
+		 * Get the value from the stored data, or return the default
+		 */
+		$value = isset( $section_fields[ $option_name ] ) ? $section_fields[ $option_name ] : $default;
+
+		/**
+		 * Filter the value before returning it
+		 *
+		 * @param mixed  $value          The value of the field
+		 * @param mixed  $default        The default value if there is no value set
+		 * @param string $option_name    The name of the option
+		 * @param array  $section_fields The setting values within the section
+		 * @param string $section_name   The name of the section the setting belongs to
+		 */
+		return apply_filters( 'ql_events_settings_section_field_value', $value, $default, $option_name, $section_fields, $section_name );
+	}
+endif;
+
+if ( ! function_exists( 'ql_events_ends_with' ) ) :
+	/**
+	 * Simple "endsWith" function because PHP still doesn't have on built-in.
+	 *
+	 * @param string $haystack  Source string.
+	 * @param string $needle    Target substring.
+	 *
+	 * @return bool
+	 */
+	function ql_events_ends_with( $haystack, $needle ) {
+		$length = strlen( $needle );
+		if ( 0 === $length ) {
+			return true;
+		}
+
+		return ( substr( $haystack, -$length ) === $needle );
+	}
+endif;

codeception.dist.yml

@@ -48,7 +48,9 @@ modules:
         - events-filterbar/the-events-calendar-filter-view.php
         - events-pro/events-calendar-pro.php
         - events-virtual/events-virtual.php
+        - woocommerce/woocommerce.php
         - wp-graphql/wp-graphql.php
+        - wp-graphql-woocommerce/wp-graphql-woocommerce.php
         - ql-events/ql-events.php
       activatePlugins:
         - the-events-calendar/the-events-calendar.php
@@ -57,6 +59,8 @@ modules:
         - events-filterbar/the-events-calendar-filter-view.php
         - events-pro/events-calendar-pro.php
         - events-virtual/events-virtual.php
+        - woocommerce/woocommerce.php
         - wp-graphql/wp-graphql.php
+        - wp-graphql-woocommerce/wp-graphql-woocommerce.php
         - ql-events/ql-events.php
       configFile: 'tests/_data/config.php'

docker-compose.yml

@@ -12,9 +12,12 @@ services:
       MYSQL_PASSWORD: password
 
   wordpress:
-    image: ql-events/wordpress:${WORDPRESS_IMAGE_VERSION:-latest}
+    image: ql-events/wordpress:${WP_VERSION:-latest}
     build:
       context: .
+      args:
+        PHP_VERSION: ${PHP_VERSION:-8.0}
+        XDEBUG_VERSION: ${XDEBUG_VERSION:-2.9.6}
     depends_on:
       - mysql
       - mysql_phpunit