From 7e32f1b1f20337630a68f1d1f138219f1f6cebe4 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Tue, 29 May 2018 00:21:46 +0200
Subject: [PATCH] Clean up terfe2 code related to composer name

---
 .../ter_fe2/Classes/Controller/Eid/ExtensionController.php  | 6 +++---
 .../Classes/Validation/Validator/ComposerNameValidator.php  | 6 +++---
 .../Configuration/TCA/tx_terfe2_domain_model_extension.php  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/typo3conf/ext/ter_fe2/Classes/Controller/Eid/ExtensionController.php b/html/typo3conf/ext/ter_fe2/Classes/Controller/Eid/ExtensionController.php
index 7ac6ec82..748bd62c 100644
--- a/html/typo3conf/ext/ter_fe2/Classes/Controller/Eid/ExtensionController.php
+++ b/html/typo3conf/ext/ter_fe2/Classes/Controller/Eid/ExtensionController.php
@@ -66,13 +66,13 @@ class ExtensionController
         $expr = $queryBuilder->expr();
 
         $result = $queryBuilder->select(
-            'tx_terfe2_domain_model_extension.ext_key',
-            'tx_terfe2_domain_model_extension.composer_name'
+            'ext_key',
+            'composer_name'
         )
             ->from('tx_terfe2_domain_model_extension')
             ->where(
                 $expr->neq(
-                    'tx_terfe2_domain_model_extension.composer_name',
+                    'composer_name',
                     $queryBuilder->createNamedParameter('')
                 )
             )
diff --git a/html/typo3conf/ext/ter_fe2/Classes/Validation/Validator/ComposerNameValidator.php b/html/typo3conf/ext/ter_fe2/Classes/Validation/Validator/ComposerNameValidator.php
index 8a3996e3..f2dab925 100644
--- a/html/typo3conf/ext/ter_fe2/Classes/Validation/Validator/ComposerNameValidator.php
+++ b/html/typo3conf/ext/ter_fe2/Classes/Validation/Validator/ComposerNameValidator.php
@@ -17,7 +17,7 @@ namespace T3o\TerFe2\Validation\Validator;
 use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator;
 
 /**
- * Validator for composer name on packagist.org
+ * Validator for composer name
  */
 class ComposerNameValidator extends AbstractValidator
 {
@@ -26,7 +26,7 @@ class ComposerNameValidator extends AbstractValidator
     public static $composerNameIsConfirmed = false;
 
     /**
-     * Returns false, if given composer name is not registered on packagist.org
+     * Returns false, if given composer name is not set, invalid or too long
      *
      * @param mixed $value The value that should be validated
      * @return boolean TRUE if the value is valid, FALSE if an error occured
@@ -50,7 +50,7 @@ class ComposerNameValidator extends AbstractValidator
 
     private function isValidComposerName(string $composerName): bool
     {
-        if (strlen($composerName) > 50) {
+        if (strlen($composerName) > 60) {
             return false;
         }
         if (substr_count($composerName, '/') !== 1) {
diff --git a/html/typo3conf/ext/ter_fe2/Configuration/TCA/tx_terfe2_domain_model_extension.php b/html/typo3conf/ext/ter_fe2/Configuration/TCA/tx_terfe2_domain_model_extension.php
index c16da159..915b48dd 100644
--- a/html/typo3conf/ext/ter_fe2/Configuration/TCA/tx_terfe2_domain_model_extension.php
+++ b/html/typo3conf/ext/ter_fe2/Configuration/TCA/tx_terfe2_domain_model_extension.php
@@ -19,10 +19,10 @@ return array(
         'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('ter_fe2') . 'Resources/Public/Icons/extension.gif',
     ),
     'interface' => array(
-        'showRecordFieldList' => 'ext_key,forge_link,last_update,last_maintained,tags,versions,last_version,frontend_user,downloads,repository_url,paypal_url,external_manual,expire',
+        'showRecordFieldList' => 'ext_key,forge_link,last_update,last_maintained,tags,versions,last_version,frontend_user,downloads,composer_name,repository_url,paypal_url,external_manual,expire',
     ),
     'types' => array(
-        '1' => array('showitem' => 'ext_key,forge_link,last_update,last_maintained,tags,versions,last_version,frontend_user,downloads,repository_url,paypal_url,external_manual,expire'),
+        '1' => array('showitem' => 'ext_key,forge_link,last_update,last_maintained,tags,versions,last_version,frontend_user,downloads,composer_name,repository_url,paypal_url,external_manual,expire'),
     ),
     'palettes' => array(
         '1' => array('showitem' => ''),
@@ -105,7 +105,7 @@ return array(
             'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_extension.composer_name',
             'config' => array(
                 'type' => 'input',
-                'size' => 50,
+                'size' => 60,
                 'eval' => 'trim',
             ),
         ),
-- 
GitLab