fix: enforce phase and solver terminations

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/solver/termination/SolverBridgePhaseTermination.java

@@ -37,8 +37,14 @@ public SolverBridgePhaseTermination(SolverTermination<Solution_> solverTerminati
     }
 
     @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public boolean isPhaseTerminated(AbstractPhaseScope<Solution_> phaseScope) {
-        return solverTermination.isSolverTerminated(phaseScope.getSolverScope());
+        var terminated = solverTermination.isSolverTerminated(phaseScope.getSolverScope());
+        // If the solver is not finished yet, we need to check the phase termination
+        if (!terminated && solverTermination instanceof PhaseTermination phaseTermination) {
+            return phaseTermination.isPhaseTerminated(phaseScope);
+        }
+        return terminated;
     }
 
     @Override

core/src/test/java/ai/timefold/solver/core/impl/solver/termination/TerminationTest.java

@@ -329,6 +329,24 @@ void terminateEarlyLocalSearchInterrupted(TerminationConfig terminationConfig) {
         assertThat(resultingSolution).isNotNull();
     }
 
+    @Test
+    void mixedSolverPhaseTerminations() {
+        var solverConfig = new SolverConfig()
+                .withSolutionClass(TestdataSolution.class)
+                .withEntityClasses(TestdataEntity.class)
+                .withEasyScoreCalculatorClass(TestdataEasyScoreCalculator.class)
+                .withTerminationConfig(new TerminationConfig().withSpentLimit(Duration.ofHours(1)))
+                .withPhases(new LocalSearchPhaseConfig()
+                        .withTerminationConfig(new TerminationConfig().withStepCountLimit(4)));
+        var solution = TestdataSolution.generateSolution(2, 2);
+        var solver = SolverFactory.<TestdataSolution> create(solverConfig)
+                .buildSolver();
+        var bestSolution = solver.solve(solution);
+        // The global spent limit is one hour, but the phase limit is four steps.
+        // The solver process is finished after 4 steps
+        assertThat(bestSolution).isNotNull();
+    }
+
     static class TerminationArgumentSource implements ArgumentsProvider {
 
         @Override