Skip to content

Commit

Permalink
Add support for Symfony 5
Browse files Browse the repository at this point in the history
  • Loading branch information
ccjjmartin committed Jan 26, 2020
1 parent 9d8ca7c commit 892fb38
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Command/Cleanup.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {

if ($confirmation != 'delete') {
print "Clean up aborted.\n";
return;
return 0;
}

$master_branch_name = $master_branch->getBranchName();
Expand Down
4 changes: 2 additions & 2 deletions Command/LocalSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$output->writeln("Afterwards, you should use the update command to get new patches from drupal.org.");
}

return;
return 0;
}

// If the master branch is not current, abort.
Expand All @@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
// If no patches, we're done.
if (empty($patches)) {
$output->writeln("There are no patches to apply.");
return;
return 0;
}

// Output the patches.
Expand Down
6 changes: 3 additions & 3 deletions Command/LocalUpdate.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
// If no patches, we're done.
if (empty($patches)) {
print "No patches to apply.\n";
return;
return 0;
}

$patches_uncommitted = [];
Expand All @@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
// If no uncommitted patches, we're done.
if (empty($patches_uncommitted)) {
print "No patches to apply; existing patches are already applied to this feature branch.\n";
return;
return 0;
}

// If the feature branch's SHA is not the same as the last committed patch
Expand Down Expand Up @@ -134,7 +134,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
// If all the patches were already committed, we're done.
if (empty($patches_committed)) {
print "No new patches to apply.\n";
return;
return 0;
}

// If final patch didn't apply, then output a message: the latest patch
Expand Down
4 changes: 2 additions & 2 deletions Command/Purge.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {

if (empty($issues_to_clean_up)) {
print "No branches to clean up.\n";
return;
return 0;
}

// Sort by issue number.
Expand Down Expand Up @@ -102,7 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$question = new Question("Please enter 'delete' to confirm DELETION of {$count} branches:");
if ($helper->ask($input, $output, $question) != 'delete') {
$output->writeln('Clean up aborted.');
return;
return 0;
}

foreach ($issues_to_clean_up as $issue_number => $info) {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"homepage": "https://github.com/joachim-n/dorgflow",
"license": "GPL-2.0+",
"require": {
"symfony/dependency-injection": ">=3.2 <5",
"symfony/console": ">=3.2 <5"
"symfony/dependency-injection": ">=3.2",
"symfony/console": ">=3.2"
},
"require-dev": {
"phpunit/phpunit": ">=6.0",
Expand Down

0 comments on commit 892fb38

Please sign in to comment.