Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 0 additions & 17 deletions Classes/Driver/AmazonS3Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,19 +214,6 @@ public function __destruct()
}
}

/**
* loadExternalClasses
* @throws \Exception
*/
public static function loadExternalClasses()
{
// Backwards compatibility: for TYPO3 versions lower than 10.0
$loadSdk = !Environment::isComposerMode() && !function_exists('Aws\\manifest');
if ($loadSdk) {
require ExtensionManagementUtility::extPath(self::EXTENSION_KEY) . '/Resources/Private/PHP/vendor/autoload.php';
}
}

/**
* @return void
*/
Expand Down Expand Up @@ -1201,10 +1188,6 @@ protected function initializeSettings()
$this->configuration = array_merge($this->configuration, self::$settings['storage_' . $this->storageUid]);
}

if (!isset(self::$settings['doNotLoadAmazonLib']) || !self::$settings['doNotLoadAmazonLib']) {
self::loadExternalClasses();
}

$this->initializeBaseUrl();
$this->initializeBaseFolder();

Expand Down
2 changes: 0 additions & 2 deletions Documentation/Administration/ExtensionConfiguration/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ Edit in "Extension Manager" the following extension settings:

- "dnsPrefetch": Use DNS prefetching tag: If enabled, an HTML tag will be included which prefetchs the DNS of the current CDN

- "doNotLoadAmazonLib": Don't load Amazon AWS PHP SDK: If enabled, you have to include the SDK by yourself! (http://aws.amazon.com/de/sdk-for-php/)

- "enablePermissionsCheck": Check S3 permissions for each file and folder. This is disabled by default because it is very slow (TYPO3 has to make an AWS request for each file)
2 changes: 1 addition & 1 deletion Documentation/Introduction/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This is a driver for the file abstraction layer (FAL) to support Amazon AWS S3.

You can create a file storage which allows you to upload/download and link the files to an AWS S3 bucket. It also supports the TYPO3 CMS image rendering.

Requires TYPO3 CMS 10.4 or higher
Requires TYPO3 CMS 11.5 or higher

Issue tracking: `GitHub Issues: AWS S3 FAL Driver <https://github.com/andersundsehr/aus_driver_amazon_s3/issues>`_

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ Example permissions:
Edit in “Extension Manager” the following extension settings:

- **dnsPrefetch** Use DNS prefetching tag: If enabled, an HTML tag will be included which prefetchs the DNS of the current CDN
- **doNotLoadAmazonLib** Don’t load Amazon AWS PHP SDK: If enabled, you have to include the SDK by yourself! (<http://aws.amazon.com/de/sdk-for-php/>)
- **enablePermissionsCheck** Check S3 permissions for each file and folder. This is disabled by default because it is very slow (TYPO3 has to make an AWS request for each file)

### Cache Configuration
Expand Down
3 changes: 0 additions & 3 deletions Resources/Private/Language/de.locallang_flexform.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
<trans-unit id="ausDriverAmazonS3.settings.dnsPrefetch">
<target>Lade DNS Auflösung durch HTML-Tag "dns-prefetch"</target>
</trans-unit>
<trans-unit id="ausDriverAmazonS3.settings.doNotLoadAmazonLib">
<target>Amazon AWS PHP SDK nicht laden (Stellen Sie sicher, dass diese anderswo geladen wird. Im "composer mode" ist diese Einstellung wirkungslos)</target>
</trans-unit>
<trans-unit id="ausDriverAmazonS3.settings.enablePermissionsCheck">
<target>Prüfe Dateiberechtigungen (sehr langsam)</target>
</trans-unit>
Expand Down
3 changes: 0 additions & 3 deletions Resources/Private/Language/locallang_flexform.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
<trans-unit id="ausDriverAmazonS3.settings.dnsPrefetch">
<source>Use DNS prefetching HTML tag</source>
</trans-unit>
<trans-unit id="ausDriverAmazonS3.settings.doNotLoadAmazonLib">
<source>Don't load Amazon AWS PHP SDK (please make sure this is loaded elsewhere, obsolete in "composer mode")</source>
</trans-unit>
<trans-unit id="ausDriverAmazonS3.settings.enablePermissionsCheck">
<source>Check S3 permissions for each file and folder (very slow)</source>
</trans-unit>
Expand Down
11 changes: 0 additions & 11 deletions Resources/Private/PHP/composer.json

This file was deleted.

Loading