Merge pull request #77 from dadish/main

Release

Author: dadish

.circleci/config.yml

@@ -12,30 +12,30 @@ workflows:
   main:
     jobs:
       - test:
-          name: test-php-7.2
+          name: test-php-7.4
           context:
             - github-credentials
             - dockerhub-credentials
-          php: "7.2"
-          phpunit: "7.5"
+          php: "7.4"
+          phpunit: "9.6"
           mysql: "5.7.34"
 
       - test:
-          name: test-php-8.1
+          name: test-php-8.2
           context:
             - github-credentials
             - dockerhub-credentials
-          php: "8.1"
-          phpunit: "9.5.10"
+          php: "8.2"
+          phpunit: "10.1"
           mysql: "8.0.25"
 
       - approve_release:
           name: approve-release
           <<: *release_branches
           type: approval
           requires:
-            - test-php-7.2
-            - test-php-8.1
+            - test-php-7.4
+            - test-php-8.2
 
       - release:
           name: release
@@ -118,7 +118,7 @@ jobs:
 
   release:
     docker:
-      - image: dadish/processgraphql-primary:0.6.0
+      - image: dadish/processgraphql-primary:1.0.0
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

.circleci/images/primary/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.14
+FROM alpine:3.18.0
 
 RUN apk update && apk upgrade
 
@@ -11,14 +11,14 @@ RUN apk add \
   ca-certificates \
   nodejs \
   npm \
-  php7 \
-  php7-gd \
-  php7-tokenizer \
-  php7-dom \
-  php7-mysqli \
-  php7-xmlwriter \
-  php7-xml \
-  php7-ctype \
+  php \
+  php-gd \
+  php-tokenizer \
+  php-dom \
+  php-mysqli \
+  php-xmlwriter \
+  php-xml \
+  php-ctype \
   composer
 
 ENTRYPOINT ["echo", "Started!"]

Changelog.md

@@ -1,3 +1,27 @@
+# [2.0.0-rc.2](https://github.com/dadish/ProcessGraphQL/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2023-08-17)
+
+
+### Features
+
+* **deps:** upgrade webonyx/graphql-php to version 15.6.2 ([eb8939f](https://github.com/dadish/ProcessGraphQL/commit/eb8939fa3c1e8ac9026fdedb16a11f11f14a0359))
+
+# [2.0.0-rc.1](https://github.com/dadish/ProcessGraphQL/compare/v1.4.2...v2.0.0-rc.1) (2023-05-15)
+
+
+### Bug Fixes
+
+* **test:** make tests compatible with phpunit 9 and 10. ([91ac9c7](https://github.com/dadish/ProcessGraphQL/commit/91ac9c7bc1aabb86b5aa95f7088ae418e225de89))
+
+
+### Features
+
+* **deps:** update webonyx/graphql-php into latest version ([395c9b5](https://github.com/dadish/ProcessGraphQL/commit/395c9b5215d6f4f2e05ff1f7f0c8847cb927b33a))
+
+
+### BREAKING CHANGES
+
+* **deps:** The webonyx/graphql-php from now on requires PHP version 7.4 and higher. So do we from now on.
+
 ## [1.4.2](https://github.com/dadish/ProcessGraphQL/compare/v1.4.1...v1.4.2) (2023-05-14)
 
 

ProcessGraphQL.module

@@ -15,13 +15,13 @@ class ProcessGraphQL extends Process implements Module {
 	{
 		return array(
 			'title' => 'GraphQL',
-			'version' => '1.4.2',
+			'version' => '2.0.0-rc.2',
 			'summary' => 'GraphQL for ProcessWire.',
 			'href' => 'https://github.com/dadish/ProcessGraphql',
 			'singular' => true,
 			'autoload' => 'process=ProcessTemplate',
 			'icon' => 'object-group',
-      'requires' => array("PHP>=7.2", "ProcessWire>=3.0.210"),
+      'requires' => array("PHP>=7.4", "ProcessWire>=3.0.210"),
 			);
 	}
 
@@ -164,9 +164,9 @@ class ProcessGraphQL extends Process implements Module {
 		} else {
 				$requestData = $_POST;
 		}
-		$payload = isset($requestData['query']) ? $requestData['query'] : null;
-		if (is_null($payload)) {
-			$payload = isset($requestData['payload']) ? $requestData['payload'] : null;
+		$payload = isset($requestData['query']) ? $requestData['query'] : "";
+		if (empty($payload)) {
+			$payload = isset($requestData['payload']) ? $requestData['payload'] : "";
 		}
 		$variables = isset($requestData['variables']) ? $requestData['variables'] : null;
 
@@ -184,7 +184,7 @@ class ProcessGraphQL extends Process implements Module {
    * Executes GraphQL api.
    * @return string GraphQL api JSON response.
    */
-	public function ___executeGraphQL($payload = null, $variables = null)
+	public function ___executeGraphQL($payload = "", $variables = null)
 	{
 		if (!$payload) {
 			$request = $this->getRequest();

composer.json

@@ -10,15 +10,15 @@
     }
   ],
   "require": {
-    "php": "^7.1||^8.0",
-    "webonyx/graphql-php": "^14.11.3"
+    "php": "^7.4||^8.0",
+    "webonyx/graphql-php": "^15.6.2"
   },
   "require-dev": {
     "processwire/processwire": "dev-dev",
     "processwire/site-default": "1.0.0",
     "ryancramerdesign/fieldtypemapmarker": "2.0.9",
     "dadish/graphqlfieldtypemapmarker": "2.0.0",
-    "phpunit/phpunit": "9.5.10"
+    "phpunit/phpunit": "10.1"
   },
   "repositories": [
     {