Commit 7e32f1b1 authored by Helmut Hummel's avatar Helmut Hummel Committed by Thomas Löffler

Clean up terfe2 code related to composer name

parent 3bd919c8
...@@ -66,13 +66,13 @@ class ExtensionController ...@@ -66,13 +66,13 @@ class ExtensionController
$expr = $queryBuilder->expr(); $expr = $queryBuilder->expr();
$result = $queryBuilder->select( $result = $queryBuilder->select(
'tx_terfe2_domain_model_extension.ext_key', 'ext_key',
'tx_terfe2_domain_model_extension.composer_name' 'composer_name'
) )
->from('tx_terfe2_domain_model_extension') ->from('tx_terfe2_domain_model_extension')
->where( ->where(
$expr->neq( $expr->neq(
'tx_terfe2_domain_model_extension.composer_name', 'composer_name',
$queryBuilder->createNamedParameter('') $queryBuilder->createNamedParameter('')
) )
) )
......
...@@ -17,7 +17,7 @@ namespace T3o\TerFe2\Validation\Validator; ...@@ -17,7 +17,7 @@ namespace T3o\TerFe2\Validation\Validator;
use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator; use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator;
/** /**
* Validator for composer name on packagist.org * Validator for composer name
*/ */
class ComposerNameValidator extends AbstractValidator class ComposerNameValidator extends AbstractValidator
{ {
...@@ -26,7 +26,7 @@ class ComposerNameValidator extends AbstractValidator ...@@ -26,7 +26,7 @@ class ComposerNameValidator extends AbstractValidator
public static $composerNameIsConfirmed = false; 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 * @param mixed $value The value that should be validated
* @return boolean TRUE if the value is valid, FALSE if an error occured * @return boolean TRUE if the value is valid, FALSE if an error occured
...@@ -50,7 +50,7 @@ class ComposerNameValidator extends AbstractValidator ...@@ -50,7 +50,7 @@ class ComposerNameValidator extends AbstractValidator
private function isValidComposerName(string $composerName): bool private function isValidComposerName(string $composerName): bool
{ {
if (strlen($composerName) > 50) { if (strlen($composerName) > 60) {
return false; return false;
} }
if (substr_count($composerName, '/') !== 1) { if (substr_count($composerName, '/') !== 1) {
......
...@@ -19,10 +19,10 @@ return array( ...@@ -19,10 +19,10 @@ return array(
'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('ter_fe2') . 'Resources/Public/Icons/extension.gif', 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('ter_fe2') . 'Resources/Public/Icons/extension.gif',
), ),
'interface' => array( '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( '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( 'palettes' => array(
'1' => array('showitem' => ''), '1' => array('showitem' => ''),
...@@ -105,7 +105,7 @@ return array( ...@@ -105,7 +105,7 @@ return array(
'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_extension.composer_name', 'label' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_domain_model_extension.composer_name',
'config' => array( 'config' => array(
'type' => 'input', 'type' => 'input',
'size' => 50, 'size' => 60,
'eval' => 'trim', 'eval' => 'trim',
), ),
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment