Compare commits

..

No commits in common. "cff6ac1849b48111b5a8f3cbdf7d407e06bc231f" and "4c81c9b6943afee4e033ca6c40791adf61baaa46" have entirely different histories.

5 changed files with 8 additions and 23 deletions

View file

@ -1,11 +1,5 @@
# Changelog # Changelog
## 2.0.0 - 2023-05-06
- 💥 Drop support for TYPO3 v10 (3563604)
- ⬆ Add support for TYPO3 v12 (2af99f3)
- ✨🐛 Resolve deprecations introduced with TYPO3 v11 and v12 (89ee94b, 8264969)
## 1.2.0 - 2022-08-10 ## 1.2.0 - 2022-08-10
- [FEATURE] Add support for TYPO3 v11 and PHP 8.0 & 8.1 (25ccc28, 9c43bfc) - [FEATURE] Add support for TYPO3 v11 and PHP 8.0 & 8.1 (25ccc28, 9c43bfc)

View file

@ -4,7 +4,6 @@ namespace MMK2410\PlausibleAnalytics\Hooks;
use TYPO3\CMS\Core\Page\AssetCollector; use TYPO3\CMS\Core\Page\AssetCollector;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Context\Context;
class PageRendererPreProcess class PageRendererPreProcess
{ {
@ -14,30 +13,22 @@ class PageRendererPreProcess
/** @var \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */ /** @var \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */
private $tsfe; private $tsfe;
/** @var Context */
private $context;
public function __construct(AssetCollector $assetCollector = null) public function __construct(AssetCollector $assetCollector = null)
{ {
$this->assetCollector = $assetCollector ?? GeneralUtility::makeInstance(AssetCollector::class); $this->assetCollector = $assetCollector ?? GeneralUtility::makeInstance(AssetCollector::class);
$this->tsfe = $GLOBALS['TSFE'] ?? null; $this->tsfe = $GLOBALS['TSFE'] ?? null;
$this->context = GeneralUtility::makeInstance(Context::class);
} }
public function addLibrary(): void public function addLibrary(): void
{ {
if (!isset($this->tsfe)|| !isset($this->context)) { if (!isset($this->tsfe)) {
return; return;
} }
$domain = $this->getDomain(); $domain = $this->getDomain();
$plausible = $this->getPlausibleURL(); $plausible = $this->getPlausibleURL();
if ( if (isset($domain) && isset($plausible) && !$this->tsfe->isBackendUserLoggedIn()) {
isset($domain) &&
isset($plausible) &&
!$this->context->getPropertyFromAspect('backend.user', 'isLoggedIn')
) {
$this->assetCollector->addJavaScript( $this->assetCollector->addJavaScript(
'plausible_analytics', 'plausible_analytics',
$plausible . '/js/plausible.js', $plausible . '/js/plausible.js',

View file

@ -22,8 +22,8 @@
} }
}, },
"require": { "require": {
"php": "7.4.0 - 8.2.99", "php": "7.2.0 - 8.1.99",
"typo3/cms-core": "^11.5 || ^12.4" "typo3/cms-core": "^10.4 || ^11.5"
}, },
"replace": { "replace": {
"typo3-ter/plausible-analytics": "self.version" "typo3-ter/plausible-analytics": "self.version"

View file

@ -8,11 +8,11 @@ $EM_CONF[$_EXTKEY] = [
'author_email' => 'opensource@mmk2410.org', 'author_email' => 'opensource@mmk2410.org',
'state' => 'stable', 'state' => 'stable',
'clearCacheOnLoad' => true, 'clearCacheOnLoad' => true,
'version' => '2.0.0', 'version' => '1.2.0',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '11.5.0-12.4.99', 'typo3' => '10.4.0-11.5.99',
'php' => '7.4.0-8.2.99' 'php' => '7.2.0-8.1.99'
], ],
], ],
'autoload' => [ 'autoload' => [

View file

@ -1,6 +1,6 @@
<?php <?php
if (!defined('TYPO3')) { if (!defined('TYPO3_MODE')) {
die('Access denied.'); die('Access denied.');
} }