From b37db8e3ad3c366935e6d81cad89504276aba795 Mon Sep 17 00:00:00 2001
From: Mistral OZ - MIO <m.oz@thecodingmachine.com>
Date: Tue, 30 Nov 2021 08:34:15 +0100
Subject: [PATCH] Support for GraphQLite v5 - Rename namespace from Graphqlite
 to GraphQLite - Upgrade phpstan to v1 - Upgrade graphqlite-bundle to v5 -
 Upgrade tdbm-graphql to v5

---
 ... TheCodingMachineTdbmGraphQLExtension.php} | 10 ++++++----
 Tests/Fixtures/ExposeConfiguration.php        |  2 +-
 Tests/Fixtures/config/services.yaml           |  2 +-
 Tests/FunctionalTest.php                      |  8 ++++----
 ...ernel.php => TdbmGraphQLTestingKernel.php} | 19 ++++++++++---------
 TheCodingMachineTdbmGraphQLBundle.php         | 10 ++++++++++
 TheCodingMachineTdbmGraphqlBundle.php         | 10 ----------
 composer.json                                 | 12 ++++++------
 8 files changed, 38 insertions(+), 35 deletions(-)
 rename DependencyInjection/{TheCodingMachineTdbmGraphqlExtension.php => TheCodingMachineTdbmGraphQLExtension.php} (71%)
 rename Tests/{TdbmGraphqlTestingKernel.php => TdbmGraphQLTestingKernel.php} (79%)
 create mode 100644 TheCodingMachineTdbmGraphQLBundle.php
 delete mode 100644 TheCodingMachineTdbmGraphqlBundle.php

diff --git a/DependencyInjection/TheCodingMachineTdbmGraphqlExtension.php b/DependencyInjection/TheCodingMachineTdbmGraphQLExtension.php
similarity index 71%
rename from DependencyInjection/TheCodingMachineTdbmGraphqlExtension.php
rename to DependencyInjection/TheCodingMachineTdbmGraphQLExtension.php
index 322e15c..d3bf3a8 100644
--- a/DependencyInjection/TheCodingMachineTdbmGraphqlExtension.php
+++ b/DependencyInjection/TheCodingMachineTdbmGraphQLExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace TheCodingMachine\Tdbm\Graphql\Bundle\DependencyInjection;
+namespace TheCodingMachine\Tdbm\GraphQL\Bundle\DependencyInjection;
 
 
 use Symfony\Component\Config\FileLocator;
