Commit 6910d397 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'main'

Release 22-02-2021

See merge request !643
parents 5228e16c 9d8a81eb
Pipeline #10374 passed with stages
in 7 minutes and 59 seconds
include:
- project: 'services/common/t3o-basic-pipeline-jobs'
- project: 'services/t3o-sites/common/t3o-basic-pipeline-jobs'
ref: main
file: 't3o-basic-pipeline-jobs.yml'
......@@ -65,7 +65,7 @@ test:mutation:
- composer config cache-dir /cache/composer
- mkdir $TYPO3_PATH_WEB/fileadmin/ && touch $TYPO3_PATH_WEB/fileadmin/currentcoredata.json
script:
- composer selfupdate --1
- composer selfupdate --2
- composer install --ignore-platform-reqs
- ./vendor/bin/infection --min-msi=10 --min-covered-msi=75 --threads=4
artifacts:
......
......@@ -20,8 +20,7 @@ $sharedFiles = [
set('shared_files', $sharedFiles);
$writeableDirectories = [
'public/typo3temp',
'var'
'public/typo3temp'
];
set('writable_dirs', $writeableDirectories);
......@@ -36,7 +35,10 @@ $exclude = [
'Upgrading.txt',
'README',
'*.example',
'AdditionalConfiguration.sample.php'
'AdditionalConfiguration.sample.php',
'.gitlab-ci',
'.gitlab',
'typoscript-lint.yml'
];
set('rsync', [
'exclude' => array_merge($sharedDirectories, $sharedFiles, $exclude),
......@@ -75,11 +77,13 @@ task('cache', function () {
});
task('maintenance:activate', function () {
run('echo "return 503;" > ~/cnf/nginx-prod.conf');
run('echo "return 503;" > ~/cnf/nginx-{{deploy_type}}.conf');
run('sudo /usr/sbin/service php74-extensions-{{deploy_type}} restart');
run('sudo /usr/sbin/service nginx reload');
});
task('maintenance:deactivate', function () {
run('rm ~/cnf/nginx-prod.conf');
run('rm ~/cnf/nginx-{{deploy_type}}.conf');
run('sudo /usr/sbin/service php74-extensions-{{deploy_type}} restart');
run('sudo /usr/sbin/service nginx reload');
});
......@@ -92,10 +96,10 @@ task('deploy', [
'deploy:writable',
'maintenance:activate',
'typo3',
'maintenance:deactivate',
'typo3:ter_wsdl',
'deploy:symlink',
'solr:host',
'cache',
'maintenance:deactivate',
'cleanup'
]);
......@@ -6,6 +6,7 @@ main:
forward_agent: true
deploy_path: ~/ci/
keep_releases: 2
deploy_type: prod
develop:
stage: stage
hostname: extensions.typo3.dev
......@@ -14,3 +15,4 @@ develop:
forward_agent: true
deploy_path: ~/ci/
keep_releases: 2
deploy_type: stage
This diff is collapsed.
......@@ -83,6 +83,7 @@ class ExtensionController
header('Content-Type: application/json');
echo $json;
exit();
}
}
......
......@@ -27,7 +27,7 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
class TranslationStatusService
{
/** @var string */
private $statusUrl = 'https://localize.typo3.org/fileadmin/ter/status.json';
private $statusUrl = 'https://localize.typo3.org/xliff/status.json';
/** @var ObjectManager */
private $objectManager;
......
......@@ -230,7 +230,7 @@
<f:for each="{likedExtensions}" as="extension">
<tr>
<td class="text-middle">
<f:link.action controller="Extension" action="show" arguments="{extension: extension}">{extension.extKey}</f:link.action><br>
<f:link.action pageUid="{settings.pages.extensionDetailPID}" controller="Extension" action="show" arguments="{extension : extension}">{extension.extKey}</f:link.action><br>
{extension.lastVersion.author.name}
</td>
<td>
......
......@@ -60,7 +60,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\T3o\TerFe2\Task
'description' => 'LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:tx_terfe2_task_checkforexpiredextensions.description',
];
$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['ter_fe2:extension'] = 'EXT:ter_fe2/Classes/Controller/Eid/ExtensionController.php';
$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['ter_fe2:extension'] = \T3o\TerFe2\Controller\Eid\ExtensionController::class;
$GLOBALS['TYPO3_CONF_VARS']['SYS']['routing']['aspects']['VersionMapper'] = \T3o\TerFe2\Routing\Aspect\VersionMapper::class;
......
......@@ -228,7 +228,7 @@
"items": {
"maxLength": 30,
"minLength": 3,
"pattern": "^((?!(tx|user|pages|tt|sys|ts_language|csh))[a-z][a-z0-9_]+)$",
"pattern": "^((?!(tx|user_|pages|tt_|sys_|ts_language_|csh_))[a-z][a-z0-9_]+)$",
"type": "string"
}
},
......@@ -3246,7 +3246,7 @@
"items": {
"maxLength": 30,
"minLength": 3,
"pattern": "^((?!(tx|user|pages|tt|sys|ts_language|csh))[a-z][a-z0-9_]+)$",
"pattern": "^((?!(tx|user_|pages|tt_|sys_|ts_language_|csh_))[a-z][a-z0-9_]+)$",
"type": "string"
}
},
......
......@@ -162,7 +162,7 @@ paths:
items:
maxLength: 30
minLength: 3
pattern: ^((?!(tx|user|pages|tt|sys|ts_language|csh))[a-z][a-z0-9_]+)$
pattern: ^((?!(tx|user_|pages|tt_|sys_|ts_language_|csh_))[a-z][a-z0-9_]+)$
type: string
example: my_new_extension,another_awesome_extension
responses:
......@@ -2149,7 +2149,7 @@ components:
items:
maxLength: 30
minLength: 3
pattern: ^((?!(tx|user|pages|tt|sys|ts_language|csh))[a-z][a-z0-9_]+)$
pattern: ^((?!(tx|user_|pages|tt_|sys_|ts_language_|csh_))[a-z][a-z0-9_]+)$
type: string
example: my_new_extension,another_awesome_extension
requestBodies:
......
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