Skip to content

Feature: Add target directory option: #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaumeprat-twt wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature: Add target directory option: #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d6cb6
Feature: Add target directory option:
jaumeprat-twt Jun 4, 2014
8138f14
Update TYPO3CMSCoreInstaller.php
jaumeprat-twt Jun 4, 2014
4fb5cb5
Update TYPO3CMSExtensionInstaller.php
jaumeprat-twt Jun 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/Lw/TYPO3CMSInstallers/TYPO3CMSCoreInstaller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
*/
class TYPO3CMSCoreInstaller extends LibraryInstaller {

const DEFAULT_INSTALL_CORE_PATH = 'typo3_src';

/**
* {@inheritDoc}
*/
public function getPackageBasePath(PackageInterface $package) {
return 'typo3_src';
return $this->getInstallationPath();
}

/**
Expand All @@ -29,5 +31,18 @@ public function getPackageBasePath(PackageInterface $package) {
public function supports($packageType) {
return ('typo3cms-core' === $packageType);
}

/**
* Get the installation path from composer.json "extra" section
* or the default path 'typo3conf/ext/'
*
* @return string
*/
protected function getInstallationPath() {
$extra = $this->composer->getPackage()->getExtra();

return isset($extra['typo3-cms-core-installer-path']) ?
$extra['typo3-cms-core-installer-path'] : self::DEFAULT_INSTALL_CORE_PATH;
}
}
?>
?>
20 changes: 17 additions & 3 deletions src/Lw/TYPO3CMSInstallers/TYPO3CMSExtensionInstaller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
use Composer\Util\Filesystem;
use Dkd\Downloader\T3xDownloader;


/**
* Installer for TYPO3 CMS
*
* @author Felix Oertel <fo@lightwerk.com>
*/
class TYPO3CMSExtensionInstaller extends LibraryInstaller {

const DEFAULT_INSTALL_EXTENSION_PATH = 'typo3conf/ext/';

public function __construct(IOInterface $io, Composer $composer, $type = 'library', Filesystem $filesystem = null) {
parent::__construct($io, $composer, $type, $filesystem);

Expand All @@ -27,7 +28,7 @@ public function __construct(IOInterface $io, Composer $composer, $type = 'librar
*/
public function getPackageBasePath(PackageInterface $package) {
$extensionName = explode('/', $package->getName());
return 'typo3conf/ext/' . array_pop($extensionName);
return $this->getInstallationPath() . array_pop($extensionName);
}

/**
Expand All @@ -36,5 +37,18 @@ public function getPackageBasePath(PackageInterface $package) {
public function supports($packageType) {
return ('typo3cms-extension' === $packageType);
}

/**
* Get the installation path from composer.json "extra" section
* or the default path 'typo3conf/ext/'
*
* @return string
*/
protected function getInstallationPath() {
$extra = $this->composer->getPackage()->getExtra();

return isset($extra['typo3-cms-extension-installer-path']) ?
$extra['typo3-cms-extension-installer-path'] : self::DEFAULT_INSTALL_EXTENSION_PATH;
}
}
?>
?>