@@ -9,17 +9,19 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
-class TheCodingMachineTdbmGraphqlExtension extends Extension
+class TheCodingMachineTdbmGraphQLExtension extends Extension
 {
 
     /**
      * Loads a specific configuration.
      *
+     * @param array<mixed, mixed> $configs
+     *
      * @throws \InvalidArgumentException When provided tag is not defined in this extension
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container) : void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config/container'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config/container'));
         $loader->load('tdbmgraphql.xml');
     }
 }
diff --git a/Tests/Fixtures/ExposeConfiguration.php b/Tests/Fixtures/ExposeConfiguration.php
index 8804a20..284268c 100644
--- a/Tests/Fixtures/ExposeConfiguration.php
+++ b/Tests/Fixtures/ExposeConfiguration.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace TheCodingMachine\Tdbm\Graphql\Bundle\Tests\Fixtures;
+namespace TheCodingMachine\Tdbm\GraphQL\Bundle\Tests\Fixtures;
 
 
 use TheCodingMachine\TDBM\Configuration;
diff --git a/Tests/Fixtures/config/services.yaml b/Tests/Fixtures/config/services.yaml
index 4435169..c50d8d4 100644
--- a/Tests/Fixtures/config/services.yaml
+++ b/Tests/Fixtures/config/services.yaml
@@ -13,7 +13,7 @@ services:
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
-    TheCodingMachine\Tdbm\Graphql\Bundle\Tests\Fixtures\:
+    TheCodingMachine\Tdbm\GraphQL\Bundle\Tests\Fixtures\:
         resource: '../*'
         exclude: '../{Entities}'
         public: true
diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
index 0a87d91..f26426e 100644
--- a/Tests/FunctionalTest.php
+++ b/Tests/FunctionalTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace TheCodingMachine\Tdbm\Graphql\Bundle\Tests;
+namespace TheCodingMachine\Tdbm\GraphQL\Bundle\Tests;
 
+use Laminas\Code\Generator\FileGenerator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use TheCodingMachine\Tdbm\Graphql\Bundle\Tests\Fixtures\ExposeConfiguration;
+use TheCodingMachine\Tdbm\GraphQL\Bundle\Tests\Fixtures\ExposeConfiguration;
 use TheCodingMachine\TDBM\Utils\BeanDescriptor;
-use Zend\Code\Generator\FileGenerator;
 use TheCodingMachine\GraphQLite\Annotations\Field;
 
 class FunctionalTest extends KernelTestCase
 {
     protected static function createKernel(array $options = [])
     {
-        return new TdbmGraphqlTestingKernel('test', true);
+        return new TdbmGraphQLTestingKernel('test', true);
     }
 
     public function testServiceWiring()
diff --git a/Tests/TdbmGraphqlTestingKernel.php b/Tests/TdbmGraphQLTestingKernel.php
similarity index 79%
rename from Tests/TdbmGraphqlTestingKernel.php
rename to Tests/TdbmGraphQLTestingKernel.php
index 35439da..a8650cc 100644
--- a/Tests/TdbmGraphqlTestingKernel.php
+++ b/Tests/TdbmGraphQLTestingKernel.php
@@ -1,20 +1,21 @@
 <?php
 
 
-namespace TheCodingMachine\Tdbm\Graphql\Bundle\Tests;
+namespace TheCodingMachine\Tdbm\GraphQL\Bundle\Tests;
 
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use TheCodingMachine\Graphqlite\Bundle\GraphqliteBundle;
+use TheCodingMachine\GraphQLite\Bundle\GraphQLiteBundle;
 use TheCodingMachine\TDBM\Bundle\TdbmBundle;
-use TheCodingMachine\Tdbm\Graphql\Bundle\TheCodingMachineTdbmGraphqlBundle;
+use TheCodingMachine\Tdbm\GraphQL\Bundle\TheCodingMachineTdbmGraphQLBundle;
 
-class TdbmGraphqlTestingKernel extends Kernel
+class TdbmGraphQLTestingKernel extends Kernel
 {
     use MicroKernelTrait;
 
@@ -28,11 +29,11 @@ public function __construct()
     public function registerBundles()
     {
         return [
-            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new FrameworkBundle(),
             new DoctrineBundle(),
             new TdbmBundle(),
-            new GraphqliteBundle(),
-            new TheCodingMachineTdbmGraphqlBundle(),
+            new GraphQLiteBundle(),
+            new TheCodingMachineTdbmGraphQLBundle(),
         ];
     }
 
@@ -57,8 +58,8 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
 
             $container->loadFromExtension('graphqlite', array(
                 'namespace' => [
-                    'controllers' => ['TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Controller\\'],
-                    'types' => ['TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Types\\', 'TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Entities\\']
+                    'controllers' => ['TheCodingMachine\\GraphQLite\\Bundle\\Tests\\Fixtures\\Controller\\'],
+                    'types' => ['TheCodingMachine\\GraphQLite\\Bundle\\Tests\\Fixtures\\Types\\', 'TheCodingMachine\\GraphQLite\\Bundle\\Tests\\Fixtures\\Entities\\']
                 ]
             ));
         });
diff --git a/TheCodingMachineTdbmGraphQLBundle.php b/TheCodingMachineTdbmGraphQLBundle.php
new file mode 100644
index 0000000..b7cbd54
--- /dev/null
+++ b/TheCodingMachineTdbmGraphQLBundle.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace TheCodingMachine\Tdbm\GraphQL\Bundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TheCodingMachineTdbmGraphQLBundle extends Bundle
+{
+}
diff --git a/TheCodingMachineTdbmGraphqlBundle.php b/TheCodingMachineTdbmGraphqlBundle.php
deleted file mode 100644
index 7d2797e..0000000
--- a/TheCodingMachineTdbmGraphqlBundle.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-
-namespace TheCodingMachine\Tdbm\Graphql\Bundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class TheCodingMachineTdbmGraphqlBundle extends Bundle
-{
-}
diff --git a/composer.json b/composer.json
index 29648ad..96c6c3a 100644
--- a/composer.json
+++ b/composer.json
@@ -18,29 +18,29 @@
   ],
   "require" : {
     "php" : ">=7.2",
-    "thecodingmachine/graphqlite-bundle": "^4",
+    "thecodingmachine/graphqlite-bundle": "^5",
     "thecodingmachine/tdbm-bundle": "^5.2",
-    "thecodingmachine/tdbm-graphql": "~4.0",
+    "thecodingmachine/tdbm-graphql": "^5.0",
     "symfony/framework-bundle": "^4.1.9 | ^5"
   },
   "require-dev": {
     "symfony/security-bundle": "^4.1.9 | ^5",
     "symfony/yaml": "^4.1.9 | ^5",
     "phpunit/phpunit": "^8.0.4",
-    "phpstan/phpstan-shim": "^0.11.4",
+    "phpstan/phpstan": "^1",
     "php-coveralls/php-coveralls": "^2.1"
   },
   "scripts": {
-    "phpstan": "phpstan analyse TheCodingMachineTdbmGraphqlBundle.php DependencyInjection/ Resources/ -c phpstan.neon --level=7 --no-progress"
+    "phpstan": "phpstan analyse TheCodingMachineTdbmGraphQLBundle.php DependencyInjection/ Resources/ -c phpstan.neon --level=7 --no-progress"
   },
   "autoload" : {
     "psr-4" : {
-      "TheCodingMachine\\Tdbm\\Graphql\\Bundle\\" : ""
+      "TheCodingMachine\\Tdbm\\GraphQL\\Bundle\\" : ""
     }
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "4.1.x-dev"
+      "dev-master": "5.0.x-dev"
     }
   },
   "minimum-stability": "dev",