Merge remote-tracking branch 'origin/master' into typo3-11

# Conflicts: # Classes/EventListener/CdnEventListener.php # Classes/Middleware/ContentReplaceMiddleware.php # ext_emconf.php
Leuchtfeuer · Nov 2, 2023 · e5737c6 · e5737c6
2 parents 3d6aee6 + 0e7d068
commit e5737c6
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 28 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,2 +1 @@
 custom: ["https://www.Leuchtfeuer.com"]
-github: flossels
diff --git a/.php_cs b/.php_cs
@@ -9,7 +9,7 @@ $headerComment = <<<COMMENT
 This file is part of the "AWS Tools" extension for TYPO3 CMS.
 For the full copyright and license information, please read the
 LICENSE.txt file that was distributed with this source code.
-Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+<dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
 COMMENT;
 
 

diff --git a/Classes/Command/InvalidationCommand.php b/Classes/Command/InvalidationCommand.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Command;

diff --git a/Classes/Constants.php b/Classes/Constants.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools;

diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Controller;

diff --git a/Classes/Controller/InvalidationController.php b/Classes/Controller/InvalidationController.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Controller;

diff --git a/Classes/Domain/Repository/CloudFrontRepository.php b/Classes/Domain/Repository/CloudFrontRepository.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Domain\Repository;

diff --git a/Classes/Domain/Transfer/ExtensionConfiguration.php b/Classes/Domain/Transfer/ExtensionConfiguration.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Domain\Transfer;

diff --git a/Classes/EventListener/CdnEventListener.php b/Classes/EventListener/CdnEventListener.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\EventListener;
@@ -51,8 +51,8 @@ public function __construct()
                 }
             }
 
