Skip to content
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

Jump to bottom

[BUGFIX] Install extension dummy by default #316

Merged
merged 2 commits into from
Oct 15, 2016
Merged

[BUGFIX] Install extension dummy by default #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ba1d9
[TASK] Move old binary installer in private method
helhum Oct 14, 2016
9f39aec
[BUGFIX] Install extension dummy by default
helhum Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/Resources/Private/ExtensionArtifacts/ export-ignore
/Resources/Private/ExtensionArtifacts/src/ export-ignore
/Resources/Private/ExtensionArtifacts/src/ext_localconf.php export-ignore
/Resources/Private/CommandReference/ export-ignore
/Tests/ export-ignore
/.gitattributes export-ignore
Expand Down
78 changes: 66 additions & 12 deletions Classes/Composer/InstallerScripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
*/

use Composer\Script\Event as ScriptEvent;
use TYPO3\CMS\Composer\Plugin\Config;
use Helhum\Typo3ConsolePlugin\Config as PluginConfig;
use TYPO3\CMS\Composer\Plugin\Config as Typo3Config;
use TYPO3\CMS\Composer\Plugin\Util\Filesystem;

/**
Expand All @@ -39,29 +40,79 @@ class InstallerScripts
public static function setupConsole(ScriptEvent $event, $calledFromPlugin = false)
{
if (!$calledFromPlugin) {
// @deprecated
// @deprecated will be removed with 4.0
$event->getIO()->writeError('<warning>Usage of Helhum\Typo3Console\Composer\InstallerScripts::setupConsole is deprecated. Please remove this section from your root composer.json</warning>');
return;
}
if ($event->getComposer()->getPackage()->getName() === 'helhum/typo3-console') {
return;
}
$pluginConfig = \Helhum\Typo3ConsolePlugin\Config::load($event->getIO(), $event->getComposer()->getConfig());
self::installExtension($event);
self::installBinary($event);
}

/**
* @param ScriptEvent $event
* @deprecated will be removed with 5.0
*/
private static function installExtension(ScriptEvent $event) {
$io = $event->getIO();
$composer = $event->getComposer();

$composerConfig = $composer->getConfig();
$typo3Config = Typo3Config::load($composer);
$pluginConfig = PluginConfig::load($io, $composerConfig);

$webDir = $typo3Config->get('web-dir');
$filesystem = new Filesystem();
$extensionDir = "$webDir/typo3conf/ext/typo3_console";

if ($pluginConfig->get('install-extension-dummy')) {
// @deprecated. Use composer binary installer instead
$io->writeError('<warning>Installation of TYPO3 extension has been deprecated</warning>');
$io->writeError('<warning>To get rid of this message, set "install-extension-dummy" option to false</warning>');
$io->writeError('<warning>in "extra -> helhum/typo3-console" section of root composer.json</warning>');

$extResourcesDir = __DIR__ . '/../../Resources/Private/ExtensionArtifacts';
$resources = [
'ext_icon.png',
'ext_emconf.php',
];
foreach ($resources as $resource) {
$target = "$extensionDir/$resource";
$filesystem->ensureDirectoryExists(basename($target));
$filesystem->copy("$extResourcesDir/$resource", $target);
}
$io->writeError('<info>TYPO3 Console: Installed TYPO3 extension into TYPO3 extension directory</info>');
} else {
if (file_exists($extensionDir) || is_dir($extensionDir)) {
$filesystem->removeDirectory($extensionDir);
$io->writeError('<info>TYPO3 Console: Removed TYPO3 extension from TYPO3 extension directory</info>');
}
}
}

/**
* @param ScriptEvent $event
* @deprecated will be removed with 4.0
*/
private static function installBinary(ScriptEvent $event)
{
$pluginConfig = PluginConfig::load($event->getIO(), $event->getComposer()->getConfig());
if (!$pluginConfig->get('install-binary')) {
return;
}

$config = self::getConfig($event);
$installDir = self::getInstallDir($config);
$webDir = self::getWebDir($config);
$config = Typo3Config::load($event->getComposer());
$installDir = $config->getBaseDir();
$webDir = $config->get('web-dir');
$filesystem = new Filesystem();
$binDir = trim(substr($event->getComposer()->getConfig()->get('bin-dir'), strlen($config->getBaseDir())), '/');

// @deprecated. Use composer binary installer instead
$event->getIO()->writeError('<warning>Usage of "./typo3cms" binary has been deprecated.</warning>');
$event->getIO()->writeError('<warning>Please use ' . $binDir . '/typo3cms instead.</warning>');
$event->getIO()->writeError('<warning>Usage of "./typo3cms" binary has been deprecated</warning>');
$event->getIO()->writeError('<warning>Please use ' . $binDir . '/typo3cms instead</warning>');
$event->getIO()->writeError('<warning>To get rid of this message, set "install-binary" option to false</warning>');
$event->getIO()->writeError('<warning>in "extra -> helhum/typo3-console" section of root composer.json.</warning>');
$event->getIO()->writeError('<warning>in "extra -> helhum/typo3-console" section of root composer.json</warning>');
$pathToScriptsDirectory = __DIR__ . '/../../Scripts/';
if (self::isWindowsOs()) {
$scriptName = 'typo3cms.bat';
Expand Down Expand Up @@ -176,6 +227,7 @@ protected static function isWindowsOs()
/**
* @param Config $config
* @return string
* @deprecated will be removed with 4.0
*/
protected static function getInstallDir(Config $config)
{
Expand All @@ -185,6 +237,7 @@ protected static function getInstallDir(Config $config)
/**
* @param Config $config
* @return string
* @deprecated will be removed with 4.0
*/
protected static function getWebDir(Config $config)
{
Expand All @@ -194,21 +247,22 @@ protected static function getWebDir(Config $config)
/**
* @param ScriptEvent $event
* @return Config
* @deprecated will be removed with 4.0
*/
protected static function getConfig(ScriptEvent $event)
{
return Config::load($event->getComposer());
}

/**
* @deprecated This never was public API, just use EM
* @deprecated will be removed with 4.0
*/
public static function postInstallExtension()
{
}

/**
* @deprecated This never was public API, just use your own flash message queue
* @deprecated will be removed with 4.0
*/
public static function addFlashMessage()
{
Expand Down
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"require": {
"ext-Phar": "*",
"php": ">=5.5.0",
"helhum/typo3-console-plugin": "^1.3.0",
"helhum/typo3-console-plugin": "^1.5.0",

"typo3/cms-backend": "^7.6 || ^8.0",
"typo3/cms-core": "^7.6 || ^8.0",
Expand Down Expand Up @@ -90,7 +90,8 @@
],
"extension-release": [
"@extension-build",
"rm -rf Resources/Private/ExtensionArtifacts/",
"rm Resources/Private/ExtensionArtifacts/ext_*",
"rm -rf Tests/",
"rm -rf Resources/Private/CommandReference/"
],
"extension-clean": [
Expand Down