[TASK] Deprecate unused methods of VersionNumberUtility

The following methods of `\TYPO3\CMS\Core\Utility\VersionNumberUtility`
are unused and can be deprecated:

- `splitVersionRange`
- `raiseVersionNumber`
- `convertIntegerToVersionNumber`

Resolves: #88554
Releases: master
Change-Id: I28378a39d7cae4d2ae09cfb6a85c5d294565a2f7
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60997
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Benni Mack <benni@typo3.org>

diff --git a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
index 43bbcf3..b80aebf 100644 (file)
--- a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
+++ b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
@@ -45,9 +45,12 @@ class VersionNumberUtility
      * @param int $versionInteger Integer representation of version number
      * @return string Version number as format x.x.x
      * @throws \InvalidArgumentException if $versionInteger is not an integer
+     * @deprecated
      */
     public static function convertIntegerToVersionNumber($versionInteger)
     {
+        trigger_error('Method ' . __METHOD__ . ' will be removed in TYPO3 11.0', E_USER_DEPRECATED);
+
         if (!is_int($versionInteger)) {
             throw new \InvalidArgumentException(\TYPO3\CMS\Core\Utility\VersionNumberUtility::class . '::convertIntegerToVersionNumber() supports an integer argument only!', 1334072223);
         }
@@ -69,9 +72,12 @@ class VersionNumberUtility
      *
      * @param string $version A string with a version range.
      * @return array
+     * @deprecated
      */
     public static function splitVersionRange($version)
     {
+        trigger_error('Method ' . __METHOD__ . ' will be removed in TYPO3 11.0', E_USER_DEPRECATED);
+
         $versionRange = [];
         if (strstr($version, '-')) {
             $versionRange = explode('-', $version, 2);
@@ -172,9 +178,12 @@ class VersionNumberUtility
      * @param string $version (like 4.1.20)
      * @return string
      * @throws \TYPO3\CMS\Core\Exception
+     * @deprecated
      */
     public static function raiseVersionNumber($raise, $version)
     {
+        trigger_error('Method ' . __METHOD__ . ' will be removed in TYPO3 11.0', E_USER_DEPRECATED);
+
         if (!in_array($raise, ['main', 'sub', 'dev'])) {
             throw new \TYPO3\CMS\Core\Exception('RaiseVersionNumber expects one of "main", "sub" or "dev".', 1342639555);
         }

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst
new file mode 100644 (file)
index 0000000..a4e2630
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst
@@ -0,0 +1,38 @@
+.. include:: ../../Includes.txt
+
+================================================================
+Deprecation: #88554 - Deprecated methods in VersionNumberUtility
+================================================================
+
+See :issue:`88554`
+
+Description
+===========
+
+The following methods of :php:\TYPO3\CMS\Core\Utility\VersionNumberUtility` have been deprecated and will be removed in
+TYPO3 11.0:
+
+- :php:`convertIntegerToVersionNumber`
+- :php:`splitVersionRange`
+- :php:`raiseVersionNumber`
+
+
+Impact
+======
+
+Calling the methods :php:`convertIntegerToVersionNumber`, :php:`splitVersionRange` or :php:`raiseVersionNumber` of
+:php:\TYPO3\CMS\Core\Utility\VersionNumberUtility` will trigger a deprecation message.
+
+
+Affected Installations
+======================
+
+All installations that call the mentioned methods.
+
+
+Migration
+=========
+
+Implement the methods in your custom code.
+
+.. index:: PHP-API, FullyScanned, ext:core

diff --git a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
index 73fd501..e3a3fe3 100644 (file)
--- a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
@@ -23,73 +23,6 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class VersionNumberUtilityTest extends UnitTestCase
 {
-    /**
-     * Data Provider for convertVersionNumberToIntegerConvertsVersionNumbersToIntegers
-     *
-     * @return array
-     */
-    public function validVersionNumberDataProvider()
-    {
-        return [
-            ['4003003', '4.3.3'],
-            ['4012003', '4.12.3'],
-            ['5000000', '5.0.0'],
-            ['5000001', '5.0.1'],
-            ['3008001', '3.8.1'],
-            ['1012', '0.1.12']
-        ];
-    }
-
-    /**
-     * Data Provider for convertIntegerToVersionNumberConvertsOtherTypesAsIntegerToVersionNumber
-     *
-     * @see http://php.net/manual/en/language.types.php
-     * @return array
-     */
-    public function invalidVersionNumberDataProvider()
-    {
-        return [
-            'boolean' => [true],
-            'float' => [5.4],
-            'array' => [[]],
-            'string' => ['300ABCD'],
-            'object' => [new \stdClass()],
-            'NULL' => [null],
-            'function' => [function () {
-            }]
-        ];
-    }
-
-    /**
-     * @test
-     * @dataProvider validVersionNumberDataProvider
-     */
-    public function convertVersionNumberToIntegerConvertsVersionNumbersToIntegers($expected, $version)
-    {
-        $this->assertEquals($expected, VersionNumberUtility::convertVersionNumberToInteger($version));
-    }
-
-    /**
-     * @test
-     * @dataProvider validVersionNumberDataProvider
-     */
-    public function convertIntegerToVersionNumberConvertsIntegerToVersionNumber($versionNumber, $expected)
-    {
-        // Make sure incoming value is an integer
-        $versionNumber = (int)$versionNumber;
-        $this->assertEquals($expected, VersionNumberUtility::convertIntegerToVersionNumber($versionNumber));
-    }
-
-    /**
-     * @test
-     * @dataProvider invalidVersionNumberDataProvider
-     */
-    public function convertIntegerToVersionNumberConvertsOtherTypesAsIntegerToVersionNumber($version)
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionCode(1334072223);
-        VersionNumberUtility::convertIntegerToVersionNumber($version);
-    }
 
     /**
      * @return array

diff --git a/typo3/sysext/core/Tests/UnitDeprecated/Utility/VersionNumberUtilityTest.php b/typo3/sysext/core/Tests/UnitDeprecated/Utility/VersionNumberUtilityTest.php
new file mode 100644 (file)
index 0000000..460c481
--- /dev/null
+++ b/typo3/sysext/core/Tests/UnitDeprecated/Utility/VersionNumberUtilityTest.php
@@ -0,0 +1,93 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\UnitDeprecated\Utility;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * Testcase for class \TYPO3\CMS\Core\Utility\VersionNumberUtility
+ */
+class VersionNumberUtilityTest extends UnitTestCase
+{
+
+    /**
+     * Data Provider for convertVersionNumberToIntegerConvertsVersionNumbersToIntegers
+     *
+     * @return array
+     */
+    public function validVersionNumberDataProvider()
+    {
+        return [
+            ['4003003', '4.3.3'],
+            ['4012003', '4.12.3'],
+            ['5000000', '5.0.0'],
+            ['5000001', '5.0.1'],
+            ['3008001', '3.8.1'],
+            ['1012', '0.1.12']
+        ];
+    }
+
+    /**
+     * Data Provider for convertIntegerToVersionNumberConvertsOtherTypesAsIntegerToVersionNumber
+     *
+     * @see http://php.net/manual/en/language.types.php
+     * @return array
+     */
+    public function invalidVersionNumberDataProvider()
+    {
+        return [
+            'boolean' => [true],
+            'float' => [5.4],
+            'array' => [[]],
+            'string' => ['300ABCD'],
+            'object' => [new \stdClass()],
+            'NULL' => [null],
+            'function' => [function () {
+            }]
+        ];
+    }
+
+    /**
+     * @test
+     * @dataProvider validVersionNumberDataProvider
+     */
+    public function convertVersionNumberToIntegerConvertsVersionNumbersToIntegers($expected, $version)
+    {
+        $this->assertEquals($expected, VersionNumberUtility::convertVersionNumberToInteger($version));
+    }
+
+    /**
+     * @test
+     * @dataProvider validVersionNumberDataProvider
+     */
+    public function convertIntegerToVersionNumberConvertsIntegerToVersionNumber($versionNumber, $expected)
+    {
+        // Make sure incoming value is an integer
+        $versionNumber = (int)$versionNumber;
+        $this->assertEquals($expected, VersionNumberUtility::convertIntegerToVersionNumber($versionNumber));
+    }
+
+    /**
+     * @test
+     * @dataProvider invalidVersionNumberDataProvider
+     */
+    public function convertIntegerToVersionNumberConvertsOtherTypesAsIntegerToVersionNumber($version)
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionCode(1334072223);
+        VersionNumberUtility::convertIntegerToVersionNumber($version);
+    }
+}

diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
index 9538cc7..0da9ecc 100644 (file)
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
@@ -882,4 +882,25 @@ return [
             'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
+    'TYPO3\CMS\Core\Utility\VersionNumberUtility::splitVersionRange' => [
+        'numberOfMandatoryArguments' => 1,
+        'maximumNumberOfArguments' => 1,
+        'restFiles' => [
+            'Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst',
+        ],
+    ],
+    'TYPO3\CMS\Core\Utility\VersionNumberUtility::raiseVersionNumber' => [
+        'numberOfMandatoryArguments' => 2,
+        'maximumNumberOfArguments' => 2,
+        'restFiles' => [
+            'Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst',
+        ],
+    ],
+    'TYPO3\CMS\Core\Utility\VersionNumberUtility::convertIntegerToVersionNumber' => [
+        'numberOfMandatoryArguments' => 2,
+        'maximumNumberOfArguments' => 2,
+        'restFiles' => [
+            'Deprecation-88554-DeprecatedMethodsInVersionNumberUtility.rst',
+        ],
+    ],
 ];