Skip to content

Commit deaa275

Browse files
liaynliayn
committed
v115.0.7
1 parent c413a21 commit deaa275

File tree

230 files changed

+8197
-8727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+8197
-8727
lines changed

‎.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
*.bak
33
*.map
44
.DS_Store
5-
/.idea
5+
/composer.lock
6+
/.php-cs-fixer.cache
7+
/.php-cs-fixer.php
8+
9+
/.Build/
610
/node_modules/
11+
12+
# Sonar Lint
13+
.idea/sonarlint
14+
715
/Resources/Private/MailTemplates/app.css
8-
/.Build/
9-
/composer.lock

‎.gitlab-ci.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎.php-cs-fixer.dist.php

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
// Return a Code Sniffing configuration using
6+
// all sniffers needed for PSR-2
7+
// and additionally:
8+
// - Remove leading slashes in use clauses.
9+
// - PHP single-line arrays should not have trailing comma.
10+
// - Single-line whitespace before closing semicolon are prohibited.
11+
// - Remove unused use statements in the PHP source code
12+
// - Ensure Concatenation to have at least one whitespace around
13+
// - Remove trailing whitespace at the end of blank lines.
14+
return (new \PhpCsFixer\Config())
15+
->setFinder(
16+
(new PhpCsFixer\Finder())
17+
->ignoreVCSIgnored(true)
18+
->in(realpath(__DIR__))
19+
)
20+
->setRiskyAllowed(true)
21+
->setRules([
22+
'@PSR12' => true,
23+
'@DoctrineAnnotation' => true,
24+
'@PER-CS' => true,
25+
'array_syntax' => ['syntax' => 'short'],
26+
'blank_line_after_opening_tag' => true,
27+
'single_space_around_construct' => true,
28+
'control_structure_braces' => true,
29+
'control_structure_continuation_position' => true,
30+
'declare_parentheses' => true,
31+
'statement_indentation' => true,
32+
'no_multiple_statements_per_line' => true,
33+
'cast_spaces' => ['space' => 'none'],
34+
'compact_nullable_type_declaration' => true,
35+
'concat_space' => ['spacing' => 'one'],
36+
'declare_equal_normalize' => ['space' => 'none'],
37+
'dir_constant' => true,
38+
'type_declaration_spaces' => true,
39+
'lowercase_cast' => true,
40+
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
41+
'modernize_types_casting' => true,
42+
'native_function_casing' => true,
43+
'new_with_parentheses' => true,
44+
'no_alias_functions' => true,
45+
'no_blank_lines_after_phpdoc' => true,
46+
'no_empty_phpdoc' => true,
47+
'no_empty_statement' => true,
48+
'no_extra_blank_lines' => true,
49+
'no_leading_import_slash' => true,
50+
'no_leading_namespace_whitespace' => true,
51+
'no_null_property_initialization' => true,
52+
'no_short_bool_cast' => true,
53+
'no_singleline_whitespace_before_semicolons' => true,
54+
'no_superfluous_elseif' => true,
55+
'no_trailing_comma_in_singleline' => true,
56+
'no_unneeded_control_parentheses' => true,
57+
'no_unused_imports' => true,
58+
'no_useless_else' => true,
59+
'no_useless_nullsafe_operator' => true,
60+
'no_whitespace_in_blank_line' => true,
61+
'ordered_imports' => true,
62+
'php_unit_construct' => ['assertions' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame']],
63+
'php_unit_mock_short_will_return' => true,
64+
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
65+
'phpdoc_no_access' => true,
66+
'phpdoc_no_empty_return' => true,
67+
'phpdoc_no_package' => true,
68+
'phpdoc_scalar' => true,
69+
'phpdoc_trim' => true,
70+
'phpdoc_types' => true,
71+
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
72+
'return_type_declaration' => ['space_before' => 'none'],
73+
'single_quote' => true,
74+
'single_line_comment_style' => ['comment_types' => ['hash']],
75+
'single_trait_insert_per_statement' => true,
76+
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
77+
'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
78+
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
79+
]);

‎.phpstorm.meta.php

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
<?php
2+
3+
/**
4+
* Extend PhpStorms code completion capabilities by providing a meta file
5+
*
6+
* Kudos to Alexander Schnitzler's work, see https://github.com/alexanderschnitzler/phpstorm.meta.php-typo3
7+
* @link https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html
8+
*/
9+
10+
namespace PHPSTORM_META {
11+
// Contexts
12+
// @see https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/9.4/Feature-85389-ContextAPIForConsistentDataHandling.html
13+
expectedArguments(
14+
\TYPO3\CMS\Core\Context\Context::getAspect(),
15+
0,
16+
'date',
17+
'visibility',
18+
'backend.user',
19+
'frontend.user',
20+
'workspace',
21+
'language',
22+
'typoscript'
23+
);
24+
25+
override(\TYPO3\CMS\Core\Context\Context::getAspect(), map([
26+
'date' => \TYPO3\CMS\Core\Context\DateTimeAspect::class,
27+
'visibility' => \TYPO3\CMS\Core\Context\VisibilityAspect::class,
28+
'backend.user' => \TYPO3\CMS\Core\Context\UserAspect::class,
29+
'frontend.user' => \TYPO3\CMS\Core\Context\UserAspect::class,
30+
'workspace' => \TYPO3\CMS\Core\Context\WorkspaceAspect::class,
31+
'language' => \TYPO3\CMS\Core\Context\LanguageAspect::class,
32+
'typoscript' => \TYPO3\CMS\Core\Context\TypoScriptAspect::class,
33+
]));
34+
35+
expectedArguments(
36+
\TYPO3\CMS\Core\Context\DateTimeAspect::get(),
37+
0,
38+
'timestamp',
39+
'iso',
40+
'timezone',
41+
'full',
42+
'accessTime'
43+
);
44+
45+
expectedArguments(
46+
\TYPO3\CMS\Core\Context\VisibilityAspect::get(),
47+
0,
48+
'includeHiddenPages',
49+
'includeHiddenContent',
50+
'includeDeletedRecords'
51+
);
52+
53+
expectedArguments(
54+
\TYPO3\CMS\Core\Context\UserAspect::get(),
55+
0,
56+
'id',
57+
'username',
58+
'isLoggedIn',
59+
'isAdmin',
60+
'groupIds',
61+
'groupNames'
62+
);
63+
64+
expectedArguments(
65+
\TYPO3\CMS\Core\Context\WorkspaceAspect::get(),
66+
0,
67+
'id',
68+
'isLive',
69+
'isOffline'
70+
);
71+
72+
expectedArguments(
73+
\TYPO3\CMS\Core\Context\LanguageAspect::get(),
74+
0,
75+
'id',
76+
'contentId',
77+
'fallbackChain',
78+
'overlayType',
79+
'legacyLanguageMode',
80+
'legacyOverlayType'
81+
);
82+
83+
expectedArguments(
84+
\TYPO3\CMS\Core\Context\TypoScriptAspect::get(),
85+
0,
86+
'forcedTemplateParsing'
87+
);
88+
89+
expectedArguments(
90+
\Psr\Http\Message\ServerRequestInterface::getAttribute(),
91+
0,
92+
'backend.user',
93+
'frontend.user',
94+
'normalizedParams',
95+
'site',
96+
'language',
97+
'routing'
98+
);
99+
100+
override(\Psr\Http\Message\ServerRequestInterface::getAttribute(), map([
101+
'backend.user' => \TYPO3\CMS\Backend\FrontendBackendUserAuthentication::class,
102+
'frontend.user' => \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class,
103+
'normalizedParams' => \TYPO3\CMS\Core\Http\NormalizedParams::class,
104+
'site' => \TYPO3\CMS\Core\Site\Entity\SiteInterface::class,
105+
'language' => \TYPO3\CMS\Core\Site\Entity\SiteLanguage::class,
106+
'routing' => '\TYPO3\CMS\Core\Routing\SiteRouteResult|\TYPO3\CMS\Core\Routing\PageArguments',
107+
]));
108+
109+
expectedArguments(
110+
\TYPO3\CMS\Core\Http\ServerRequest::getAttribute(),
111+
0,
112+
'backend.user',
113+
'frontend.user',
114+
'normalizedParams',
115+
'site',
116+
'language',
117+
'routing'
118+
);
119+
120+
override(\TYPO3\CMS\Core\Http\ServerRequest::getAttribute(), map([
121+
'backend.user' => \TYPO3\CMS\Backend\FrontendBackendUserAuthentication::class,
122+
'frontend.user' => \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class,
123+
'normalizedParams' => \TYPO3\CMS\Core\Http\NormalizedParams::class,
124+
'site' => \TYPO3\CMS\Core\Site\Entity\SiteInterface::class,
125+
'language' => \TYPO3\CMS\Core\Site\Entity\SiteLanguage::class,
126+
'routing' => '\TYPO3\CMS\Core\Routing\SiteRouteResult|\TYPO3\CMS\Core\Routing\PageArguments',
127+
]));
128+
129+
override(\TYPO3\CMS\Core\Routing\SiteMatcher::matchRequest(), type(
130+
\TYPO3\CMS\Core\Routing\SiteRouteResult::class,
131+
\TYPO3\CMS\Core\Routing\RouteResultInterface::class,
132+
)
133+
);
134+
135+
override(\TYPO3\CMS\Core\Routing\PageRouter::matchRequest(), type(
136+
\TYPO3\CMS\Core\Routing\PageArguments::class,
137+
\TYPO3\CMS\Core\Routing\RouteResultInterface::class,
138+
));
139+
}

‎Classes/AuthenticationException.php

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
<?php declare(strict_types=1);
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* This file is part of the "Skill Display" Extension for TYPO3 CMS.
7+
*
8+
* For the full copyright and license information, please read the
9+
* LICENSE.txt file that was distributed with this source code.
10+
*
11+
* (c) Reelworx GmbH
12+
**/
213

314
namespace SkillDisplay\Skills;
415

5-
class AuthenticationException extends \RuntimeException
6-
{
7-
}
16+
use RuntimeException;
17+
18+
class AuthenticationException extends RuntimeException {}

‎Classes/Command/CleanupController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
declare(strict_types=1);
34

45
namespace SkillDisplay\Skills\Command;
@@ -44,15 +45,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
4445
'delete FROM `tx_skills_patron_mm` WHERE not exists (select uid from tx_skills_domain_model_brand where uid_foreign = uid);',
4546
];
4647
foreach ($clean_mm_statements as $statement) {
47-
$connection->exec($statement);
48+
$connection->executeStatement($statement);
4849
}
4950

