Fix Craft implementation and instructions

cmd/ddev/cmd/composer-create.go

@@ -273,6 +273,9 @@ ddev composer create --preserve-flags --no-interaction psr/log
 				output.UserErr.Println(stderr)
 			}
 
+			// Reload composer.json if it has changed in the meantime.
+			composerManifest, _ := composer.NewManifest(path.Join(composerRoot, "composer.json"))
+
 			if !preserveFlags && composerManifest != nil && composerManifest.HasPostCreateProjectCmdScript() {
 				// Try to run post-create-project-cmd.
 				composerCmd = []string{

docs/content/users/quickstart.md

@@ -29,8 +29,7 @@ While the generic `php` project type is [ready to go](./project.md) with any CMS
         ddev start
         ddev composer create -y craftcms/craft
 
-        # Run the Craft installer:
-        ddev craft install
+        # Open site in the browser:
         ddev launch
         ```
 

pkg/ddevapp/craftcms.go

@@ -2,13 +2,14 @@ package ddevapp
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/ddev/ddev/pkg/archive"
 	"github.com/ddev/ddev/pkg/fileutil"
 	"github.com/ddev/ddev/pkg/nodeps"
 	"github.com/ddev/ddev/pkg/util"
 	"github.com/pkg/errors"
-	"os"
-	"path/filepath"
 )
 
 // isCraftCmsApp returns true if the app is of type craftcms
@@ -138,19 +139,6 @@ func craftCmsPostStartAction(app *DdevApp) error {
 		return err
 	}
 
-	// If composer.json.default exists, rename it to composer.json
-	composerDefaultFilePath := filepath.Join(app.AppRoot, app.ComposerRoot, "composer.json.default")
-	if fileutil.FileExists(composerDefaultFilePath) {
-		composerFilePath := filepath.Join(app.AppRoot, app.ComposerRoot, "composer.json")
-		util.Warning("Renaming composer.json.default to composer.json")
-		err = os.Rename(composerDefaultFilePath, composerFilePath)
-		if err != nil {
-			util.Error("Error renaming composer.json.default to composer.json")
-
-			return err
-		}
-	}
-
 	return nil
 }