-            $config = $GLOBALS['TSFE']->config['config']['tx_awstools.'] ?? [];
-            $this->responsible = filter_var($language['awstools_cdn_enabled'] ?? false, FILTER_VALIDATE_BOOLEAN) === true && !empty($language['awstools_cdn_host']) && !empty($config['enabled']);
+            $replacer = $GLOBALS['TSFE']->config['config']['tx_awstools.']['replacer.'] ?? [];
+            $this->responsible = filter_var($language['awstools_cdn_enabled'], FILTER_VALIDATE_BOOLEAN) === true && !empty($language['awstools_cdn_host'] && $replacer['eventListener'] === '1');
 
             if ($this->responsible) {
                 $this->host = $language['awstools_cdn_host'];

diff --git a/Classes/EventListener/EditIconsEventListener.php b/Classes/EventListener/EditIconsEventListener.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\EventListener;

diff --git a/Classes/EventListener/FileInvalidationEventListener.php b/Classes/EventListener/FileInvalidationEventListener.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\EventListener;

diff --git a/Classes/Factory/CloudFrontFactory.php b/Classes/Factory/CloudFrontFactory.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Factory;

diff --git a/Classes/Middleware/ContentReplaceMiddleware.php b/Classes/Middleware/ContentReplaceMiddleware.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\Middleware;
@@ -23,11 +23,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $response = $handler->handle($request);
         $config = $GLOBALS['TSFE']->config['config']['tx_awstools.'] ?? [];
 
-        if (filter_var($language['awstools_cdn_enabled'] ?? false, FILTER_VALIDATE_BOOLEAN) === false
-            || empty($language['awstools_cdn_host'])
-            || empty($config['enabled'])
-            || $config['replacer.']['middleware'] !== '1'
-        ) {
+        if (filter_var($language['awstools_cdn_enabled'], FILTER_VALIDATE_BOOLEAN) === false || empty($language['awstools_cdn_host']) || $config['replacer.']['middleware'] !== '1') {
             return $response;
         }
 

diff --git a/Classes/TCA/FilePermissions.php b/Classes/TCA/FilePermissions.php
@@ -4,7 +4,7 @@
  * This file is part of the "AWS Tools" extension for TYPO3 CMS.
  * For the full copyright and license information, please read the
  * LICENSE.txt file that was distributed with this source code.
- * Florian Wessels <f.wessels@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
+ * <dev@Leuchtfeuer.com>, Leuchtfeuer Digital Marketing
  */
 
 namespace Leuchtfeuer\AwsTools\TCA;

diff --git a/Documentation/About/Changelog/10-0-0.rst b/Documentation/About/Changelog/10-0-0.rst
@@ -0,0 +1,23 @@
+.. include:: ../../Includes.txt
+
+==========================
+Version 10.0.0 - 2023/06/30
+==========================
+
+* Add possibility to deactivate url replacement through eventlistener or middleware
+* Changes the major version number of the extension equivalent to the supported TYPO3 version.
+
+Download
+========
+
+Download this version from the `TYPO3 extension repository <https://extensions.typo3.org/extension/aws_tools/>`__ or from
+`GitHub <https://github.com/Leuchtfeuer/typo3-aws-tools/releases/tag/v10.0.0>`__.
+
+All Changes
+===========
+
+This is a list of all changes in this release::
+
+    2023-06-30 [TASK] change author (Commit 9175f48 by Marcus Balasch)
+    2023-06-21 [TASK] Add possibility to deactivate url replacement through eventlistener or middleware (#7) (Commit cc63e72 by Fabian Martin)
+    2022-03-28 [TASK] Inlucde latest vendor package changes (Commit 43e4fa3 by Max Rösch)
diff --git a/Documentation/About/Changelog/Index.rst b/Documentation/About/Changelog/Index.rst
@@ -15,6 +15,7 @@ List of Versions
 .. toctree::
    :titlesonly:
 
+   10-0-0
    1-0-2
    1-0-1
    1-0-0

diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -19,7 +19,7 @@ AWS Tools for TYPO3
    2020
 
 :Authors:
-   Florian Wessels, Leuchtfeuer Digital Marketing
+   Marcus Balasch, Leuchtfeuer Digital Marketing
 
 :Email:
    [email protected]

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -3,7 +3,7 @@ project     = Amazon Web Services (AWS) Toolbox for TYPO3
 release     = 1.0.0
 copyright   = since 2020 by the authors
 
-t3author    = Florian Wessels, Leuchtfeuer Digital Marketing
+t3author    = Leuchtfeuer Digital Marketing
 description = This extension connects your TYPO3 instance to Amazon CloudFront. It rewrites all file paths in the frontend to
               match your CDN domain. You also have the possibility to invalidate Amazon CloudFront entries.
 

diff --git a/composer.json b/composer.json
@@ -10,11 +10,11 @@
     ],
     "type": "typo3-cms-extension",
     "license": "GPL-2.0-or-later",
-    "homepage": "https://www.Leuchtfeuer.com",
+    "homepage": "https://www.leuchtfeuer.com",
     "authors": [
         {
-            "name": "Florian Wessels",
-            "email": "f.wessels@Leuchtfeuer.com",
+            "name": "Dev",
+            "email": "dev@Leuchtfeuer.com",
             "role": "Developer",
             "homepage": "https://www.Leuchtfeuer.com"
         }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -3,7 +3,7 @@
 $EM_CONF['aws_tools'] = [
     'title' => 'Amazon Web Services (AWS) Toolbox',
     'description' => 'This extension connects your TYPO3 instance to Amazon CloudFront. It rewrites all file paths in the frontend to match your CDN domain. You also have the possibility to invalidate Amazon CloudFront entries.',
-    'version' => '1.0.5',
+    'version' => '10.0.0',
     'category' => 'misc',
     'constraints' => [
         'depends' => [
@@ -15,7 +15,7 @@
     'state' => 'stable',
     'uploadfolder' => false,
     'clearCacheOnLoad' => false,
-    'author' => 'Florian Wessels',
+    'author' => 'Dev',
     'author_email' => '[email protected]',
     'author_company' => 'Leuchtfeuer Digital Marketing',
     'autoload' => [
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		custom: ["https://www.Leuchtfeuer.com"]
		github: flossels
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ List of Versions @@
     .. toctree::
        :titlesonly:
+-0-0
 -0-2
 -0-1
 -0-0
@@ Expand Down @@