Commit 15e96c1f authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Fix CGL and TypoScript

parent a08732f7
Pipeline #10243 passed with stages
in 5 minutes and 51 seconds
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Controller;
/**
......@@ -50,12 +50,9 @@ class FeatureController extends ActionController
/**
* action listFeatures
*
* @return void
*/
public function listFeaturesAction(): void
{
if ($this->settings['featurearea'] !== '') {
$featureArea = $this->featureAreaRepository->findByUid((int)$this->settings['featurearea']);
$this->view->assign('featureArea', $featureArea);
......@@ -67,8 +64,6 @@ class FeatureController extends ActionController
/**
* action showRecord
*
* @return void
*/
public function showFeatureRecordsAction(): void
{
......@@ -82,8 +77,6 @@ class FeatureController extends ActionController
/**
* action showRecord
*
* @return void
*/
public function showFeatureAreaRecordsAction(): void
{
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Controller;
/**
......@@ -15,7 +15,7 @@ namespace T3o\Typo3Roadmap\Controller;
* The TYPO3 project - inspiring people to share!
*/
use \T3o\Typo3Roadmap\Domain\Model\MajorVersion;
use T3o\Typo3Roadmap\Domain\Model\MajorVersion;
use T3o\Typo3Roadmap\Domain\Repository\MajorVersionRepository;
use T3o\Typo3Roadmap\Domain\Repository\PhpVersionRepository;
use TYPO3\CMS\Core\Page\PageRenderer;
......@@ -62,8 +62,6 @@ class RoadmapController extends ActionController
/**
* action roadmap
*
* @return void
*/
public function roadmapAction(): void
{
......@@ -89,7 +87,7 @@ class RoadmapController extends ActionController
$pageRenderer->addJsFooterLibrary('amcharts_lightheme', 'EXT:typo3_roadmap/Resources/Public/JavaScript/lighttheme.min.js');
$pageRenderer->addJsFooterLibrary('amcharts_export', 'EXT:typo3_roadmap/Resources/Public/JavaScript/export.min.js');
$pageRenderer->addCssFile('EXT:typo3_roadmap/Resources/Public/Css/export.css');
// @TODO comment css
// @TODO comment css
$data = $this->generateChartArray($majorVersions);
$this->view->assign('data', $data);
$chartJs = '
......@@ -180,7 +178,7 @@ class RoadmapController extends ActionController
*/
protected function generateChartArray($majorVersions): array
{
$data = array();
$data = [];
foreach ($majorVersions as $index => $majorVersion) {
$firstStart = (int)$majorVersion->getDevelopmentStart();
$data[$index]['version'] = $majorVersion->getTitle();
......@@ -204,20 +202,20 @@ class RoadmapController extends ActionController
}
//Sprint Segment
$data[$index]['segments'][] = array(
$data[$index]['segments'][] = [
'start' => $this->dateFromTimestamp($sprintStart),
'end' => $this->dateFromTimestamp($realDate - 1209600),
'color' => self::COLOR_CODE_SPRINT,
'task' => 'Sprint Phase ' . $minorVersion->getVersion()
);
];
//Stabilization Segment
$data[$index]['segments'][] = array(
$data[$index]['segments'][] = [
'start' => $this->dateFromTimestamp($realDate - 1209600),
'end' => $this->dateFromTimestamp($realDate),
'color' => self::COLOR_CODE_STABILIZATION,
'task' => 'Stabilization Phase ' . $minorVersion->getVersion()
);
];
// Set the last release date as start of maintenance
$firstStart = $realDate;
}
......@@ -225,27 +223,27 @@ class RoadmapController extends ActionController
* Set Maintenance Times
*/
// Regular Maintenance
$data[$index]['segments'][] = array(
$data[$index]['segments'][] = [
'start' => $this->dateFromTimestamp($firstStart),
'end' => $this->dateFromTimestamp($majorVersion->getRegularSupport()),
'color' => self::COLOR_CODE_REGULAR,
'task' => 'Regular Maintenance'
);
];
// Security Maintenance
$data[$index]['segments'][] = array(
$data[$index]['segments'][] = [
'start' => $this->dateFromTimestamp($majorVersion->getRegularSupport()),
'end' => $this->dateFromTimestamp($majorVersion->getPrioritySupport()),
'color' => self::COLOR_CODE_SECURITY,
'task' => 'Priority bugfixes'
);
];
// ELTS Maintenance
if ($majorVersion->getExtendedSupport() > 0) {
$data[$index]['segments'][] = array(
$data[$index]['segments'][] = [
'start' => $this->dateFromTimestamp($majorVersion->getPrioritySupport()),
'end' => $this->dateFromTimestamp($majorVersion->getExtendedSupport()),
'color' => self::COLOR_CODE_ELTS,
'task' => 'Extended support (optional)'
);
];
}
}
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Model;
/**
......@@ -15,9 +15,9 @@ namespace T3o\Typo3Roadmap\Domain\Model;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Extbase\Annotation as Extbase;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Annotation as Extbase;
/**
* Feature
......@@ -90,8 +90,6 @@ class Feature extends AbstractEntity
* Do not modify this method!
* It will be rewritten on each save in the extension builder
* You may modify the constructor of this class instead
*
* @return void
*/
protected function initStorageObjects(): void
{
......@@ -114,7 +112,6 @@ class Feature extends AbstractEntity
* Sets the header
*
* @param string $header
* @return void
*/
public function setHeader(string $header): void
{
......@@ -135,7 +132,6 @@ class Feature extends AbstractEntity
* Sets the description
*
* @param string $description
* @return void
*/
public function setDescription(string $description): void
{
......@@ -156,7 +152,6 @@ class Feature extends AbstractEntity
* Sets the link
*
* @param string $link
* @return void
*/
public function setLink(string $link): void
{
......@@ -177,7 +172,6 @@ class Feature extends AbstractEntity
* Sets the featureArea
*
* @param \T3o\Typo3Roadmap\Domain\Model\FeatureArea $featureArea
* @return void
*/
public function setFeatureArea(FeatureArea $featureArea)
{
......@@ -198,7 +192,6 @@ class Feature extends AbstractEntity
* Sets the typo3releaseminorversion
*
* @param \T3o\Typo3Roadmap\Domain\Model\MinorVersion $typo3releaseminorversion
* @return void
*/
public function setTypo3releaseminorversion(MinorVersion $typo3releaseminorversion): void
{
......@@ -219,7 +212,6 @@ class Feature extends AbstractEntity
* Sets the typo3releasemajorversion
*
* @param \T3o\Typo3Roadmap\Domain\Model\MajorVersion $typo3releasemajorversion
* @return void
*/
public function setTypo3releasemajorversion(MajorVersion $typo3releasemajorversion): void
{
......@@ -240,7 +232,6 @@ class Feature extends AbstractEntity
* Sets the images
*
* @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $images
* @return void
*/
public function setImages(ObjectStorage $images): void
{
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Model;
/**
......@@ -15,10 +15,10 @@ namespace T3o\Typo3Roadmap\Domain\Model;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Extbase\Annotation as Extbase;
use TYPO3\CMS\Extbase\Domain\Model\FileReference;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Annotation as Extbase;
/**
* FeatureArea
......@@ -71,8 +71,6 @@ class FeatureArea extends AbstractEntity
* Do not modify this method!
* It will be rewritten on each save in the extension builder
* You may modify the constructor of this class instead
*
* @return void
*/
protected function initStorageObjects()
{
......@@ -93,7 +91,6 @@ class FeatureArea extends AbstractEntity
* Sets the title
*
* @param string $title
* @return void
*/
public function setTitle(string $title): void
{
......@@ -114,7 +111,6 @@ class FeatureArea extends AbstractEntity
* Sets the description
*
* @param string $description
* @return void
*/
public function setDescription(string $description): void
{
......@@ -135,7 +131,6 @@ class FeatureArea extends AbstractEntity
* Sets the page
*
* @param string $page
* @return void
*/
public function setPage(string $page): void
{
......@@ -146,7 +141,6 @@ class FeatureArea extends AbstractEntity
* Adds a FileReference
*
* @param \TYPO3\CMS\Extbase\Domain\Model\FileReference $image
* @return void
*/
public function addImage(FileReference $image): void
{
......@@ -157,7 +151,6 @@ class FeatureArea extends AbstractEntity
* Removes a FileReference
*
* @param \TYPO3\CMS\Extbase\Domain\Model\FileReference $imageToRemove
* @return void
*/
public function removeImage(FileReference $imageToRemove): void
{
......@@ -178,7 +171,6 @@ class FeatureArea extends AbstractEntity
* Sets the images
*
* @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> $images
* @return void
*/
public function setImages(ObjectStorage $images): void
{
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Model;
/**
......@@ -58,7 +58,6 @@ class MajorVersion extends AbstractEntity
*/
protected $phpVersions = null;
/**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3o\Typo3Roadmap\Domain\Model\MinorVersion>
*/
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Model;
/**
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Model;
/**
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Repository;
/**
......@@ -20,5 +20,4 @@ namespace T3o\Typo3Roadmap\Domain\Repository;
*/
class FeatureAreaRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
{
}
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Repository;
/**
......@@ -19,7 +19,6 @@ use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Extbase\Persistence\Repository;
/**
* The repository for Features
*/
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Repository;
/**
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Repository;
/**
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\Domain\Repository;
/**
......
<?php
declare(strict_types=1);
declare(strict_types = 1);
namespace T3o\Typo3Roadmap\UserFunc;
use T3o\Typo3Roadmap\Domain\Repository\MinorVersionRepository;
......
......@@ -167,7 +167,7 @@ return [
'maxitems' => 1,
'size' => 1,
'items' => [
['LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.select_version',0 ]
['LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.select_version', 0 ]
],
],
'onChange' => 'reload',
......
<?php
if (!defined('TYPO3_MODE')) {
die ('Access denied.');
die('Access denied.');
}
return [
......@@ -137,7 +137,7 @@ return [
'size' => 10,
'minitems' => 0,
'maxitems' => 10,
"MM" => "tx_typo3roadmap_majorversion_phpversions_mm",
'MM' => 'tx_typo3roadmap_majorversion_phpversions_mm',
]
],
'minor_versions' => [
......
<?php
if (!defined('TYPO3_MODE')) {
die ('Access denied.');
die('Access denied.');
}
return [
......@@ -106,7 +106,7 @@ return [
'renderType' => 'selectSingle',
'foreign_table' => 'tx_typo3roadmap_domain_model_majorversion',
'foreign_table_where' => ' ORDER BY tx_typo3roadmap_domain_model_majorversion.title',
"maxitems" => 1,
'maxitems' => 1,
],
],
],
......
<?php
if (!defined('TYPO3_MODE')) {
die ('Access denied.');
die('Access denied.');
}
return [
......
mod.wizards {
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_featureareashowrecords {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurearea.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurearea.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_featureareashowrecords
}
}
}
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_featureareashowrecords {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurearea.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurearea.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_featureareashowrecords
}
}
}
}
}
}
}
mod.wizards {
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_features {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurelist.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurelist.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_features
}
}
}
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_features {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurelist.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_featurelist.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_features
}
}
}
}
}
}
}
mod.wizards {
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_featureshowrecords {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_featureshowrecords
}
}
}
newContentElement {
wizardItems {
t3o {
elements {
typo3roadmap_featureshowrecords {
iconIdentifier = default-icon
title = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.contentelement.title
description = LLL:EXT:typo3_roadmap/Resources/Private/Language/locallang_db.xlf:tx_typo3roadmap_domain_model_feature.contentelement.description
tt_content_defValues {
CType = list
list_type = typo3roadmap_featureshowrecords
}
}
}
}
}
}
}
Supports Markdown
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