diff --git a/composer.json b/composer.json index a344265..1c52037 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require": { "ronilaukkarinen/dudestack": "dev-master" }, - "config": { + "config": { "preferred-install": "dist", "generate-salts": true }, @@ -28,8 +28,8 @@ "psr-4": {"Roots\\Bedrock\\": "scripts/Roots/Bedrock"} }, "scripts": { - "post-root-package-install": ["Bedrock\\Installer::addSalts"] - }, + "post-root-package-install": ["Roots\\Bedrock\\Installer::addSalts"] + }, "repositories": [ { "type": "composer", diff --git a/composer.lock b/composer.lock index 4138079..5dbc851 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "617d10bfa791fe7bab100246c9494e18", + "hash": "6d87829e63791e0a67b22c4a3076c0e5", "packages": [ { "name": "composer/installers", diff --git a/scripts/Bedrock/Installer.php b/scripts/Roots/Bedrock/Installer.php similarity index 86% rename from scripts/Bedrock/Installer.php rename to scripts/Roots/Bedrock/Installer.php index 0737397..6373908 100644 --- a/scripts/Bedrock/Installer.php +++ b/scripts/Roots/Bedrock/Installer.php @@ -1,11 +1,11 @@ getComposer(); $io = $event->getIO(); @@ -32,7 +32,7 @@ public static function addSalts(Event $event) { } $salts = array_map(function ($key) { - return sprintf("%s='%s'", $key, Installer::generate_salt()); + return sprintf("%s='%s'", $key, Installer::generateSalt()); }, self::$KEYS); $env_file = "{$root}/.env"; @@ -49,7 +49,7 @@ public static function addSalts(Event $event) { * Slightly modified/simpler version of wp_generate_password * https://github.com/WordPress/WordPress/blob/cd8cedc40d768e9e1d5a5f5a08f1bd677c804cb9/wp-includes/pluggable.php#L1575 */ - public static function generate_salt($length = 64) { + public static function generateSalt($length = 64) { $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; $chars .= '!@#$%^&*()'; $chars .= '-_ []{}<>~`+=,.;:/?|'; @@ -61,4 +61,4 @@ public static function generate_salt($length = 64) { return $salt; } -} +} \ No newline at end of file