Merge pull request #9 from andrey-mokhov/prepare-release

prepare release

.gitattributes

@@ -1,7 +1,8 @@
-/.github            export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
-/tests              export-ignore
-/.editorconfig      export-ignore
-/psalm.xml.dist     export-ignore
+/.github           export-ignore
+/tests             export-ignore
+/.editorconfig     export-ignore
+/.gitattributes    export-ignore
+/.gitignore        export-ignore
+/.styleci.yml      export-ignore
+/phpunit.xml.dist  export-ignore
+/psalm.xml.dist    export-ignore

.github/workflows/main.yml

@@ -0,0 +1,139 @@
+name: build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  security:
+    name: Security
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.3' ] # Note: This workflow requires only the LATEST version of PHP
+        os: [ ubuntu-latest ]
+        stability: [prefer-stable]
+
+    steps:
+      # General Steps
+      - name: Set Git To Use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      # Execution
+      - name: Security Advisories
+        run: composer require --dev roave/security-advisories:dev-latest
+  static-analysis:
+    name: Psalm
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.3'] # Note: This workflow requires only the LATEST version of PHP
+        os: [ubuntu-latest]
+        stability: [prefer-stable]
+
+    steps:
+      # General Steps
+      - name: Set Git To Use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      # Execution
+      - name: Static Analysis
+        run: |
+          vendor/bin/psalm --no-cache --shepherd --stats --output-format=checkstyle --php-version=${{ matrix.php }}
+
+  test:
+    name: Build (${{matrix.php}}, ${{ matrix.os }}, ${{ matrix.stability }})
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.1', '8.2', '8.3']
+        os: [ubuntu-latest]
+        stability: [prefer-lowest, prefer-stable]
+
+    steps:
+      - name: Set Git To Use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      # Execution
+      - name: Execute Tests
+        run: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover=coverage.clover

README.md

@@ -1,14 +1,15 @@
 # GraphQL library for Spiral Framework
 
+The library integrates the GraphQL library
+[andi-lab/graphql-php](https://packagist.org/packages/andi-lab/graphql-php) with
+[SpiralFramework](https://packagist.org/packages/spiral/framework).
 
-
-# roadmap
+## Roadmap
 
 release 0.1
-
 - [x] Enum loader
 - [x] Interface loader
-- [ ] configure package: `.editorconfig`, `.gitattributes`, `.styleci.yml`, `phpunit.xml`, `psalm.xml`
+- [x] configure package: `.editorconfig`, `.gitattributes`, `.styleci.yml`, `phpunit.xml`, `psalm.xml`
 
 release 1.0
 - [ ] Clear memory after GraphQL schema initialization

composer.json

@@ -10,7 +10,7 @@
     "type": "library",
     "require": {
         "php": "^8.1",
-        "andi-lab/graphql-php": "*",
+        "andi-lab/graphql-php": "^1.0",
         "spiral/framework": "^3.8.4"
     },
     "license": "MIT",

psalm.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="1"
+    errorLevel="4"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

src/Bootloader/GraphQLBootloader.php

@@ -29,6 +29,7 @@
 use Andi\GraphQL\TypeResolver\TypeResolverInterface;
 use GraphQL\Server\ServerConfig;
 use GraphQL\Server\StandardServer;
+use GraphQL\Type\Definition as Webonyx;
 use GraphQL\Type\Schema;
 use GraphQL\Type\SchemaConfig;
 use Psr\Container\ContainerInterface;
@@ -122,6 +123,7 @@ private function registerQueryType(
         }
 
         $queryType = $typeResolver->resolve($class);
+        assert($queryType instanceof Webonyx\NamedType);
         $typeRegistry->register($queryType, $class);
     }
 
@@ -138,8 +140,9 @@ private function registerMutationType(
             $class = MutationType::class;
         }
 
-        $queryType = $typeResolver->resolve($class);
-        $typeRegistry->register($queryType, $class);
+        $mutationType = $typeResolver->resolve($class);
+        assert($mutationType instanceof Webonyx\NamedType);
+        $typeRegistry->register($mutationType, $class);
     }
 
     private function registerAdditionalTypes(
@@ -154,7 +157,7 @@ private function registerAdditionalTypes(
             }
 
             $type = $typeResolver->resolve($name);
-
+            assert($type instanceof Webonyx\NamedType);
             $typeRegistry->register($type, ...$aliases);
         }
     }

src/Listener/AttributedTypeLoaderListener.php

@@ -12,6 +12,7 @@
 use Andi\GraphQL\Exception\CantResolveGraphQLTypeException;
 use Andi\GraphQL\TypeRegistryInterface;
 use Andi\GraphQL\TypeResolver\TypeResolverInterface;
+use GraphQL\Type\Definition\NamedType;
 use ReflectionClass;
 use Spiral\Attributes\ReaderInterface;
 use Spiral\Tokenizer\Attribute\TargetAttribute;
@@ -45,6 +46,7 @@ public function listen(ReflectionClass $class): void
         $typeName = (string) $type;
 
         if (! $this->typeRegistry->has($typeName)) {
+            assert($type instanceof NamedType);
             $this->typeRegistry->register($type, $class->getName());
         }
     }

src/Listener/TypeLoaderListener.php

@@ -44,6 +44,7 @@ public function listen(ReflectionClass $class): void
 
         try {
             $type = $this->typeResolver->resolve($className);
+            assert($type instanceof Webonyx\NamedType);
             $this->typeRegistry->register($type, $className);
         } catch (CantResolveGraphQLTypeException $e) {
             $this->reporter->report($e);

src/Middleware/GraphQLMiddleware.php

@@ -30,7 +30,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $response = $this->responseFactory->createResponse();
             $stream = $this->streamFactory->createStream();
 
-            return $this->server->processPsrRequest($request, $response, $stream);
+            $result = $this->server->processPsrRequest($request, $response, $stream);
+            assert($result instanceof ResponseInterface);
+            return $result;
         }
 
         return $handler->handle($request);