diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..d37a2c50
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,52 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# TS/JS-Files
+[*.{ts,js}]
+indent_size = 2
+
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.rst]
+indent_size = 3
+max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# package.json
+# .travis.yml
+[{package.json,.travis.yml}]
+indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..aef3b67b
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,178 @@
+on:
+ push:
+ branches:
+ - '*'
+ - '!master'
+
+name: CI
+
+jobs:
+ php-lint:
+ name: PHP linter
+
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ php-version:
+ - 7.2
+ - 7.3
+ - 7.4
+
+ steps:
+ - name: Configure PHP ${{ matrix.php-version }}
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php-version }}
+
+ - name: Checkout
+ uses: actions/checkout@v1
+
+ - name: Run PHP lint
+ run: |
+ echo "${{ matrix.exclude-pattern }}"
+ find *.php Classes/ Configuration/ Tests/ -name '*.php' ${{ matrix.exclude-pattern }}
+ find *.php Classes/ Configuration/ Tests/ -name '*.php' ${{ matrix.exclude-pattern }} -print0 | xargs -0 -n 1 -P 4 php -l
+
+ typoscript-lint:
+ name: TypoScript linter
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Configure PHP 7.4
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: 7.4
+
+ - name: Checkout
+ uses: actions/checkout@v1
+
+ - name: "Cache dependencies installed with composer"
+ uses: actions/cache@v1
+ with:
+ path: ~/.composer/cache
+ key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+ restore-keys: |
+ php${{ matrix.php-version }}-composer-
+ - name: Install Composer dependencies
+ run: composer install --no-progress
+
+ - name: Run TypoScript lint
+ run: composer ci:ts:lint
+
+ php-code-sniffer:
+ name: PHP Code Sniffer
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Configure PHP 7.4
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: 7.4
+
+ - name: Checkout
+ uses: actions/checkout@v1
+
+ - name: "Cache dependencies installed with composer"
+ uses: actions/cache@v1
+ with:
+ path: ~/.composer/cache
+ key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+ restore-keys: |
+ php${{ matrix.php-version }}-composer-
+ - name: Install Composer dependencies
+ run: composer install --no-progress
+
+ - name: Run PHP Code Sniffer
+ run: composer ci:php:sniff
+
+ unit-tests:
+ name: Unit tests
+
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ composer-version:
+ - v1
+ - v2
+ typo3-version:
+ - "^9.5"
+ - "^10.4"
+ composer-dependencies:
+ - highest
+ - lowest
+ php-version:
+ - 7.2
+ - 7.3
+ - 7.4
+ include:
+ - typo3-version: "^9.5"
+ database-image: mariadb:latest
+ - typo3-version: "^10.4"
+ database-image: mariadb:latest
+
+ services:
+ mysql:
+ image: ${{ matrix.database-image }}
+ env:
+ MYSQL_ALLOW_EMPTY_PASSWORD: false
+ MYSQL_DATABASE: typo3
+ MYSQL_ROOT_PASSWORD: password
+ MYSQL_USER: user
+ ports:
+ - 3306
+
+ steps:
+ - name: Configure PHP ${{ matrix.php-version }}
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php-version }}
+ extensions: fileinfo, filter, gd, hash, intl, json, mbstring, mysqli, openssl, pcre, session, SPL, xml, zip, zlib
+ coverage: none
+ tools: composer:${{ matrix.composer-version }}
+
+ - name: Checkout
+ uses: actions/checkout@v1
+
+ - name: "Cache dependencies installed with composer"
+ uses: actions/cache@v1
+ with:
+ path: ~/.composer/cache
+ key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+ restore-keys: |
+ php${{ matrix.php-version }}-composer-
+
+ - name: Install TYPO3 Core
+ env:
+ TYPO3: ${{ matrix.typo3-version }}
+ run: |
+ composer --version
+ composer require typo3/minimal:"${{ matrix.typo3-version }}"
+ composer show
+
+ - name: Install lowest dependencies with composer
+ if: matrix.composer-dependencies == 'lowest'
+ run: |
+ composer update --no-ansi --no-interaction --no-progress --no-suggest --prefer-lowest
+ composer show
+
+ - name: Install highest dependencies with composer
+ if: matrix.composer-dependencies == 'highest'
+ run: |
+ composer update --no-ansi --no-interaction --no-progress --no-suggest
+ composer show
+
+ - name: Run unit tests
+ run: composer ci:tests:unit
+
+ - name: Run functional tests
+ env:
+ typo3DatabaseHost: 127.0.0.1
+ typo3DatabasePort: ${{ job.services.mysql.ports['3306'] }}
+ typo3DatabaseName: typo3
+ typo3DatabaseUsername: root
+ typo3DatabasePassword: password
+ run: composer ci:tests:functional
diff --git a/.gitignore b/.gitignore
index a41d2a17..f0106d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ package-lock.json
# PHP CS fix caches
.php_cs.cache
+
+/var
diff --git a/Build/.php_cs b/.php_cs
similarity index 77%
rename from Build/.php_cs
rename to .php_cs
index a9134a89..ff98b285 100644
--- a/Build/.php_cs
+++ b/.php_cs
@@ -20,7 +20,7 @@
*
* And then simply run
*
- * $ php-cs-fixer fix --config ../Build/.php_cs
+ * $ ./bin/php-cs-fixer fix --config ./Build/.php_cs
*
* inside the TYPO3 directory. Warning: This may take up to 10 minutes.
*
@@ -31,10 +31,7 @@
if (PHP_SAPI !== 'cli') {
die('This script supports command line usage only. Please check your command.');
}
-// Define in which folders to search and which folders to exclude
-// Exclude some directories that are excluded by Git anyways to speed up the sniffing
-$finder = PhpCsFixer\Finder::create()
- ->in(__DIR__ . '/../');
+
// Return a Code Sniffing configuration using
// all sniffers needed for PSR-2
// and additionally:
@@ -47,41 +44,53 @@ $finder = PhpCsFixer\Finder::create()
return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
- '@PSR2' => true,
'@DoctrineAnnotation' => true,
- 'no_leading_import_slash' => true,
- 'no_trailing_comma_in_singleline_array' => true,
- 'no_singleline_whitespace_before_semicolons' => true,
- 'no_unused_imports' => true,
- 'concat_space' => ['spacing' => 'one'],
- 'no_whitespace_in_blank_line' => true,
- 'ordered_imports' => true,
- 'single_quote' => true,
- 'no_empty_statement' => true,
- 'no_extra_consecutive_blank_lines' => true,
- 'phpdoc_no_package' => true,
- 'phpdoc_scalar' => true,
- 'no_blank_lines_after_phpdoc' => true,
+ '@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
- 'whitespace_after_comma_in_array' => true,
+ 'blank_line_after_opening_tag' => true,
+ 'braces' => ['allow_single_line_closure' => true],
+ 'cast_spaces' => ['space' => 'none'],
+ 'compact_nullable_typehint' => true,
+ 'concat_space' => ['spacing' => 'one'],
+ 'declare_equal_normalize' => ['space' => 'none'],
+ 'dir_constant' => true,
'function_typehint_space' => true,
'hash_to_slash_comment' => true,
- 'no_alias_functions' => true,
'lowercase_cast' => true,
- 'no_leading_namespace_whitespace' => true,
+ 'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+ 'modernize_types_casting' => true,
'native_function_casing' => true,
+ 'new_with_braces' => true,
+ 'no_alias_functions' => true,
+ 'no_blank_lines_after_phpdoc' => true,
+ 'no_empty_phpdoc' => true,
+ 'no_empty_statement' => true,
+ 'no_extra_consecutive_blank_lines' => true,
+ 'no_leading_import_slash' => true,
+ 'no_leading_namespace_whitespace' => true,
+ 'no_null_property_initialization' => true,
'no_short_bool_cast' => true,
+ 'no_singleline_whitespace_before_semicolons' => true,
+ 'no_superfluous_elseif' => true,
+ 'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
+ 'no_unused_imports' => true,
+ 'no_useless_else' => true,
+ 'no_whitespace_in_blank_line' => true,
+ 'ordered_imports' => true,
+ 'php_unit_construct' => ['assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame'],
+ 'php_unit_mock_short_will_return' => true,
+ 'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+ 'phpdoc_no_access' => true,
'phpdoc_no_empty_return' => true,
+ 'phpdoc_no_package' => true,
+ 'phpdoc_scalar' => true,
'phpdoc_trim' => true,
- 'no_superfluous_elseif' => true,
- 'no_useless_else' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
'return_type_declaration' => ['space_before' => 'none'],
- 'cast_spaces' => ['space' => 'none'],
- 'declare_equal_normalize' => ['space' => 'single'],
- 'dir_constant' => true,
- 'phpdoc_no_access' => true
+ 'single_quote' => true,
+ 'single_trait_insert_per_statement' => true,
+ 'whitespace_after_comma_in_array' => true,
])
- ->setFinder($finder);
\ No newline at end of file
+ ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__));
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 37b6913c..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: php
-
-php:
- - 7.3
-
-sudo: false
-
-addons:
- apt:
- packages:
- - parallel
-
-env:
- - NODE_VERSION="6.0"
-
-cache:
- directories:
- - $HOME/.composer/cache
-
-before_install:
- - phpenv config-rm xdebug.ini
- - nvm install $NODE_VERSION
- - composer self-update
- - composer --version
- - composer install
- - npm install
-
-script:
- # Run full test suite and linting of the code base
-# - >
-# echo;
-# echo "Building assets";
-# npm run build:suite
-# - >
-# echo;
-# echo "Running unit tests";
-# .Build/bin/phpunit --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit
- - >
- echo;
- echo "Running PHP Coding Standards Fixer checks";
- .Build/bin/php-cs-fixer fix --config=Build/.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $COMMIT_RANGE`
\ No newline at end of file
diff --git a/Classes/Backend/Controller/ContentElement/NewContentElementController.php b/Classes/Backend/Controller/ContentElement/NewContentElementController.php
index e1e40f4b..0c22e672 100644
--- a/Classes/Backend/Controller/ContentElement/NewContentElementController.php
+++ b/Classes/Backend/Controller/ContentElement/NewContentElementController.php
@@ -1,5 +1,6 @@
rteConfiguration['externalPlugins'] = [];
}
- if (ExtensionManagerConfigurationService::getSettings()['enablePlaceholders']) {
+ if (ConfigurationUtility::getExtensionConfiguration()['enablePlaceholders']) {
$this->rteConfiguration['externalPlugins']['confighelper'] = [
'resource' => 'EXT:frontend_editing/Resources/Public/JavaScript/Plugins/confighelper/plugin.js'
];
diff --git a/Classes/Controller/ReceiverController.php b/Classes/Controller/ReceiverController.php
index fe39f137..9cdaf701 100644
--- a/Classes/Controller/ReceiverController.php
+++ b/Classes/Controller/ReceiverController.php
@@ -1,5 +1,6 @@
getParsedBody()['data'], $data);
- $this->newAction($data['edit'], $data['defVals'], (int) $request->getQueryParams()['page']);
+ $this->newAction($data['edit'], $data['defVals'], (int)$request->getQueryParams()['page']);
break;
case 'hide':
$this->hideAction(
@@ -233,7 +234,7 @@ protected function newAction(array $edit, array $defVals, int $pid)
);
}
- if ((int) array_keys($edit[$table])[0] < 0) {
+ if ((int)array_keys($edit[$table])[0] < 0) {
$defVals[$table]['pid'] = array_keys($edit[$table])[0];
} else {
$defVals[$table]['pid'] = $pid;
diff --git a/Classes/EditingPanel/FrontendEditingDropzoneModifier.php b/Classes/EditingPanel/FrontendEditingDropzoneModifier.php
index 2f8fcc2f..8ef05f56 100644
--- a/Classes/EditingPanel/FrontendEditingDropzoneModifier.php
+++ b/Classes/EditingPanel/FrontendEditingDropzoneModifier.php
@@ -1,5 +1,6 @@
getBeSessionKey()) . ');
window.F.setTranslationLabels(' . json_encode($this->getLocalizedFrontendLabels()) . ');
window.F.setDisableModalOnNewCe(' .
- (int)ExtensionManagerConfigurationService::getSettings()['enablePlaceholders'] .
+ (int)ConfigurationUtility::getExtensionConfiguration()['enablePlaceholders'] .
');
window.FrontendEditingMode = true;
window.TYPO3.settings = {
@@ -385,7 +386,7 @@ protected function loadJavascriptResources()
GeneralUtility::getFileAbsFileName(
'EXT:rte_ckeditor/Resources/Public/JavaScript/Contrib/'
)
- )) .';',
+ )) . ';',
true,
true
);
diff --git a/Classes/Middleware/BackendUserRedirectToFrontend.php b/Classes/Middleware/BackendUserRedirectToFrontend.php
index aa771697..890b2ac5 100644
--- a/Classes/Middleware/BackendUserRedirectToFrontend.php
+++ b/Classes/Middleware/BackendUserRedirectToFrontend.php
@@ -1,4 +1,5 @@
getTSConfig()['frontend_editing.']['disallow_backend_access'] ?? false);
+ return (bool)($user->getTSConfig()['frontend_editing.']['disallow_backend_access'] ?? false);
}
/**
diff --git a/Classes/Middleware/FrontendEditingAspect.php b/Classes/Middleware/FrontendEditingAspect.php
index c07289e2..0f9df370 100644
--- a/Classes/Middleware/FrontendEditingAspect.php
+++ b/Classes/Middleware/FrontendEditingAspect.php
@@ -1,5 +1,6 @@
nodeValue);
}
- $doc = new \DOMDOcument;
+ $doc = new \DOMDOcument();
$doc->loadxml($record['pi_flexform']);
$replacement = $doc->createDocumentFragment();
diff --git a/Classes/RequestPreProcess/RequestPreProcessInterface.php b/Classes/RequestPreProcess/RequestPreProcessInterface.php
index edd12fd0..2486fd0c 100644
--- a/Classes/RequestPreProcess/RequestPreProcessInterface.php
+++ b/Classes/RequestPreProcess/RequestPreProcessInterface.php
@@ -1,5 +1,6 @@
extensionManagerConfigurationService =
- GeneralUtility::makeInstance(ExtensionManagerConfigurationService::class);
$this->contentEditableWrapperTagName = self::DEFAULT_WRAPPER_TAG_NAME;
- $tagName = $this->extensionManagerConfigurationService->getSettings()['contentEditableWrapperTagName'];
+ $tagName = ConfigurationUtility::getExtensionConfiguration()['contentEditableWrapperTagName'];
if ($tagName) {
$this->contentEditableWrapperTagName = $tagName;
}
diff --git a/Classes/Service/ExtensionManagerConfigurationService.php b/Classes/Service/ExtensionManagerConfigurationService.php
deleted file mode 100644
index 2e7c2e6f..00000000
--- a/Classes/Service/ExtensionManagerConfigurationService.php
+++ /dev/null
@@ -1,47 +0,0 @@
-get('frontend_editing');
-
- if (!is_array($settings)) {
- $settings = [];
- }
-
- return $settings;
- }
-}
diff --git a/Classes/UserFunc/HtmlParserUserFunc.php b/Classes/UserFunc/HtmlParserUserFunc.php
index 8dc66baf..3777d71d 100644
--- a/Classes/UserFunc/HtmlParserUserFunc.php
+++ b/Classes/UserFunc/HtmlParserUserFunc.php
@@ -1,5 +1,6 @@
get('frontend_editing');
+
+ if (is_array($configuration)) {
+ return $configuration;
+ }
+
+ return [];
+ }
+}
diff --git a/Classes/Utility/FrontendEditingUtility.php b/Classes/Utility/FrontendEditingUtility.php
index 1e76de13..28e9e762 100644
--- a/Classes/Utility/FrontendEditingUtility.php
+++ b/Classes/Utility/FrontendEditingUtility.php
@@ -1,5 +1,6 @@
[
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
index 3a43290e..39d5a284 100644
--- a/Configuration/TCA/Overrides/sys_template.php
+++ b/Configuration/TCA/Overrides/sys_template.php
@@ -1,4 +1,5 @@
-
-[global]
-
-[backend.user.isLoggedIn]
-
- config.tx_frontendediting {
- # These transformations are applied to the page being edited to ensure features work as expected and inceptions
- # are avoided.
- pageContentPreProcessing {
- parseFunc {
- tags {
- form = TEXT
- form {
- current = 1
-
- # Add frontend_editing=true if this is a GET form (rather than POST)
- innerWrap = |
- innerWrap.if {
- value.data = parameters : method
- value.case = lower
- equals = get
- }
-
- dataWrap =
- }
- }
- }
-
- HTMLparser = 1
- HTMLparser {
- keepNonMatchedTags = 1
-
- tags {
- a.fixAttrib {
- href.userFunc = TYPO3\CMS\FrontendEditing\UserFunc\HtmlParserUserFunc->removeFrontendEditingInUrl
-
- target.list = _self
- }
-
- form.fixAttrib {
- action.userFunc = TYPO3\CMS\FrontendEditing\UserFunc\HtmlParserUserFunc->addFrontendEditingInUrl
-
- target.list = _self
- }
- }
- }
- }
- }
-
-[global]
\ No newline at end of file
diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
new file mode 100644
index 00000000..caecb4ce
--- /dev/null
+++ b/Configuration/TypoScript/setup.typoscript
@@ -0,0 +1,94 @@
+[backend.user.isLoggedIn]
+
+ lib.fluidContent {
+ stdWrap {
+ editIcons = tt_content:header
+ }
+ }
+
+ lib.contentElement.stdWrap < lib.fluidContent.stdWrap
+
+ tt_content.bullets.stdWrap < lib.fluidContent.stdWrap
+ tt_content.div.stdWrap < lib.fluidContent.stdWrap
+ tt_content.header.stdWrap < lib.fluidContent.stdWrap
+ tt_content.html.stdWrap < lib.fluidContent.stdWrap
+ tt_content.image.stdWrap < lib.fluidContent.stdWrap
+ tt_content.list.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_abstract.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_categorized_pages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_pages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_recently_updated.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_related_pages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_section.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_section_pages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_sitemap.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_sitemap_pages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.menu_subpages.stdWrap < lib.fluidContent.stdWrap
+ tt_content.shortcut.stdWrap < lib.fluidContent.stdWrap
+ tt_content.table.stdWrap < lib.fluidContent.stdWrap
+ tt_content.text.stdWrap < lib.fluidContent.stdWrap
+ tt_content.textmedia.stdWrap < lib.fluidContent.stdWrap
+ tt_content.textpic.stdWrap < lib.fluidContent.stdWrap
+ tt_content.uploads.stdWrap < lib.fluidContent.stdWrap
+ tt_content.mailform.stdWrap < lib.fluidContent.stdWrap
+
+ config.tx_extbase {
+ objects {
+ TYPO3\CMS\Extbase\Mvc\View\NotFoundView.className = TYPO3\CMS\FrontendEditing\Mvc\View\NotFoundView
+ }
+ }
+
+ # Prevent links from being parsed to FE url
+ lib.parseFunc_RTE.tags.a >
+
+[global]
+
+[backend.user.isLoggedIn]
+
+ config.tx_frontendediting {
+ # These transformations are applied to the page being edited to ensure features work as expected and inceptions
+ # are avoided.
+ pageContentPreProcessing {
+ parseFunc {
+ tags {
+ form = TEXT
+ form {
+ current = 1
+
+ # Add frontend_editing=true if this is a GET form (rather than POST)
+ innerWrap = |
+ innerWrap.if {
+ value {
+ data = parameters : method
+ case = lower
+ }
+ equals = get
+ }
+
+ dataWrap =
+ }
+ }
+ }
+
+ HTMLparser = 1
+ HTMLparser {
+ keepNonMatchedTags = 1
+
+ tags {
+ a.fixAttrib {
+ href.userFunc = TYPO3\CMS\FrontendEditing\UserFunc\HtmlParserUserFunc->removeFrontendEditingInUrl
+
+ target.list = _self
+ }
+
+ form.fixAttrib {
+ action.userFunc = TYPO3\CMS\FrontendEditing\UserFunc\HtmlParserUserFunc->addFrontendEditingInUrl
+
+ target.list = _self
+ }
+ }
+ }
+ }
+ }
+
+[global]
diff --git a/Tests/Unit/EditingPanel/FrontendEditingPanelTest.php b/Tests/Unit/EditingPanel/FrontendEditingPanelTest.php
index 0ff7f6d7..66b395df 100644
--- a/Tests/Unit/EditingPanel/FrontendEditingPanelTest.php
+++ b/Tests/Unit/EditingPanel/FrontendEditingPanelTest.php
@@ -1,5 +1,6 @@
createMock(AccessService::class);
+
+ $accessServiceMock->method('isEnabled')->willReturn(true);
+
$this->templateServiceMock =
$this->getMockBuilder(TemplateService::class)
->setMethods(['getFileName', 'linkData'])->getMock();
@@ -71,6 +81,7 @@ protected function setUp()
$this->frontendControllerMock->page = [];
$this->frontendControllerMock->sys_page = $pageRepositoryMock;
$GLOBALS['TSFE'] = $this->frontendControllerMock;
+
}
/**
@@ -80,36 +91,48 @@ protected function setUp()
*/
public function editIconsDataProvider()
{
- $GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageService::class);
+ $languageServiceMock = $this->createMock(LanguageService::class);
+
+ $languageServiceMock
+ ->method('sL')
+ ->willReturnArgument(0);
- $router = GeneralUtility::makeInstance(Router::class);
+ $GLOBALS['LANG'] = $languageServiceMock;
+
+ $router = new Router();
$router->addRoute('record_edit', new Route('record_edit', []));
+ GeneralUtility::setSingletonInstance(Router::class, $router);
+
+ $iconMock = $this->createMock(Icon::class);
+
+ $iconMock->method('render')->willReturn('zzz');
+
+ $iconFactoryMock = $this->getMockBuilder(IconFactory::class)
+ ->disableOriginalConstructor()->getMock()
+ ;
+
+ $iconFactoryMock
+ ->method('getIcon')
+ ->willReturn($iconMock);
+
+ GeneralUtility::addInstance(IconFactory::class, $iconFactoryMock);
+
+ $extensionConfigurationMock = $this->createMock(ExtensionConfiguration::class);
+
+ $extensionConfigurationMock
+ ->method('get')
+ ->willReturn(['contentEditableWrapperTagName' => 'div']);
+
+ GeneralUtility::addInstance(ExtensionConfiguration::class, $extensionConfigurationMock);
$contentEditableWrapperService = new ContentEditableWrapperService();
$content = $this->getUniqueId('content');
+
return [
'standard case call edit icons for tt_content:bodytext' => [
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'tt_content',
- 1,
- $contentEditableWrapperService->wrapContent(
- 'tt_content',
- 1,
- [],
- $content
- )
- ),
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'tt_content',
- 1,
- $contentEditableWrapperService->wrapContent(
- 'tt_content',
- 1,
- [],
- $content
- )
- ),
+ '',
+ '',
'tt_content:bodytext',
['beforeLastTag' => '1', 'allow' => 'edit'],
'tt_content:1',
@@ -122,28 +145,8 @@ public function editIconsDataProvider()
1
],
'another case with fe_users:email' => [
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'fe_users',
- 12,
- $contentEditableWrapperService->wrapContent(
- 'fe_users',
- 12,
- [],
- ''
- . $content . '
'
- )
- ),
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'fe_users',
- 12,
- $contentEditableWrapperService->wrapContent(
- 'fe_users',
- 12,
- [],
- ''
- . $content . '
'
- )
- ),
+ '',
+ '',
'fe_users:email',
['beforeLastTag' => '1', 'allow' => 'edit'],
'fe_users:12',
@@ -156,26 +159,8 @@ public function editIconsDataProvider()
1
],
'another case with tt_content:header' => [
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'tt_content',
- 12,
- $contentEditableWrapperService->wrapContent(
- 'tt_content',
- 12,
- [],
- $content
- )
- ),
- $contentEditableWrapperService->wrapContentWithDropzone(
- 'tt_content',
- 12,
- $contentEditableWrapperService->wrapContent(
- 'tt_content',
- 12,
- [],
- $content
- )
- ),
+ '',
+ '',
'tt_content:header',
['beforeLastTag' => '1', 'allow' => 'edit'],
'tt_content:12',
@@ -264,7 +249,7 @@ public function editIcons(
$GLOBALS['BE_USER']->uc['tx_frontend_editing_enable'] = $allowEditing;
$subject = new FrontendEditingPanel();
- $this->assertSame(
+ self::assertSame(
$expect,
$subject->editIcons(
$content,
diff --git a/Tests/Unit/Fixtures/ContentEditableFixtures.php b/Tests/Unit/Fixtures/ContentEditableFixtures.php
index 8855e4bc..95d13618 100644
--- a/Tests/Unit/Fixtures/ContentEditableFixtures.php
+++ b/Tests/Unit/Fixtures/ContentEditableFixtures.php
@@ -1,5 +1,6 @@
initializeBackendRouter();
+ parent::setUp();
+
+ $languageServiceMock = $this->createMock(LanguageService::class);
+
+ $languageServiceMock
+ ->method('sL')
+ ->willReturnArgument(0);
+
+ $GLOBALS['LANG'] = $languageServiceMock;
+
+ $extensionConfigurationMock = $this->createMock(ExtensionConfiguration::class);
+
+ $extensionConfigurationMock
+ ->method('get')
+ ->willReturn([]);
+
+ GeneralUtility::addInstance(ExtensionConfiguration::class, $extensionConfigurationMock);
+
$this->subject = new ContentEditableWrapperService();
- $this->fixtures = new ContentEditableFixtures();
}
- /**
- */
protected function tearDown()
{
unset($this->subject);
+ unset($GLOBALS['TCA']);
+ }
+
+ /**
+ * Data provider for getWrappedContent()
+ *
+ * @return array[]
+ */
+ public function getWrappedContentDataProvider()
+ {
+ $content = $this->getUniqueId('content');
+
+ return [
+ 'normal content' => [
+ '',
+ 'tablename',
+ 'fieldname',
+ 123,
+ $content,
+ [
+ 'columns' => [
+ 'label' => 'Field label'
+ ]
+ ]
+ ]
+ ];
}
/**
+ * @dataProvider getWrappedContentDataProvider
* @test
*/
- public function getWrappedContent()
+ public function getWrappedContent(
+ string $expected,
+ string $table,
+ string $field,
+ int $uid,
+ string $content,
+ array $tableTca
+ )
{
+ $GLOBALS['TCA'][$table] = $tableTca;
+
$wrappedContent = $this->subject->wrapContentToBeEditable(
- $this->fixtures->getTable(),
- $this->fixtures->getField(),
- $this->fixtures->getUid(),
- $this->fixtures->getContent()
+ $table,
+ $field,
+ $uid,
+ $content
);
$this->assertSame(
$wrappedContent,
- $this->fixtures->getWrappedExpectedContent()
+ $expected
);
}
@@ -100,6 +155,7 @@ public function getWrapContentWithDropzone()
$this->fixtures->getUid(),
$this->fixtures->getContent()
);
+
$this->assertSame(
$wrapContent,
$this->fixtures->getWrapWithDropzoneExpectedContent()
@@ -122,7 +178,7 @@ public function tryWrapContentAndExpectAnException()
$this->assertEquals($exception->getMessage(), 'Property "table" can not to be empty!');
return;
}
- $this->fail('Expected Property "table" missing Exception has not been raised.');
+ self::fail('Expected Property "table" missing Exception has not been raised.');
}
/**
@@ -141,7 +197,7 @@ public function tryWrapContentAndExpectAnExceptionForMissingTable()
$this->assertEquals($exception->getMessage(), 'Property "table" can not to be empty!');
return;
}
- $this->fail('Expected Property "table" missing Exception has not been raised.');
+ self::fail('Expected Property "table" missing Exception has not been raised.');
}
/**
@@ -160,7 +216,7 @@ public function tryWrapContentAndExpectAnExceptionForMissingUid()
$this->assertEquals($exception->getMessage(), 'Property "uid" can not to be empty!');
return;
}
- $this->fail('Expected Property "uid" missing Exception has not been raised.');
+ self::fail('Expected Property "uid" missing Exception has not been raised.');
}
/**
* @test
@@ -177,7 +233,7 @@ public function tryWrapContentWithDropzoneAndExpectAnExceptionForMissingTable()
$this->assertEquals($exception->getMessage(), 'Property "table" can not to be empty!');
return;
}
- $this->fail('Expected Property "table" missing Exception has not been raised.');
+ self::fail('Expected Property "table" missing Exception has not been raised.');
}
/**
@@ -195,6 +251,6 @@ public function tryWrapContentWithDropzoneAndExpectAnExceptionForMissingUid()
$this->assertEquals($exception->getMessage(), 'Property "uid" is not valid!');
return;
}
- $this->fail('Expected Property "uid" missing Exception has not been raised.');
+ self::fail('Expected Property "uid" missing Exception has not been raised.');
}
}
diff --git a/Tests/Unit/Service/ExtensionManagerConfigurationServiceTest.php b/Tests/Unit/Service/ExtensionManagerConfigurationServiceTest.php
index 2a268f41..e6560e6b 100644
--- a/Tests/Unit/Service/ExtensionManagerConfigurationServiceTest.php
+++ b/Tests/Unit/Service/ExtensionManagerConfigurationServiceTest.php
@@ -1,5 +1,6 @@
assertSame(
- ExtensionManagerConfigurationService::getSettings(),
+ $extensionConfigurationMock = $this->createMock(ExtensionConfiguration::class);
+
+ $extensionConfigurationMock
+ ->method('get')
+ ->willReturn([]);
+
+ GeneralUtility::addInstance(ExtensionConfiguration::class, $extensionConfigurationMock);
+
+ self::assertSame(
+ ConfigurationUtility::getExtensionConfiguration(),
[]
);
}
diff --git a/Tests/Unit/ViewHelpers/ContentEditableViewHelperTest.php b/Tests/Unit/ViewHelpers/ContentEditableViewHelperTest.php
index 65563ed7..212d2bf0 100644
--- a/Tests/Unit/ViewHelpers/ContentEditableViewHelperTest.php
+++ b/Tests/Unit/ViewHelpers/ContentEditableViewHelperTest.php
@@ -1,5 +1,6 @@
getMock(ContentEditableViewHelper::class, ['registerArgument']);
- $instance->expects($this->at(0))->method('registerArgument')->with(
+ $instance->expects(self::at(0))->method('registerArgument')->with(
'table',
'string',
- $this->anything(),
+ self::anything(),
true,
false
);
- $instance->expects($this->at(1))->method('registerArgument')->with(
+ $instance->expects(self::at(1))->method('registerArgument')->with(
'field',
'string',
- $this->anything(),
+ self::anything(),
false,
false
);
- $instance->expects($this->at(2))->method('registerArgument')->with(
+ $instance->expects(self::at(2))->method('registerArgument')->with(
'uid',
'string',
- $this->anything(),
+ self::anything(),
true,
false
);
@@ -70,11 +71,11 @@ public function testInitializeArgumentsRegistersExpectedArguments()
public function testRenderWithoutFrontendEditingEnabled($value, array $arguments, $expected)
{
$instance = $this->getMock(ContentEditableViewHelper::class, ['renderChildren']);
- $instance->expects($this->once())->method('renderChildren')->willReturn($value);
+ $instance->expects(self::once())->method('renderChildren')->willReturn($value);
$instance->setArguments($arguments);
$instance->setRenderingContext(new RenderingContextFixture());
$result = $instance->render();
- $this->assertEquals($expected, $result);
+ self::assertEquals($expected, $result);
}
/**
@@ -96,11 +97,11 @@ public function testRenderWithFrontendEditingEnabled($value, array $arguments, $
);
ContentEditableFixtures::setAccessServiceEnabled(true);
$instance = $this->getMock(ContentEditableViewHelper::class, ['renderChildren']);
- $instance->expects($this->once())->method('renderChildren')->willReturn($value);
+ $instance->expects(self::once())->method('renderChildren')->willReturn($value);
$instance->setArguments($arguments);
$instance->setRenderingContext(new RenderingContextFixture());
$result = $instance->render();
- $this->assertEquals($expected, $result);
+ self::assertEquals($expected, $result);
}
/**
diff --git a/Tests/Unit/ViewHelpers/CustomDropZoneViewHelperTest.php b/Tests/Unit/ViewHelpers/CustomDropZoneViewHelperTest.php
index 66b8043a..e5c5acb6 100644
--- a/Tests/Unit/ViewHelpers/CustomDropZoneViewHelperTest.php
+++ b/Tests/Unit/ViewHelpers/CustomDropZoneViewHelperTest.php
@@ -1,5 +1,6 @@
getMock(CustomDropZoneViewHelper::class, ['registerArgument']);
- $instance->expects($this->at(0))->method('registerArgument')->with(
+ $instance->expects(self::at(0))->method('registerArgument')->with(
'tables',
'array',
- $this->anything(),
+ self::anything(),
true,
false
);
- $instance->expects($this->at(1))->method('registerArgument')->with(
+ $instance->expects(self::at(1))->method('registerArgument')->with(
'fields',
'array',
- $this->anything(),
+ self::anything(),
false,
false
);
- $instance->expects($this->at(2))->method('registerArgument')->with(
+ $instance->expects(self::at(2))->method('registerArgument')->with(
'pageUid',
'string',
- $this->anything(),
+ self::anything(),
false,
false
);
- $instance->expects($this->at(3))->method('registerArgument')->with(
+ $instance->expects(self::at(3))->method('registerArgument')->with(
'prepend',
'bool',
- $this->anything(),
+ self::anything(),
false,
false
);
@@ -75,11 +76,11 @@ public function testInitializeArgumentsRegistersExpectedArguments()
public function testRenderWithoutFrontendEditingEnabled($value, array $arguments, $expected)
{
$instance = $this->getMock(CustomDropZoneViewHelper::class, ['renderChildren']);
- $instance->expects($this->once())->method('renderChildren')->willReturn($value);
+ $instance->expects(self::once())->method('renderChildren')->willReturn($value);
$instance->setArguments($arguments);
$instance->setRenderingContext(new RenderingContextFixture());
$result = $instance->render();
- $this->assertEquals($expected, $result);
+ self::assertEquals($expected, $result);
}
/**
@@ -92,11 +93,11 @@ public function testRenderWithFrontendEditingEnabled($value, array $arguments, $
{
ContentEditableFixtures::setAccessServiceEnabled(true);
$instance = $this->getMock(CustomDropZoneViewHelper::class, ['renderChildren']);
- $instance->expects($this->once())->method('renderChildren')->willReturn($value);
+ $instance->expects(self::once())->method('renderChildren')->willReturn($value);
$instance->setArguments($arguments);
$instance->setRenderingContext(new RenderingContextFixture());
$result = $instance->render();
- $this->assertEquals($expected, $result);
+ self::assertEquals($expected, $result);
}
/**
diff --git a/Tests/Unit/ViewHelpers/SvgViewHelperTest.php b/Tests/Unit/ViewHelpers/SvgViewHelperTest.php
index 58262c5f..4582fc9b 100644
--- a/Tests/Unit/ViewHelpers/SvgViewHelperTest.php
+++ b/Tests/Unit/ViewHelpers/SvgViewHelperTest.php
@@ -1,5 +1,6 @@
getMock(SvgViewHelper::class, ['registerArgument']);
- $instance->expects($this->at(0))->method('registerArgument')->with(
+ $instance->expects(self::at(0))->method('registerArgument')->with(
'source',
'string',
- $this->anything(),
+ self::anything(),
true,
false
);
- $instance->expects($this->at(1))->method('registerArgument')->with(
+ $instance->expects(self::at(1))->method('registerArgument')->with(
'class',
'string',
- $this->anything(),
+ self::anything(),
false,
false
);
- $instance->expects($this->at(2))->method('registerArgument')->with(
+ $instance->expects(self::at(2))->method('registerArgument')->with(
'width',
'int',
- $this->anything(),
+ self::anything(),
false,
false
);
- $instance->expects($this->at(3))->method('registerArgument')->with(
+ $instance->expects(self::at(3))->method('registerArgument')->with(
'height',
'int',
- $this->anything(),
+ self::anything(),
false,
false
);
@@ -78,7 +79,7 @@ public function testRenderWithWrongPathToIcon($value, array $arguments, $expecte
$instance->setArguments($arguments);
$instance->setRenderingContext(new RenderingContextFixture());
$result = $instance->render();
- $this->assertEquals($expected, $result);
+ self::assertEquals($expected, $result);
}
/**
diff --git a/composer.json b/composer.json
index 3f9a6ceb..9848e515 100644
--- a/composer.json
+++ b/composer.json
@@ -6,13 +6,14 @@
"keywords": ["TYPO3 CMS", "Frontend Editing"],
"require": {
"php": "^7.2",
- "typo3/cms-core": "^9.4 || ^10.0"
+ "typo3/cms-core": "^9.5 || ^10.4"
},
"require-dev": {
- "nimut/testing-framework": "^4.2",
- "squizlabs/php_codesniffer": "2.*",
+ "nimut/testing-framework": "^5.0",
+ "squizlabs/php_codesniffer": "^3.3",
"phpunit/phpunit": "^6.0",
- "friendsofphp/php-cs-fixer": "^2.15"
+ "friendsofphp/php-cs-fixer": "^2.15",
+ "helmich/typo3-typoscript-lint": "^2.0"
},
"conflict": {
"typo3/cms-feedit": "*"
@@ -40,9 +41,36 @@
}
},
"scripts": {
+ "ci:php:lint": "find *.php Classes/ Configuration/ Tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
+ "ci:php:sniff": "php-cs-fixer fix --config=.php_cs -v --dry-run --using-cache=no --diff",
+ "cs:php:fix": "php-cs-fixer fix --config=.php_cs -v --using-cache=no",
+ "ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript/",
+ "ci:tests:unit": "phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit",
+ "ci:tests:functional": "phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml Tests/Functional",
+ "ci:tests": [
+ "@ci:tests:unit",
+ "@ci:tests:functional"
+ ],
+ "ci:dynamic": [
+ "@ci:tests"
+ ],
+ "ci:static": [
+ "@ci:php:lint",
+ "@ci:php:sniff",
+ "@ci:ts:lint"
+ ],
+ "ci": [
+ "@ci:static"
+ ],
+ "link-extension": [
+ "@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
+ "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/frontend_editing\") || symlink(__DIR__,$extFolder);'"
+ ],
"post-autoload-dump": [
- "mkdir -p .Build/Web/typo3conf/ext/",
- "[ -L .Build/Web/typo3conf/ext/frontend_editing ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/frontend_editing"
+ "@link-extension"
+ ],
+ "docs:generate": [
+ "docker run --rm t3docs/render-documentation show-shell-commands > tempfile.sh; echo 'dockrun_t3rd makehtml' >> tempfile.sh; bash tempfile.sh; rm tempfile.sh"
]
},
"extra": {
@@ -52,7 +80,7 @@
"typo3/cms": {
"extension-key": "frontend_editing",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
- "web-dir": ".Build/Web"
+ "web-dir": ".Build/public"
}
}
}
diff --git a/ext_emconf.php b/ext_emconf.php
index f06eb6b2..770d086c 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -1,4 +1,5 @@
'Frontend Editing',
'description' => 'Enable editors to work with the content in the most intuitive way possible',
diff --git a/ext_localconf.php b/ext_localconf.php
index 667bdecc..7f415041 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -1,4 +1,5 @@
viewhelper by the one from EXT:frontend_editing
diff --git a/ext_tables.php b/ext_tables.php
index 347cb3e6..9787249a 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -1,4 +1,5 @@