Merge pull request #9 from jweiland-net/removeUnusedMethod

Remove unused method
jweiland-net · Dec 1, 2022 · 3e34054 · 3e34054
2 parents e0472b9 + 7a6006f
commit 3e34054
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 53 deletions.
diff --git a/Classes/Domain/Model/Form.php b/Classes/Domain/Model/Form.php
@@ -11,7 +11,7 @@
 
 namespace JWeiland\JwForms\Domain\Model;
 
-use TYPO3\CMS\Extbase\Annotation\Validate;
+use TYPO3\CMS\Extbase\Annotation as Extbase;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
@@ -23,7 +23,7 @@ class Form extends AbstractEntity
     /**
      * @var string
      *
-     * @Validate("NotEmpty")
+     * @Extbase\Validate("NotEmpty")
      */
     protected $title = '';
 
@@ -34,6 +34,8 @@ class Form extends AbstractEntity
 
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category>
+     *
+     * @Extbase\ORM\Lazy
      */
     protected $categories;
 

diff --git a/Classes/Domain/Repository/FormRepository.php b/Classes/Domain/Repository/FormRepository.php
@@ -9,13 +9,11 @@
 
 namespace JWeiland\JwForms\Domain\Repository;
 
-use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Persistence\Generic\Query;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -128,53 +126,6 @@ public function getQueryBuilderToFindAllEntries(int $category = 0): QueryBuilder
         return $queryBuilder;
     }
 
-    /**
-     * Get an array with available starting letters
-     */
-    public function getStartingLetters(string $categories): array
-    {
-        /** @var Query $query */
-        $query = $this->createQuery();
-
-        $placeHolders = [];
-        $placeHolders[] = 'tx_jwforms_domain_model_form';
-        $placeHolders[] = 'categories';
-        $placeHolders[] = implode(',', $query->getQuerySettings()->getStoragePageIds());
-
-        $additionalWhereQuery = '';
-
-        // add query for categories
-        if (!empty($categories)) {
-            // create OR-Query for categories
-            $orQueryForCategories = [];
-            foreach (GeneralUtility::intExplode(',', $categories) as $category) {
-                $orQueryForCategories[] = 'sys_category_record_mm.uid_local IN (?)';
-                $placeHolders[] = (int)$category;
-            }
-            $additionalWhereQuery .= ' AND (' . implode(' OR ', $orQueryForCategories) . ') ';
-        }
-
-        [$availableLetters] = $query->statement(
-            '
-            SELECT GROUP_CONCAT(DISTINCT UPPER(LEFT(tx_jwforms_domain_model_form.title, 1))) as letters
-            FROM tx_jwforms_domain_model_form
-            LEFT JOIN sys_category_record_mm
-            ON tx_jwforms_domain_model_form.uid=sys_category_record_mm.uid_foreign
-            LEFT JOIN sys_category
-            ON sys_category_record_mm.uid_local=sys_category.uid
-            WHERE sys_category_record_mm.tablenames = ?
-            AND sys_category_record_mm.fieldname = ?
-            AND tx_jwforms_domain_model_form.pid IN (?)' .
-            $additionalWhereQuery .
-            BackendUtility::BEenableFields('tx_jwforms_domain_model_form') .
-            'AND tx_jwforms_domain_model_form.deleted = 0' . '
-        ',
-            $placeHolders
-        )->execute(true);
-
-        return $availableLetters;
-    }
-
     protected function getConnectionPool(): ConnectionPool
     {
         return GeneralUtility::makeInstance(ConnectionPool::class);

diff --git a/Classes/EventListener/AddGlossaryEventListener.php b/Classes/EventListener/AddGlossaryEventListener.php
@@ -60,6 +60,7 @@ protected function getOptions(PostProcessFluidVariablesEvent $event): array
             'extensionName' => 'JwForms',
             'pluginName' => 'Forms',
             'controllerName' => 'Form',
+            'actionName' => 'search',
             'column' => 'title',
             'settings' => $event->getSettings()
         ];

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -7,6 +7,13 @@
 Change log
 ==========
 
+Version 3.0.3
+=============
+
+*   Call search action when clicking on letters in glossar
+*   Add Laxy annotation to categories property
+*   Remove unused method getStartingLetters from FormRepository
+
 Version 3.0.2
 =============
 

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -4,7 +4,7 @@
 [general]
 
 project     = JW Forms
-version     = 3.0.2
+version     = 3.0.3
 release     = 3.0
 copyright   = by jweiland.net
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -7,7 +7,7 @@
     'author_email' => 'sfroemken@jweiland.net',
     'author_company' => 'jweiland.net',
     'state' => 'stable',
-    'version' => '3.0.2',
+    'version' => '3.0.3',
     'constraints' => [
         'depends' => [
             'typo3' => '10.4.32-11.5.99',