Skip to content

fix: check --only and --exclude before tool setup in extension fix and format #1624

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

Merged
Malte Janz (MalteJanz) merged 1 commit into from
Sep 28, 2026
Merged

fix: check --only and --exclude before tool setup in extension fix and format #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions cmd/extension/extension_fix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,23 @@ var extensionFixCmd = &cobra.Command{
Use: "fix path",
Short: "Apply code-quality fixes to an extension",
Args: cobra.ExactArgs(1),
PreRunE: func(cmd *cobra.Command, args []string) error {
return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
},
RunE: func(cmd *cobra.Command, args []string) error {
allTools := verifier.GetToolsOf[verifier.FixTool]()
only, _ := cmd.Flags().GetString("only")
exclude, _ := cmd.Flags().GetString("exclude")

requestedTools, err := allTools.Only(only)
if err != nil {
return err
}
tools, err := requestedTools.Exclude(exclude)
if err != nil {
return err
}
if len(tools) == 0 {
return errors.New("no fixers selected after applying --exclude")
}

allowNonGit, _ := cmd.Flags().GetBool("allow-non-git")

if !allowNonGit {
Expand All @@ -48,23 +61,11 @@ var extensionFixCmd = &cobra.Command{

logging.FromContext(cmd.Context()).Debugf("Running fixes for Shopware version: %s", toolCfg.MinShopwareVersion)

var gr errgroup.Group

allTools := verifier.GetToolsOf[verifier.FixTool]()
only, _ := cmd.Flags().GetString("only")
exclude, _ := cmd.Flags().GetString("exclude")

requestedTools, err := allTools.Only(only)
if err != nil {
if err := verifier.SetupTools(cmd.Context(), cmd.Root().Version); err != nil {
return err
}
tools, err := requestedTools.Exclude(exclude)
if err != nil {
return err
}
if len(tools) == 0 {
return errors.New("no fixers selected after applying --exclude")
}

var gr errgroup.Group

for _, tool := range tools {
gr.Go(func() error {
Expand Down
37 changes: 19 additions & 18 deletions cmd/extension/extension_format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,23 @@ var extensionFormat = &cobra.Command{
Use: "format path",
Short: "Format an extension's PHP, JavaScript, SCSS, and Administration Twig files",
Args: cobra.ExactArgs(1),
PreRunE: func(cmd *cobra.Command, args []string) error {
return verifier.SetupTools(cmd.Context(), cmd.Root().Version)
},
RunE: func(cmd *cobra.Command, args []string) error {
allTools := verifier.GetToolsOf[verifier.FormatTool]()
only, _ := cmd.Flags().GetString("only")
exclude, _ := cmd.Flags().GetString("exclude")

requestedTools, err := allTools.Only(only)
if err != nil {
return err
}
tools, err := requestedTools.Exclude(exclude)
if err != nil {
return err
}
if len(tools) == 0 {
return errors.New("no formatters selected after applying --exclude")
}

dryRun, _ := cmd.Flags().GetBool("dry-run")

path, err := filepath.Abs(args[0])
Expand All @@ -42,23 +55,11 @@ var extensionFormat = &cobra.Command{

logging.FromContext(cmd.Context()).Debugf("Running fixes for Shopware version: %s", toolCfg.MinShopwareVersion)

var gr errgroup.Group

allTools := verifier.GetToolsOf[verifier.FormatTool]()
only, _ := cmd.Flags().GetString("only")
exclude, _ := cmd.Flags().GetString("exclude")

requestedTools, err := allTools.Only(only)
if err != nil {
if err := verifier.SetupTools(cmd.Context(), cmd.Root().Version); err != nil {
return err
}
tools, err := requestedTools.Exclude(exclude)
if err != nil {
return err
}
if len(tools) == 0 {
return errors.New("no formatters selected after applying --exclude")
}

var gr errgroup.Group

for _, tool := range tools {
gr.Go(func() error {
Expand Down
Loading