5051
// remove all relations from skills to translated tags
51-
$connection->exec('delete tx_skills_skill_tag_mm
52+
$connection->executeStatement('delete tx_skills_skill_tag_mm
5253
FROM tx_skills_skill_tag_mm
5354
join tx_skills_domain_model_skill s on s.uid = tx_skills_skill_tag_mm.uid_local
5455
join tx_skills_domain_model_tag t on t.uid = tx_skills_skill_tag_mm.uid_foreign
5556
where s.sys_language_uid = 0 AND t.sys_language_uid > 0');
56-
return 0;
57+
return Command::SUCCESS;
5758
}
5859
}

‎Classes/Command/ExportController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
declare(strict_types=1);
34

45
namespace SkillDisplay\Skills\Command;
@@ -10,7 +11,6 @@
1011
use Symfony\Component\Console\Input\InputOption;
1112
use Symfony\Component\Console\Output\OutputInterface;
1213
use TYPO3\CMS\Core\Utility\GeneralUtility;
13-
use TYPO3\CMS\Extbase\Object\ObjectManager;
1414

1515
class ExportController extends Command
1616
{
@@ -41,13 +41,14 @@ protected function configure()
4141
*
4242
* @param InputInterface $input
4343
* @param OutputInterface $output
44+
* @return int
4445
*/
4546
protected function execute(InputInterface $input, OutputInterface $output)
4647
{
4748
$skillSets = $input->getArgument('skillSets');
4849
$targetFileName = $input->getOption('output');
49-
$exportService = GeneralUtility::makeInstance(ObjectManager::class)->get(ExportService::class);
50+
$exportService = GeneralUtility::makeInstance(ExportService::class);
5051
$exportService->doExport($targetFileName, $skillSets);
51-
return 0;
52+
return Command::SUCCESS;
5253
}
5354
}

0 commit comments

Comments
 (0)