[TASK] Prepare for v13

r3h6 · Jun 14, 2024 · 7849dd5 · 7849dd5
1 parent 18daab6
commit 7849dd5
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ jobs:
           - { PHP: '8.1', TYPO3_VERSION: ^12.4 }
           - { PHP: '8.2', TYPO3_VERSION: ^12.4 }
           - { PHP: '8.3', TYPO3_VERSION: ^12.4 }
-          # - { PHP: '8.2', TYPO3_VERSION: ^13.1 }
-          # - { PHP: '8.3', TYPO3_VERSION: ^13.1 }
+          - { PHP: '8.2', TYPO3_VERSION: ~13.1.0 }
+          - { PHP: '8.3', TYPO3_VERSION: ~13.1.0 }
 
     env: ${{ matrix.env }}
 

diff --git a/Build/Data/db.sql b/Build/Data/db.sql
diff --git a/Classes/Middleware/Initializer.php b/Classes/Middleware/Initializer.php
@@ -44,7 +44,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $handler->handle($request);
         }
 
-        $typoscript = new FrontendTypoScript(new RootNode(), []);
+        $typoscript = GeneralUtility::makeInstance(FrontendTypoScript::class, new RootNode(), [], [], []);
         $typoscript->setSetupArray([]);
         $request = $request->withAttribute('frontend.typoscript', $typoscript);
         $GLOBALS['TYPO3_REQUEST'] = $request;

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -2,10 +2,12 @@
 
 defined('TYPO3') || die('Access denied.');
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'Oauth2Server',
-    'Consent',
-    'LLL:EXT:oauth2_server/Resources/Private/Language/locallang_be.xlf:plugin.oauth2server_consent.title',
-    'mimetypes-x-content-consent',
-    'forms'
-);
+(static function () {
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'Oauth2Server',
+        'Consent',
+        'LLL:EXT:oauth2_server/Resources/Private/Language/locallang_be.xlf:plugin.oauth2server_consent.title',
+        'mimetypes-x-content-consent',
+        'forms'
+    );
+})();
diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
@@ -0,0 +1 @@
+@import 'EXT:oauth2_server/Configuration/TSconfig/Page/ContentElementWizard.tsconfig
diff --git a/composer.json b/composer.json
@@ -16,15 +16,14 @@
 		"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
 		"league/oauth2-server": "^8.5.4",
 		"symfony/psr-http-message-bridge": "^6.4",
-		"typo3/cms-core": "^12.4 || ^13.1"
+		"typo3/cms-core": "^12.4"
 	},
 	"require-dev": {
 		"ergebnis/composer-normalize": "^2.42",
 		"michielroos/typo3scan": "^1.7",
 		"phpstan/phpstan-phpunit": "^1.4",
 		"phpunit/phpcov": "^9.0",
 		"saschaegerer/phpstan-typo3": "^1.10",
-		"ssch/typo3-rector": "^2.6",
 		"typo3/cms-belog": "^12.4 || ^13.1",
 		"typo3/cms-extensionmanager": "^12.4 || ^13.1",
 		"typo3/cms-felogin": "^12.4 || ^13.1",
@@ -68,6 +67,10 @@
 		}
 	},
 	"scripts": {
+		"post-autoload-dump": [
+			"chmod 600 Resources/Private/Keys/private.key",
+			"chmod 600 Resources/Private/Keys/public.key"
+		],
 		"ci:coverage": [
 			"@ci:coverage:unit",
 			"@ci:coverage:functional",

diff --git a/config/system/settings.php b/config/system/settings.php
@@ -1,5 +1,4 @@
 <?php
-
 return [
     'BE' => [
         'debug' => true,
@@ -60,8 +59,6 @@
     ],
     'GFX' => [
         'processor' => 'GraphicsMagick',
-        'processor_allowTemporaryMasksAsPng' => false,
-        'processor_colorspace' => 'RGB',
         'processor_effects' => false,
         'processor_enabled' => true,
         'processor_path' => '/usr/bin/',
@@ -122,7 +119,6 @@
         'exceptionalErrors' => 12290,
         'features' => [
             'security.backend.enforceContentSecurityPolicy' => true,
-            'security.usePasswordPolicyForFrontendUsers' => true,
         ],
         'sitename' => 'TYPO3 OAuth2 Server',
         'systemMaintainers' => [

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -2,7 +2,7 @@
 
 defined('TYPO3') || die('Access denied.');
 
-(function () {
+(static function () {
     if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('scheduler')) {
         \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
             $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Scheduler\Task\TableGarbageCollectionTask::class]['options']['tables'],
@@ -35,10 +35,6 @@
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT
     );
 
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
-        @import \'EXT:oauth2_server/Configuration/TSconfig/Page/ContentElementWizard.tsconfig\'
-    ');
-
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService(
         'oauth2_server',
         'auth',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import 'EXT:oauth2_server/Configuration/TSconfig/Page/ContentElementWizard.tsconfig