Skip to content

Commit 3e8a152

Browse files
author
Kyra Farrow
committed
Merge branch '4.3' into 4.4
* 4.3: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents 0834f54 + 5264544 commit 3e8a152

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Response/CurlResponse.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ public function __construct(CurlClientState $multi, $ch, array $options = null,
100100

101101
return 1; // Abort the request
102102
}
103+
104+
return null;
103105
});
104106
}
105107

0 commit comments

Comments
 (0)