From 28ef3f39ddcbf8c3e9c74206f1eb9a95d6d8e002 Mon Sep 17 00:00:00 2001 From: Michal Cygankiewicz Date: Mon, 4 Nov 2019 16:59:39 +0100 Subject: [PATCH 1/2] replace deprecated @ignorevalidation --- .../Classes/Controller/ExtensionController.php | 12 ++++++------ .../Classes/Controller/RegisterkeyController.php | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/ter_fe2/Classes/Controller/ExtensionController.php b/extensions/ter_fe2/Classes/Controller/ExtensionController.php index 8cc3f12c..f7c4f60f 100755 --- a/extensions/ter_fe2/Classes/Controller/ExtensionController.php +++ b/extensions/ter_fe2/Classes/Controller/ExtensionController.php @@ -162,7 +162,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController * Action that displays a single extension * * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to display - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function showAction(\T3o\TerFe2\Domain\Model\Extension $extension = null) { @@ -222,7 +222,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController * Displays a form to edit an existing extension * * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to display - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function editAction(\T3o\TerFe2\Domain\Model\Extension $extension) { @@ -320,7 +320,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController /** * @param \T3o\TerFe2\Domain\Model\Extension $extension * @param \T3o\TerFe2\Domain\Model\Tag $tag - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function removeTagAction(\T3o\TerFe2\Domain\Model\Extension $extension, \T3o\TerFe2\Domain\Model\Tag $tag) { @@ -356,7 +356,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object * @param string $versionString An existing version string * @param string $format Format of the file output - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") * @throws \Exception */ public function downloadAction(\T3o\TerFe2\Domain\Model\Extension $extension, $versionString = '', $format = '') @@ -443,7 +443,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController * * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object * @param array $form Form information for the new version - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function uploadVersionAction(\T3o\TerFe2\Domain\Model\Extension $extension, array $form = []) { @@ -459,7 +459,7 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController * * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension object * @param array $form Form information for the new version - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function createVersionAction(\T3o\TerFe2\Domain\Model\Extension $extension, array $form) { diff --git a/extensions/ter_fe2/Classes/Controller/RegisterkeyController.php b/extensions/ter_fe2/Classes/Controller/RegisterkeyController.php index ca7aa17c..4182da3e 100644 --- a/extensions/ter_fe2/Classes/Controller/RegisterkeyController.php +++ b/extensions/ter_fe2/Classes/Controller/RegisterkeyController.php @@ -165,7 +165,7 @@ class RegisterkeyController extends \T3o\TerFe2\Controller\AbstractTerBasedContr * * @param string $newUser Username of the assignee * @param \T3o\TerFe2\Domain\Model\Extension $extension Extension to transfer - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") */ public function transferAction($newUser, \T3o\TerFe2\Domain\Model\Extension $extension) { @@ -252,7 +252,7 @@ class RegisterkeyController extends \T3o\TerFe2\Controller\AbstractTerBasedContr * The process for getting expiring extensions will be back in 1 year * * @param \T3o\TerFe2\Domain\Model\Extension $extension - * @ignorevalidation $extension + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("extension") * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException */ public function keepAction(\T3o\TerFe2\Domain\Model\Extension $extension) @@ -266,7 +266,7 @@ class RegisterkeyController extends \T3o\TerFe2\Controller\AbstractTerBasedContr * Delete an extension version from ter server * * @param \T3o\TerFe2\Domain\Model\Version $version Extension to delete - * @ignorevalidation $version + * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("version") */ public function deleteExtensionVersionAction(\T3o\TerFe2\Domain\Model\Version $version) { -- GitLab From ee45fbaec33656535e7704f2d7b75df517520ea0 Mon Sep 17 00:00:00 2001 From: Michal Cygankiewicz Date: Mon, 4 Nov 2019 17:48:56 +0100 Subject: [PATCH 2/2] using pageRenderer setMetaTag --- .../ter_fe2/Classes/Controller/ExtensionController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/ter_fe2/Classes/Controller/ExtensionController.php b/extensions/ter_fe2/Classes/Controller/ExtensionController.php index f7c4f60f..c555501a 100755 --- a/extensions/ter_fe2/Classes/Controller/ExtensionController.php +++ b/extensions/ter_fe2/Classes/Controller/ExtensionController.php @@ -16,6 +16,7 @@ namespace T3o\TerFe2\Controller; use T3o\TerFe2\Validation\Validator\ComposerNameValidator; use TYPO3\CMS\Core\Database\ConnectionPool; +use TYPO3\CMS\Core\Page\PageRenderer; use TYPO3\CMS\Core\Utility\GeneralUtility; /** @@ -193,10 +194,11 @@ class ExtensionController extends \T3o\TerFe2\Controller\AbstractController $documentationLink = $documentationService->getDocumentationLink($extension->getExtKey(), $extension->getLastVersion()->getVersionString(), true); $this->view->assign('documentationLink', $documentationLink); - $pageRenderer = $this->objectManager->get(\TYPO3\CMS\Core\Page\PageRenderer::class); - $pageRenderer->addMetaTag(''); + /** @var PageRenderer $pageRenderer */ + $pageRenderer = $this->objectManager->get(PageRenderer::class); + $pageRenderer->setMetaTag('name', 'description', htmlspecialchars($extension->getLastVersion()->getDescription())); if ($extension->getTags()->count() > 0) { - $pageRenderer->addMetaTag(''); + $pageRenderer->setMetaTag('name', 'keywords', htmlspecialchars(implode(',', $extension->getTags()->toArray()))); } // gets all other extensions from the owner -- GitLab