Skip to content
This repository was archived by the owner on Dec 9, 2023. It is now read-only.

Commit ddadb0a

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash
2 parents 57514b7 + 32359e9 commit ddadb0a

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

Command/ServerStartCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
159159

160160
return 1;
161161
}
162+
163+
return null;
162164
}
163165
}

Command/ServerStatusCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9898
return 1;
9999
}
100100
}
101+
102+
return null;
101103
}
102104
}

Command/ServerStopCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7272

7373
return 1;
7474
}
75+
76+
return null;
7577
}
7678
}

0 commit comments

Comments
 (0)