From 0adfe1254da3af28f03ca8e91f7896625df22af0 Mon Sep 17 00:00:00 2001
From: Simon Gilli <typo3@gilbertsoft.org>
Date: Sun, 16 Aug 2020 10:50:41 +0200
Subject: [PATCH] [TASK] Switch to new REST API end point
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The core version service now uses the new entry point of the REST API
available via https://get.typo3.org/api.
The old entry point is still available but should not be longer used.
For more information see `https://get.typo3.org/api/doc <https://get.typo3.org/api/doc>`_
and `https://github.com/TYPO3/get.typo3.org/pull/272 <https://github.com/TYPO3/get.typo3.org/pull/272>`_.
Resolves: #92020
Releases: main, 11.5, 10.4
Change-Id: I2c92554e9ba212827b6412d4a88ac5c92e26aa17
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65342
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Susanne Moog <look@susi.dev>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
...tryPointAvailableAtHttpsgettypo3orgapi.rst | 19 +++++++++++++++++++
...tryPointAvailableAtHttpsgettypo3orgapi.rst | 19 +++++++++++++++++++
...tryPointAvailableAtHttpsgettypo3orgapi.rst | 19 +++++++++++++++++++
.../Classes/Service/CoreVersionService.php | 2 +-
.../Unit/Service/CoreVersionServiceTest.php | 2 +-
5 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/10.4.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
create mode 100644 typo3/sysext/core/Documentation/Changelog/11.5.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
create mode 100644 typo3/sysext/core/Documentation/Changelog/12.0/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/10.4.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst b/typo3/sysext/core/Documentation/Changelog/10.4.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
new file mode 100644
index 000000000000..af0d32a5c477
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/10.4.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
@@ -0,0 +1,19 @@
+.. include:: ../../Includes.txt
+
+===============================================================================
+Important: #92020 - New API entry point available at https://get.typo3.org/api/
+===============================================================================
+
+See :issue:`92020`
+
+Description
+===========
+
+The core version service now uses the new entry point of the REST API
+available via https://get.typo3.org/api.
+
+The old entry point is still available but should not be longer used.
+
+For more information see `https://get.typo3.org/api/doc <https://get.typo3.org/api/doc>`_.
+
+.. index:: ext:install
diff --git a/typo3/sysext/core/Documentation/Changelog/11.5.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst b/typo3/sysext/core/Documentation/Changelog/11.5.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
new file mode 100644
index 000000000000..af0d32a5c477
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/11.5.x/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
@@ -0,0 +1,19 @@
+.. include:: ../../Includes.txt
+
+===============================================================================
+Important: #92020 - New API entry point available at https://get.typo3.org/api/
+===============================================================================
+
+See :issue:`92020`
+
+Description
+===========
+
+The core version service now uses the new entry point of the REST API
+available via https://get.typo3.org/api.
+
+The old entry point is still available but should not be longer used.
+
+For more information see `https://get.typo3.org/api/doc <https://get.typo3.org/api/doc>`_.
+
+.. index:: ext:install
diff --git a/typo3/sysext/core/Documentation/Changelog/12.0/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst b/typo3/sysext/core/Documentation/Changelog/12.0/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
new file mode 100644
index 000000000000..af0d32a5c477
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/12.0/Important-92020-NewAPIEntryPointAvailableAtHttpsgettypo3orgapi.rst
@@ -0,0 +1,19 @@
+.. include:: ../../Includes.txt
+
+===============================================================================
+Important: #92020 - New API entry point available at https://get.typo3.org/api/
+===============================================================================
+
+See :issue:`92020`
+
+Description
+===========
+
+The core version service now uses the new entry point of the REST API
+available via https://get.typo3.org/api.
+
+The old entry point is still available but should not be longer used.
+
+For more information see `https://get.typo3.org/api/doc <https://get.typo3.org/api/doc>`_.
+
+.. index:: ext:install
diff --git a/typo3/sysext/install/Classes/Service/CoreVersionService.php b/typo3/sysext/install/Classes/Service/CoreVersionService.php
index fe657ce5add4..2f795fdcfc54 100644
--- a/typo3/sysext/install/Classes/Service/CoreVersionService.php
+++ b/typo3/sysext/install/Classes/Service/CoreVersionService.php
@@ -35,7 +35,7 @@ class CoreVersionService
*
* @var string
*/
- protected $apiBaseUrl = 'https://get.typo3.org/v1/api/';
+ protected $apiBaseUrl = 'https://get.typo3.org/api/v1/';
/**
* Development git checkout versions always end with '-dev'. They are
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index e1d7deaf5d8f..ad5802af8dd9 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -44,7 +44,7 @@ class CoreVersionServiceTest extends UnitTestCase
{
$response = new JsonResponse($responseData);
$requestFactory = $this->prophesize(RequestFactory::class);
- $requestFactory->request('https://get.typo3.org/v1/api/' . $url, Argument::cetera())->willReturn($response);
+ $requestFactory->request('https://get.typo3.org/api/v1/' . $url, Argument::cetera())->willReturn($response);
GeneralUtility::addInstance(RequestFactory::class, $requestFactory->reveal());
}
--
GitLab