Cover additional PHP keyword edge cases (#68)

.github/workflows/continuous-integration.yml

@@ -87,7 +87,10 @@ jobs:
     strategy:
       matrix:
         example:
+          - custom-types
+          - input
           - install
+          - php-keywords
           - simple
           - polymorphic
 

CHANGELOG.md

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
 - Add support for types and fields named equivalent to PHP keywords like `type Switch` or `{ print { subfield } }`.
 
+### Removed
+
+- No longer generate class `TypeConverters`
+
 ## v0.21.2
 
 ### Fixed

Makefile

@@ -1,5 +1,5 @@
 .PHONY: it
-it: fix stan test ## Run the commonly used targets
+it: fix stan approve test test-examples ## Run the commonly used targets
 
 .PHONY: help
 help: ## Displays this list of targets with descriptions
@@ -14,11 +14,6 @@ stan: ## Runs static analysis with phpstan
 	mkdir -p .build/phpstan
 	vendor/bin/phpstan analyse --configuration=phpstan.neon
 
-.PHONY: codegen
-codegen: ## Runs the codegen tests
-	mkdir -p .build/phpunit
-	vendor/bin/phpunit --filter CodegenTest
-
 .PHONY: test
 test: ## Runs tests with phpunit
 	mkdir -p .build/phpunit
@@ -35,17 +30,18 @@ infection: ## Runs mutation tests with infection
 	mkdir -p .build/infection
 	vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=100 --min-msi=100
 
-define approve_example
-	rm -rf examples/$(1)/expected
-	cp -r examples/$(1)/generated examples/$(1)/expected
-endef
-
 .PHONY: approve
-approve: ## Accept the current generated code as expected
-	$(call approve_example,custom-types)
-	$(call approve_example,input)
-	$(call approve_example,polymorphic)
-	$(call approve_example,simple)
+approve: ## Generate code and approve it as expected
+	tests/generate-and-approve-examples.php
+
+.PHONY: test-examples
+test-examples: ## Test examples
+	cd examples/custom-types && ./test.sh
+	cd examples/input && ./test.sh
+	cd examples/install && ./test.sh
+	cd examples/php-keywords && ./test.sh
+	cd examples/polymorphic && ./test.sh
+	cd examples/simple && ./test.sh
 
 vendor: composer.json composer.lock
 	composer install

composer.json

@@ -64,6 +64,7 @@
       "Spawnia\\Sailor\\CustomTypesSrc\\": "examples/custom-types/src/",
       "Spawnia\\Sailor\\Input\\": "examples/input/expected/",
       "Spawnia\\Sailor\\Simple\\": "examples/simple/expected/",
+      "Spawnia\\Sailor\\PhpKeywords\\": "examples/php-keywords/expected/",
       "Spawnia\\Sailor\\Polymorphic\\": "examples/polymorphic/expected/"
     },
     "files": [

examples/custom-types/sailor.php

@@ -2,6 +2,7 @@
 
 use GraphQL\Type\Schema;
 use Spawnia\Sailor\Client;
+use Spawnia\Sailor\CustomTypes\Types\CustomEnum;
 use Spawnia\Sailor\CustomTypesSrc\CustomDateTypeConfig;
 use Spawnia\Sailor\CustomTypesSrc\CustomEnumTypeConfig;
 use Spawnia\Sailor\EndpointConfig;
@@ -39,10 +40,7 @@ public function makeClient(): Client
                 return Response::fromStdClass((object) [
                     'data' => (object) [
                         '__typename' => 'Query',
-                        'singleObject' => (object) [
-                            '__typename' => 'SomeObject',
-                            'value' => 42,
-                        ],
+                        'withCustomEnum' => CustomEnum::B,
                     ],
                 ]);
             };

examples/custom-types/src/test.php

@@ -1,7 +1,12 @@
 <?php declare(strict_types=1);
 
+use Spawnia\Sailor\CustomTypes\Operations\MyCustomEnumQuery;
+use Spawnia\Sailor\CustomTypes\Types\CustomEnum;
+
 require __DIR__ . '/../vendor/autoload.php';
 
-$result = \Spawnia\Sailor\Simple\Operations\MyObjectQuery::execute();
+$result = MyCustomEnumQuery::execute(
+    new CustomEnum(CustomEnum::A)
+);
 
-assert(42 === $result->data->singleObject->value);
+assert(CustomEnum::B === $result->data->withCustomEnum->value);

examples/input/sailor.php

@@ -34,11 +34,8 @@ public function makeClient(): Client
             $mockClient->responseMocks[] = static function (): Response {
                 return Response::fromStdClass((object) [
                     'data' => (object) [
-                        '__typename' => 'Query',
-                        'singleObject' => (object) [
-                            '__typename' => 'SomeObject',
-                            'value' => 42,
-                        ],
+                        '__typename' => 'Mutation',
+                        'takeSomeInput' => 42,
                     ],
                 ]);
             };

examples/input/src/test.php

@@ -4,4 +4,4 @@
 
 $result = \Spawnia\Sailor\Input\Operations\TakeSomeInput::execute();
 
-assert(42 === $result->data->singleObject->value);
+assert(42 === $result->data->takeSomeInput);

examples/install/test.sh

@@ -3,6 +3,9 @@ set -euxo pipefail
 
 composer update
 
+echo Clean up previous runs
+rm -f sailor.php
+
 if vendor/bin/sailor; then
   echo Expected the initial run of vendor/bin/sailor to exit with an error
   exit 1;

examples/php-keywords/.gitignore

@@ -0,0 +1,4 @@
+/sailor
+/vendor
+/composer.lock
+/generated

examples/php-keywords/composer.json

@@ -0,0 +1,24 @@
+{
+  "require": {
+    "spawnia/sailor": "@dev"
+  },
+  "autoload": {
+    "psr-4": {
+      "Spawnia\\Sailor\\PhpKeywords\\": "generated/"
+    }
+  },
+  "repositories": [
+    {
+      "type": "path",
+      "url": "./sailor",
+      "options": {
+        "symlink": false
+      }
+    }
+  ],
+  "scripts": {
+    "move-package": "rsync -r ../../ sailor --exclude examples --exclude vendor --exclude .idea --exclude .build --delete",
+    "pre-install-cmd": "@move-package",
+    "pre-update-cmd": "@move-package"
+  }
+}