Fix version check in local:new when cloning the book

tucksaun · tucksaun · commit c9b85eed3d19 · 2022-08-03T15:06:25.000-04:00
diff --git a/commands/local_new.go b/commands/local_new.go
@@ -108,26 +108,26 @@ var localNewCmd = &console.Command{
 			}
 		}
 
+		symfonyVersion := c.String("version")
+
 		if c.Bool("book") {
+			if symfonyVersion == "" {
+				return console.Exit("The --version flag is required for the Symfony book", 1)
+			}
+
 			book := &book.Book{
 				Dir:         dir,
 				Debug:       c.Bool("debug"),
 				Force:       false,
 				AutoConfirm: true,
 			}
-			if err := book.Clone(c.String("version")); err != nil {
-				return err
-			}
-			return nil
+
+			return book.Clone(symfonyVersion)
 		}
 
-		symfonyVersion := c.String("version")
 		if symfonyVersion != "" && c.Bool("demo") {
 			return console.Exit("The --version flag is not supported for the Symfony Demo", 1)
 		}
-		if symfonyVersion == "" && c.Bool("book") {
-			return console.Exit("The --version flag is required for the Symfony book", 1)
-		}
 		if c.Bool("webapp") && c.Bool("no-git") {
 			return console.Exit("The --webapp flag cannot be used with --no-git", 1)
 		}

Original file line number	Diff line number	Diff line change
`@@ -108,26 +108,26 @@ var localNewCmd = &console.Command{`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ symfonyVersion := c.String("version")`
	`112`	`+`
`111`	`113`	`if c.Bool("book") {`
	`114`	`+ if symfonyVersion == "" {`
	`115`	`+ return console.Exit("The --version flag is required for the Symfony book", 1)`
	`116`	`+ }`
	`117`	`+`
`112`	`118`	`book := &book.Book{`
`113`	`119`	`Dir: dir,`
`114`	`120`	`Debug: c.Bool("debug"),`
`115`	`121`	`Force: false,`
`116`	`122`	`AutoConfirm: true,`
`117`	`123`	`}`
`118`		`- if err := book.Clone(c.String("version")); err != nil {`
`119`		`- return err`
`120`		`- }`
`121`		`- return nil`
	`124`	`+`
	`125`	`+ return book.Clone(symfonyVersion)`
`122`	`126`	`}`
`123`	`127`
`124`		`- symfonyVersion := c.String("version")`
`125`	`128`	`if symfonyVersion != "" && c.Bool("demo") {`
`126`	`129`	`return console.Exit("The --version flag is not supported for the Symfony Demo", 1)`
`127`	`130`	`}`
`128`		`- if symfonyVersion == "" && c.Bool("book") {`
`129`		`- return console.Exit("The --version flag is required for the Symfony book", 1)`
`130`		`- }`
`131`	`131`	`if c.Bool("webapp") && c.Bool("no-git") {`
`132`	`132`	`return console.Exit("The --webapp flag cannot be used with --no-git", 1)`
`133`	`133`	`}`