From f68ab008118383cf70b02d942c06d0a27f4e15d3 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 30 Nov 2021 08:56:41 +0100 Subject: [PATCH 1/2] Let repair step query exceptions bubble up And hide the type error caused by a constructor call with missing arguments. `new $repairStep();` only works for the rare case that no arguments are required. Anything else will throw. Then we previously hid the trace of the more important query exception. Signed-off-by: Christoph Wurst --- lib/private/Repair.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 688b053fa12..ea118aa1a4c 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -80,6 +80,7 @@ use OCP\Migration\IRepairStep; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; +use Throwable; class Repair implements IOutput { @@ -140,7 +141,13 @@ class Repair implements IOutput { $s = \OC::$server->query($repairStep); } catch (QueryException $e) { if (class_exists($repairStep)) { - $s = new $repairStep(); + try { + // Last resort: hope there are no constructor arguments + $s = new $repairStep(); + } catch (Throwable $inner) { + // Well, it was worth a try + throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e); + } } else { throw new \Exception("Repair step '$repairStep' is unknown"); } From f6b5b1f51945ef083b893ac7a81428603381c1b7 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 30 Nov 2021 10:57:49 +0100 Subject: [PATCH 2/2] Include previous execption for repair steps that don't exist Signed-off-by: Christoph Wurst --- lib/private/Repair.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Repair.php b/lib/private/Repair.php index ea118aa1a4c..408d0f1b7aa 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -149,7 +149,7 @@ class Repair implements IOutput { throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e); } } else { - throw new \Exception("Repair step '$repairStep' is unknown"); + throw new \Exception("Repair step '$repairStep' is unknown", 0, $e); } }