From 8fc489091b8fb7ac98a50d27b060376f862b1f01 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Tue, 22 Oct 2013 21:13:57 -0400 Subject: [PATCH] removed InstallHandler. --- apps/advanced/composer.json | 4 +- apps/basic/composer.json | 6 +- docs/guide/apps-advanced.md | 4 +- docs/guide/apps-basic.md | 6 +- .../composer/yii/composer/InstallHandler.php | 97 ---------------------- extensions/jui/yii/jui/AccordionAsset.php | 1 + extensions/jui/yii/jui/Extension.php | 27 ++++++ 7 files changed, 38 insertions(+), 107 deletions(-) delete mode 100644 extensions/composer/yii/composer/InstallHandler.php create mode 100644 extensions/jui/yii/jui/Extension.php diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json index 88522f2..46ef86a 100644 --- a/apps/advanced/composer.json +++ b/apps/advanced/composer.json @@ -20,12 +20,12 @@ }, "scripts": { "post-create-project-cmd": [ - "yii\\composer\\InstallHandler::setPermissions", + "yii\\composer\\Installer::setPermission", "./init" ] }, "extra": { - "yii-install-writable": [ + "writable": [ "backend/runtime", "backend/web/assets", diff --git a/apps/basic/composer.json b/apps/basic/composer.json index e9af8b7..93e8253 100644 --- a/apps/basic/composer.json +++ b/apps/basic/composer.json @@ -20,15 +20,15 @@ }, "scripts": { "post-create-project-cmd": [ - "yii\\composer\\InstallHandler::setPermissions" + "yii\\composer\\Installer::setPermission" ] }, "extra": { - "yii-install-writable": [ + "writable": [ "runtime", "web/assets" ], - "yii-install-executable": [ + "executable": [ "yii" ] } diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md index 9c6532a..9669217 100644 --- a/docs/guide/apps-advanced.md +++ b/docs/guide/apps-advanced.md @@ -144,11 +144,11 @@ directory: }, "scripts": { "post-create-project-cmd": [ - "yii\\composer\\InstallHandler::setPermissions" + "yii\\composer\\Installer::setPermission" ] }, "extra": { - "yii-install-writable": [ + "writable": [ "backend/runtime", "backend/web/assets", diff --git a/docs/guide/apps-basic.md b/docs/guide/apps-basic.md index 0f366af..386c202 100644 --- a/docs/guide/apps-basic.md +++ b/docs/guide/apps-basic.md @@ -134,15 +134,15 @@ directory: }, "scripts": { "post-create-project-cmd": [ - "yii\\composer\\InstallHandler::setPermissions" + "yii\\composer\\Installer::setPermission" ] }, "extra": { - "yii-install-writable": [ + "writable": [ "runtime", "web/assets" ], - "yii-install-executable": [ + "executable": [ "yii" ] } diff --git a/extensions/composer/yii/composer/InstallHandler.php b/extensions/composer/yii/composer/InstallHandler.php deleted file mode 100644 index 289262f..0000000 --- a/extensions/composer/yii/composer/InstallHandler.php +++ /dev/null @@ -1,97 +0,0 @@ - - * @author Tobias Munk - * @since 2.0 - */ -class InstallHandler -{ - const PARAM_WRITABLE = 'yii-install-writable'; - const PARAM_EXECUTABLE = 'yii-install-executable'; - const PARAM_CONFIG = 'yii-install-config'; - const PARAM_COMMANDS = 'yii-install-commands'; - - /** - * Sets the correct permissions of files and directories. - * @param CommandEvent $event - */ - public static function setPermissions($event) - { - $options = array_merge([ - self::PARAM_WRITABLE => [], - self::PARAM_EXECUTABLE => [], - ], $event->getComposer()->getPackage()->getExtra()); - - foreach ((array)$options[self::PARAM_WRITABLE] as $path) { - echo "Setting writable: $path ..."; - if (is_dir($path)) { - chmod($path, 0777); - echo "done\n"; - } else { - echo "The directory was not found: " . getcwd() . DIRECTORY_SEPARATOR . $path; - return; - } - } - - foreach ((array)$options[self::PARAM_EXECUTABLE] as $path) { - echo "Setting executable: $path ..."; - if (is_file($path)) { - chmod($path, 0755); - echo "done\n"; - } else { - echo "\n\tThe file was not found: " . getcwd() . DIRECTORY_SEPARATOR . $path . "\n"; - return; - } - } - } - - /** - * Executes a yii command. - * @param CommandEvent $event - */ - public static function run($event) - { - $options = array_merge([ - self::PARAM_COMMANDS => [], - ], $event->getComposer()->getPackage()->getExtra()); - - if (!isset($options[self::PARAM_CONFIG])) { - throw new Exception('Please specify the "' . self::PARAM_CONFIG . '" parameter in composer.json.'); - } - $configFile = getcwd() . '/' . $options[self::PARAM_CONFIG]; - if (!is_file($configFile)) { - throw new Exception("Config file does not exist: $configFile"); - } - - require_once(__DIR__ . '/../../../yii2/yii/Yii.php'); - $application = new Application(require($configFile)); - $request = $application->getRequest(); - - foreach ((array)$options[self::PARAM_COMMANDS] as $command) { - $params = str_getcsv($command, ' '); // see http://stackoverflow.com/a/6609509/291573 - $request->setParams($params); - list($route, $params) = $request->resolve(); - echo "Running command: yii {$command}\n"; - $application->runAction($route, $params); - } - } -} diff --git a/extensions/jui/yii/jui/AccordionAsset.php b/extensions/jui/yii/jui/AccordionAsset.php index a032429..05c1e20 100644 --- a/extensions/jui/yii/jui/AccordionAsset.php +++ b/extensions/jui/yii/jui/AccordionAsset.php @@ -6,6 +6,7 @@ */ namespace yii\jui; + use yii\web\AssetBundle; /** diff --git a/extensions/jui/yii/jui/Extension.php b/extensions/jui/yii/jui/Extension.php new file mode 100644 index 0000000..4b680ce --- /dev/null +++ b/extensions/jui/yii/jui/Extension.php @@ -0,0 +1,27 @@ + + * @since 2.0 + */ +class Extension extends \yii\base\Extension +{ + /** + * @inheritdoc + */ + public static function init() + { + Yii::setAlias('@yii/jui', __DIR__); + } +}