Merge pull request #9 from TYPO3GmbH/10lts

[FEATURE] Create core v10 LTS compatibility

Author: helsner

.github/workflows/ci.yml

@@ -37,4 +37,4 @@ jobs:
           typo3DatabaseHost: 127.0.0.1
           typo3DatabaseName: t3func
           typo3DatabasePassword: root
-          typo3DatabaseUsername: root
+          typo3DatabaseUsername: root

Classes/Controller/QuerybuilderController.php

@@ -15,6 +15,7 @@
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\UserAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Http\JsonResponse;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -23,7 +24,6 @@
  */
 class QuerybuilderController
 {
-
     /**
      * @param ServerRequestInterface $request
      * @param ResponseInterface $response
@@ -33,12 +33,13 @@ class QuerybuilderController
      * @throws \TYPO3\CMS\Core\Context\Exception\AspectNotFoundException
      * @throws \TYPO3\CMS\Core\Context\Exception\AspectPropertyNotFoundException
      */
-    public function ajaxSaveQuery(ServerRequestInterface $request, ResponseInterface $response) : ResponseInterface
+    public function ajaxSaveQuery(ServerRequestInterface $request): ResponseInterface
     {
         $result = new \stdClass();
         $result->status = 'ok';
 
         $requestParams = $request->getQueryParams();
+        /** @var \TYPO3\CMS\Core\Database\Query\QueryBuilder $queryBuilder */
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('sys_querybuilder');
         $uid = (int)$requestParams['uid'];
@@ -65,6 +66,7 @@ public function ajaxSaveQuery(ServerRequestInterface $request, ResponseInterface
             $result->uid = $uid;
         }
 
+        $response = new JsonResponse();
         $response->getBody()->write(json_encode($result));
         return $response;
     }
@@ -77,17 +79,21 @@ public function ajaxSaveQuery(ServerRequestInterface $request, ResponseInterface
      * @throws \TYPO3\CMS\Core\Context\Exception\AspectNotFoundException
      * @throws \TYPO3\CMS\Core\Context\Exception\AspectPropertyNotFoundException
      */
-    public function ajaxGetRecentQueries(ServerRequestInterface $request) : ResponseInterface
+    public function ajaxGetRecentQueries(ServerRequestInterface $request): ResponseInterface
     {
         $requestParams = $request->getQueryParams();
+        /** @var QueryBuilder $queryBuilder */
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('sys_querybuilder');
 
         $results = $queryBuilder
             ->select('uid', 'queryname', 'where_parts')
             ->from('sys_querybuilder')
             ->where(
-                $queryBuilder->expr()->eq('affected_table', $queryBuilder->createNamedParameter($requestParams['table'])),
+                $queryBuilder->expr()->eq(
+                    'affected_table',
+                    $queryBuilder->createNamedParameter($requestParams['table'])
+                ),
                 $queryBuilder->expr()->eq('user', (int)$this->getBackendUserAspect()->get('id'))
             )
             ->execute()

Classes/Factory/FilterFactory.php

@@ -17,6 +17,7 @@ class FilterFactory
 {
     public function create(array $properties): Filter
     {
+        /** @var Filter $entity */
         $entity = GeneralUtility::makeInstance(Filter::class);
         foreach ($properties as $property => $value) {
             $method = 'set' . GeneralUtility::underscoredToUpperCamelCase($property);

Classes/Factory/PluginFactory.php

@@ -17,6 +17,7 @@ class PluginFactory
 {
     public function create(array $properties): Plugin
     {
+        /** @var Plugin $entity */
         $entity = GeneralUtility::makeInstance(Plugin::class);
         foreach ($properties as $property => $value) {
             $method = 'set' . GeneralUtility::underscoredToUpperCamelCase($property);

Classes/Factory/ValidationFactory.php

@@ -17,6 +17,7 @@ class ValidationFactory
 {
     public function create(array $properties): Validation
     {
+        /** @var Validation $entity */
         $entity = GeneralUtility::makeInstance(Validation::class);
         foreach ($properties as $property => $value) {
             $method = 'set' . GeneralUtility::underscoredToUpperCamelCase($property);

Classes/Hooks/DatabaseRecordList.php

@@ -43,7 +43,7 @@ public function modifyQuery(
         $request = $GLOBALS['TYPO3_REQUEST'];
         $queryParams = $request->getQueryParams();
         $route = $queryParams['route'] ?? '';
-        if (!empty($table) && $route === '/web/list/') {
+        if (!empty($table) && $route === '/module/web/list') {
             $query = $queryParams['query'] ?? '';
             if ($query !== null) {
                 $filter = json_decode($query);

Classes/Hooks/PageRenderer.php

@@ -36,7 +36,7 @@ public function renderPreProcess(array $params): void
         $queryParams = $request->getQueryParams();
         $table = $queryParams['table'] ?? '';
         $route = $queryParams['route'] ?? '';
-        if (!empty($table) && $route === '/web/list/') {
+        if (!empty($table) && $route === '/module/web/list') {
             $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
 
             $pageRenderer->addInlineLanguageLabelFile('EXT:querybuilder/Resources/Private/Language/querybuilder-js.xlf');

Classes/Parser/QueryParser.php

@@ -53,7 +53,6 @@ class QueryParser
     /**
      * @param stdClass $filterObject
      * @param QueryBuilder $queryBuilderObject
-     *
      * @param int $iteration
      *
      * @return QueryBuilder

Configuration/TCA/sys_querybuilder.php

@@ -22,22 +22,17 @@
             'showitem' => 'queryname, affected_table, where_parts, user'
         ],
     ],
-    'palettes' => [
-        '1' => [
-            'showitem' => 'queryname, affected_table, where_parts, user'
-        ],
-    ],
     'columns' => [
         'where_parts' => [
             'exclude' => true,
-            'label' => 'where_parts',
+            'label' => 'Conditions (saved ad JSON)',
             'config' => [
                 'type' => 'text',
             ],
         ],
         'affected_table' => [
             'exclude' => true,
-            'label' => 'affected_table',
+            'label' => 'Affected Table',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -47,7 +42,7 @@
         ],
         'queryname' => [
             'exclude' => true,
-            'label' => 'queryname',
+            'label' => 'Queryname',
             'config' => [
                 'type' => 'input',
                 'size' => 50,
@@ -57,7 +52,7 @@
         ],
         'user' => [
             'exclude' => true,
-            'label' => 'userid',
+            'label' => 'User',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',

Documentation/Settings.cfg

@@ -23,8 +23,8 @@
 ; you can use in 'conf.py'
 
 project     = TYPO3 Querybuilder Extension
-version     = 10.0.x-dev
-release     = 10.0.x-dev
+version     = 10.4.0
+release     = 10.4.0
 t3author    = TYPO3 GmbH
 copyright   = since 2017 by TYPO3 GmbH