Merge pull request #12 from FamousWolf/typo3-11

Typo3 11 compatibility

Author: FamousWolf

ChangeLog

@@ -1,3 +1,8 @@
+2021-02-23 Rudy Gnodde <[email protected]>
+    * Version 1.1.0
+    * TYPO3 11 compatibility
+    ! No longer compatible with TYPO3 8.7
+
 2021-02-11 Rudy Gnodde
     * Version 1.0.8
     * Fix TYPO3 8.7 compatibility

Classes/Controller/RandomdataCommandController.php

@@ -74,12 +74,7 @@ public function configure()
      */
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        if (version_compare(TYPO3_version, '9.0.0', '>=')) {
-            Bootstrap::initializeBackendAuthentication();
-        } else {
-            $bootstrap = Bootstrap::getInstance();
-            $bootstrap->initializeBackendAuthentication();
-        }
+        Bootstrap::initializeBackendAuthentication();
         /** @var ObjectManager $objectManager */
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         /** @var RandomdataService $randomdataService */

Classes/Provider/FileProvider.php

@@ -68,18 +68,14 @@ static public function generate(Generator $faker, array $configuration, Randomda
         }
 
         if (!empty($configuration['source'])) {
-            if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 9002000) {
-                $sourceAbsolutePath = PATH_site . trim($configuration['source'], '/') . '/';
-            } else {
-                $sourceAbsolutePath = Environment::getPublicPath() . '/' . trim($configuration['source'], '/') . '/';
-            }
+            $sourceAbsolutePath = Environment::getPublicPath() . '/' . trim($configuration['source'], '/') . '/';
 
             if (is_dir($sourceAbsolutePath)) {
                 $count = $faker->numberBetween($configuration['minimum'], $configuration['maximum']);
                 $files = self::getRandomFiles($sourceAbsolutePath, $count);
 
                 if (!empty($files)) {
-                    $resourceFactory = ResourceFactory::getInstance();
+                    $resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
                     $references = [];
                     foreach ($files as $file) {
                         $fileObject = $resourceFactory->retrieveFileOrFolderObject($file);

Configuration/Commands.php

@@ -2,5 +2,6 @@
 return [
     'randomdata:generate' => [
         'class' => \WIND\Randomdata\Controller\RandomdataCommandController::class,
+        'schedulable' => false,
     ],
 ];

Configuration/Services.yaml

@@ -0,0 +1,13 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+  WIND\Randomdata\:
+    resource: '../Classes/*'
+  WIND\Randomdata\Controller\RandomdataCommandController:
+    tags:
+      - name: 'console.command'
+        command: 'randomdata:generate'
+        description: 'Generate random data'
+        schedulable: false

composer.json

@@ -4,7 +4,7 @@
   "type": "typo3-cms-extension",
   "license": "GPL-3.0-or-later",
   "require": {
-    "typo3/cms-core": "^8.7 || ^9.5.17 || ^10.4.10",
+    "typo3/cms-core": "^9.5.30 || ^10.4.20 || ^11.3.3",
     "fzaninotto/faker": "^1.8"
   },
   "replace": {

ext_emconf.php

@@ -9,10 +9,10 @@
     'state' => 'stable',
     'uploadfolder' => false,
     'clearCacheOnLoad' => false,
-    'version' => '1.0.8',
+    'version' => '1.1.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '8.7.13-10.4.99',
+            'typo3' => '9.5.0-11.1.99',
         ],
         'conflicts' => [
         ],