Skip to content
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.

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

Fix parsing docker-composer files with no "version" #878

Merged
merged 1 commit into from
Feb 22, 2022

Conversation

CountZero1981
Copy link
Contributor

@CountZero1981 CountZero1981 commented Feb 22, 2022

Fix #877

@nicolas-grekas nicolas-grekas changed the base branch from 2.x to 1.x February 22, 2022 18:30
@nicolas-grekas nicolas-grekas changed the title fixes #877 composer update is giving an error Fix parsing docker-composer files with no "version" Feb 22, 2022
@@ -259,7 +259,7 @@ private function configureDockerCompose(Recipe $recipe, array $config, bool $upd
}

// Keep end in memory (check break line on previous line)
$endAt[$node] = '' !== trim($lines[$i - 1]) ? $i : $i - 1;
$endAt[$node] = !$i || '' !== trim($lines[$i - 1]) ? $i : $i - 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I change your fix a bit because the previous code was putting a -1 into $endAt[$node].
Can you please confirm this works for you?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it works

@nicolas-grekas
Copy link
Member

Thank you @CountZero1981.

@nicolas-grekas nicolas-grekas merged commit b66b0dd into symfony:1.x Feb 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

composer update is giving an error
2 participants