chore!: require JobRouter REST Client in version 3

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- JobRouter REST Client in version 3 is required
+
 ## [2.0.0] - 2023-05-31
 
 ### Added

Classes/Controller/ConnectionListController.php

@@ -11,11 +11,11 @@
 
 namespace Brotkrueml\JobRouterConnector\Controller;
 
-use Brotkrueml\JobRouterClient\Information\Version;
 use Brotkrueml\JobRouterConnector\Domain\Repository\ConnectionRepository;
 use Brotkrueml\JobRouterConnector\Exception\KeyFileException;
 use Brotkrueml\JobRouterConnector\Extension;
 use Brotkrueml\JobRouterConnector\Service\FileService;
+use JobRouter\AddOn\RestClient\Information\Version;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Routing\UriBuilder;

Classes/Controller/ConnectionTestController.php

@@ -11,12 +11,12 @@
 
 namespace Brotkrueml\JobRouterConnector\Controller;
 
-use Brotkrueml\JobRouterClient\Exception\HttpException;
 use Brotkrueml\JobRouterConnector\Domain\Dto\ConnectionTestResult;
 use Brotkrueml\JobRouterConnector\Domain\Repository\ConnectionRepository;
 use Brotkrueml\JobRouterConnector\Exception\ConnectionNotFoundException;
 use Brotkrueml\JobRouterConnector\Extension;
 use Brotkrueml\JobRouterConnector\RestClient\RestClientFactoryInterface;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

Classes/RestClient/RestClientFactory.php

@@ -11,16 +11,16 @@
 
 namespace Brotkrueml\JobRouterConnector\RestClient;
 
-use Brotkrueml\JobRouterClient\Client\ClientInterface;
-use Brotkrueml\JobRouterClient\Client\RestClient;
-use Brotkrueml\JobRouterClient\Configuration\ClientConfiguration;
-use Brotkrueml\JobRouterClient\Configuration\ClientOptions;
-use Brotkrueml\JobRouterClient\Exception\ExceptionInterface;
 use Brotkrueml\JobRouterConnector\Domain\Entity\Connection;
 use Brotkrueml\JobRouterConnector\Domain\Repository\ConnectionRepository;
 use Brotkrueml\JobRouterConnector\Exception\CryptException;
 use Brotkrueml\JobRouterConnector\Extension;
 use Brotkrueml\JobRouterConnector\Service\Crypt;
+use JobRouter\AddOn\RestClient\Client\ClientInterface;
+use JobRouter\AddOn\RestClient\Client\RestClient;
+use JobRouter\AddOn\RestClient\Configuration\ClientConfiguration;
+use JobRouter\AddOn\RestClient\Configuration\ClientOptions;
+use JobRouter\AddOn\RestClient\Exception\ExceptionInterface;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 final class RestClientFactory implements RestClientFactoryInterface

Classes/RestClient/RestClientFactoryInterface.php

@@ -11,8 +11,8 @@
 
 namespace Brotkrueml\JobRouterConnector\RestClient;
 
-use Brotkrueml\JobRouterClient\Client\ClientInterface;
 use Brotkrueml\JobRouterConnector\Domain\Entity\Connection;
+use JobRouter\AddOn\RestClient\Client\ClientInterface;
 
 interface RestClientFactoryInterface
 {

Documentation/_snippets/_MyController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Brotkrueml\JobRouterClient\Exception\ExceptionInterface;
+use JobRouter\AddOn\RestClient\Exception\ExceptionInterface;
 use Brotkrueml\JobRouterConnector\Domain\Entity\Connection;
 use Brotkrueml\JobRouterConnector\Domain\Repository\ConnectionRepository;
 use Brotkrueml\JobRouterConnector\Exception\ConnectionNotFoundException;

Documentation/changelog.rst

@@ -11,6 +11,12 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 `Unreleased <https://github.com/brotkrueml/typo3-jobrouter-connector/compare/v2.0.0...HEAD>`_
 -------------------------------------------------------------------------------------------------
 
+Changed
+^^^^^^^
+
+
+* JobRouter REST Client in version 3 is required
+
 `2.0.0 <https://github.com/brotkrueml/typo3-jobrouter-connector/compare/v1.2.0...v2.0.0>`_ - 2023-05-31
 -----------------------------------------------------------------------------------------------------------
 

Tests/Unit/Controller/ConnectionTestControllerTest.php

@@ -11,12 +11,12 @@
 
 namespace Brotkrueml\JobRouterConnector\Tests\Unit\Controller;
 
-use Brotkrueml\JobRouterClient\Exception\HttpException;
 use Brotkrueml\JobRouterConnector\Controller\ConnectionTestController;
 use Brotkrueml\JobRouterConnector\Domain\Entity\Connection;
 use Brotkrueml\JobRouterConnector\Domain\Repository\ConnectionRepository;
 use Brotkrueml\JobRouterConnector\Exception\ConnectionNotFoundException;
 use Brotkrueml\JobRouterConnector\RestClient\RestClientFactoryInterface;
+use JobRouter\AddOn\RestClient\Exception\HttpException;
 use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;

composer.json

@@ -22,7 +22,7 @@
 	"require": {
 		"php": ">=8.1",
 		"ext-sodium": "*",
-		"brotkrueml/jobrouter-client": "^2.0",
+		"brotkrueml/jobrouter-client": "^3.0@dev",
 		"typo3/cms-backend": "^11.5.4 || ^12.4",
 		"typo3/cms-core": "^11.5.4 || ^12.4",
 		"typo3/cms-fluid": "^11.5.4 || ^12.4",

ext_localconf.php

@@ -6,6 +6,6 @@
     '@import "EXT:' . Brotkrueml\JobRouterConnector\Extension::KEY . '/Configuration/TypoScript/"'
 );
 
-if (! TYPO3\CMS\Core\Core\Environment::isComposerMode() && ! class_exists(Brotkrueml\JobRouterClient\Client\RestClient::class)) {
+if (! TYPO3\CMS\Core\Core\Environment::isComposerMode() && ! class_exists(JobRouter\AddOn\RestClient\Client\RestClient::class)) {
     @include 'phar://' . TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(Brotkrueml\JobRouterConnector\Extension::KEY) . 'Resources/Private/PHP/jobrouter-client.phar/vendor/autoload.php';
 }