chore: minor styling and structure adjustments

Author: nunomaduro

composer.json

@@ -13,14 +13,15 @@
     "require": {
         "php": "^8.1.0",
         "openai-php/client": "^0.3.4",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0"
+        "rector/rector": "^0.14.8",
+        "symfony/config": "^5.4.21|^6.2.7",
+        "symfony/dependency-injection": "^5.4.21|^6.2.7",
+        "symfony/http-kernel": "^5.4.21|^6.2.7"
     },
     "require-dev": {
-        "laravel/pint": "^1.6",
+        "laravel/pint": "^1.6.0",
         "phpstan/phpstan": "^1.10.3",
-        "symfony/phpunit-bridge": "^6.2"
+        "symfony/phpunit-bridge": "^6.2.7"
     },
     "autoload": {
         "psr-4": {

rector.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+    ]);
+
+    $rectorConfig->skip([
+        __DIR__.'/src/Contracts/Response.php',
+    ]);
+
+    $rectorConfig->rules([
+        InlineConstructorDefaultToPropertyRector::class,
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+        SetList::CODE_QUALITY,
+        SetList::DEAD_CODE,
+        SetList::EARLY_RETURN,
+        SetList::TYPE_DECLARATION,
+        SetList::PRIVATIZATION,
+    ]);
+};

src/DependencyInjection/Configuration.php

@@ -4,24 +4,39 @@
 
 namespace OpenAI\Symfony\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * @author Jérôme Tamarelle <[email protected]>
+ * @internal
  */
-class Configuration implements ConfigurationInterface
+final class Configuration implements ConfigurationInterface
 {
+    /**
+     * {@inheritDoc}
+     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('openai');
         $rootNode = $treeBuilder->getRootNode();
 
-        $rootNode
-            ->children()
-                ->scalarNode('api_key')->defaultValue('%env(OPENAI_API_KEY)%')->end()
-                ->scalarNode('organization')->defaultValue('%env(default::OPENAI_ORGANIZATION)%')->end()
-            ->end();
+        assert($rootNode instanceof ArrayNodeDefinition);
+
+        $children = $rootNode->children();
+
+        assert($children instanceof NodeBuilder);
+
+        $children = $children->scalarNode('api_key')->defaultValue('%env(OPENAI_API_KEY)%')->end();
+
+        assert($children instanceof NodeBuilder);
+
+        $children = $children->scalarNode('organization')->defaultValue('%env(default::OPENAI_ORGANIZATION)%')->end();
+
+        assert($children instanceof NodeBuilder);
+
+        $children->end();
 
         return $treeBuilder;
     }

src/DependencyInjection/OpenAIExtension.php

@@ -5,22 +5,29 @@
 namespace OpenAI\Symfony\DependencyInjection;
 
 use OpenAI\Client;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 /**
- * @author Jérôme Tamarelle <[email protected]>
+ * @internal
  */
-class OpenAIExtension extends Extension
+final class OpenAIExtension extends Extension
 {
+    /**
+     * @param  array<int, array<int, mixed>>  $configs
+     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.php');
 
         $configuration = $this->getConfiguration($configs, $container);
+
+        assert($configuration instanceof ConfigurationInterface);
+
         $config = $this->processConfiguration($configuration, $configs);
 
         $definition = $container->getDefinition(Client::class);

src/OpenAIBundle.php

@@ -7,8 +7,8 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * @author Jérôme Tamarelle <[email protected]>
+ * @internal
  */
-class OpenAIBundle extends Bundle
+final class OpenAIBundle extends Bundle
 {
 }

src/Resources/config/services.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use OpenAI;
@@ -8,7 +10,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set(Client::class)
-            ->factory([OpenAI::class, 'client'])
+            ->factory(OpenAI::client(...))
             ->args([
                 abstract_arg('API Key'),
                 abstract_arg('Organisation'),

tests/DependencyInjection/OpenAIExtensionTest.php

@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace OpenAI\Symfony\Tests\DependencyInjection;
 
 use OpenAI\Client;
 use OpenAI\Symfony\DependencyInjection\OpenAIExtension;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class OpenAIExtensionTest extends TestCase
+final class OpenAIExtensionTest extends TestCase
 {
     public function testService(): void
     {