Use PhpFileLoader instead of YamlFileLoader

composer.json

@@ -29,6 +29,8 @@
     "phpmd/phpmd": "^2.9",
     "phpspec/prophecy-phpunit": "^2.0",
     "phpstan/phpstan": "2.1.31",
+    "phpstan/phpstan-deprecation-rules": "^2.0",
+    "phpstan/phpstan-phpunit": "^2.0",
     "phpunit/phpunit": "^9.3",
     "rregeer/phpunit-coverage-check": "^0.3.1",
     "slevomat/coding-standard": "^8.15",

phpstan.neon

@@ -1,5 +1,7 @@
 includes:
     - vendor/jangregor/phpstan-prophecy/extension.neon
+    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
 
 parameters:
     level: 8
@@ -8,6 +10,5 @@ parameters:
         - test
     excludePaths:
         - test/DataFixtures
-        - test/PhpUnit
     parallel:
         processTimeout: 300.0

src/Resources/api.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+use SupportPal\ApiClient\Api\Api;
+use SupportPal\ApiClient\Api\CoreApi;
+use SupportPal\ApiClient\Api\SelfServiceApi;
+use SupportPal\ApiClient\Api\TicketApi;
+use SupportPal\ApiClient\Api\UserApi;
+use SupportPal\ApiClient\Http\CoreClient;
+use SupportPal\ApiClient\Http\SelfServiceClient;
+use SupportPal\ApiClient\Http\TicketClient;
+use SupportPal\ApiClient\Http\UserClient;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->defaults()
+        ->autowire()
+        ->autoconfigure();
+
+    $services->set(Api::class)
+        ->private();
+
+    $services->set(CoreApi::class)
+        ->public()
+        ->parent(Api::class)
+        ->arg('$apiClient', service(CoreClient::class));
+
+    $services->set(SelfServiceApi::class)
+        ->public()
+        ->parent(Api::class)
+        ->arg('$apiClient', service(SelfServiceClient::class));
+
+    $services->set(TicketApi::class)
+        ->public()
+        ->parent(Api::class)
+        ->arg('$apiClient', service(TicketClient::class));
+
+    $services->set(UserApi::class)
+        ->public()
+        ->parent(Api::class)
+        ->arg('$apiClient', service(UserClient::class));
+};

src/Resources/client.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+use SupportPal\ApiClient\Http\Client;
+use SupportPal\ApiClient\Http\CoreClient;
+use SupportPal\ApiClient\Http\Request;
+use SupportPal\ApiClient\Http\SelfServiceClient;
+use SupportPal\ApiClient\Http\TicketClient;
+use SupportPal\ApiClient\Http\UserClient;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->defaults()
+        ->autowire()
+        ->autoconfigure();
+
+    $services->set(Client::class)
+        ->public()
+        ->arg('$httpClient', service(\GuzzleHttp\Client::class));
+
+    $services->set(CoreClient::class)
+        ->parent(Client::class);
+
+    $services->set(SelfServiceClient::class)
+        ->parent(Client::class);
+
+    $services->set(TicketClient::class)
+        ->parent(Client::class);
+
+    $services->set(UserClient::class)
+        ->parent(Client::class);
+
+    $services->set(Request::class)
+        ->public()
+        ->arg('$apiUrl', '%apiUrl%')
+        ->arg('$apiToken', '%apiToken%')
+        ->arg('$contentType', '%apiContentType%')
+        ->arg('$defaultBodyContent', '%defaultBodyContent%')
+        ->arg('$defaultParameters', '%defaultParameters%');
+};

src/Resources/services.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(__DIR__ . '/api.php');
+    $containerConfigurator->import(__DIR__ . '/client.php');
+
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set('apiContentType', 'application/json');
+    $parameters->set('contentType', 'json');
+
+    $services = $containerConfigurator->services();
+    $services->defaults()
+        ->autowire()
+        ->autoconfigure();
+};

src/SupportPal.php

@@ -23,7 +23,7 @@
 use SupportPal\ApiClient\Http\Request;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 use function array_merge;
 use function str_replace;
@@ -50,8 +50,8 @@ public function __construct(
         $requestDefaults = $requestDefaults ?? new RequestDefaults;
 
         $containerBuilder = new ContainerBuilder;
-        $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__));
-        $loader->load('Resources/services.yml');
+        $loader = new PhpFileLoader($containerBuilder, new FileLocator(__DIR__));
+        $loader->load('Resources/services.php');
         $containerBuilder->setParameter('apiUrl', $this->escapeSpecialCharacters($apiContext->getApiUrl()));
         $containerBuilder->setParameter('apiToken', $this->escapeSpecialCharacters($apiContext->getApiToken()));
         $containerBuilder->setParameter('defaultParameters', $requestDefaults->getDefaultParameters());

test/ContainerAwareBaseTestCase.php

@@ -16,7 +16,7 @@
 use SupportPal\ApiClient\SupportPal;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 use function json_decode;
 use function json_encode;
@@ -76,8 +76,8 @@ protected function setUp(): void
          * create container for test environment
          */
         $containerBuilder = new ContainerBuilder;
-        $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__));
-        $loader->load('Resources/services_test.yml');
+        $loader = new PhpFileLoader($containerBuilder, new FileLocator(__DIR__));
+        $loader->load(__DIR__.'/Resources/services_test.php');
         $client = $this->getGuzzleClient();
         $containerBuilder->set('GuzzleHttp\Client', $client);
         $containerBuilder->compile();

test/E2E/BaseTestCase.php

@@ -15,7 +15,7 @@
 use SupportPal\ApiClient\Tests\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 use function getenv;
 use function intval;
@@ -44,8 +44,8 @@ public function setUp(): void
         $this->modelsTestLimit = $limit === 0 ? self::DEFAULT_LIMIT : $limit;
 
         $containerBuilder = new ContainerBuilder;
-        $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__));
-        $loader->load('../Resources/services_test.yml');
+        $loader = new PhpFileLoader($containerBuilder, new FileLocator(__DIR__));
+        $loader->load(__DIR__.'/../Resources/services_test.php');
         $containerBuilder->set(Client::class, new Client);
         $containerBuilder->compile();
 

test/Functional/SupportPalTest.php

@@ -19,6 +19,7 @@ class SupportPalTest extends ContainerAwareBaseTestCase
 {
     public function testGetRequestFactory(): void
     {
+        // @phpstan-ignore staticMethod.alreadyNarrowedType
         self::assertInstanceOf(Request::class, $this->getSupportPal()->getRequest());
     }