From e8ac348f4771ebaf53351aa29fb49113d7ddf614 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 28 Feb 2017 20:18:31 +0100 Subject: [PATCH] Make intergration tests work again The regex was to greedy Signed-off-by: Roeland Jago Douma --- build/integration/features/bootstrap/TagsContext.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/integration/features/bootstrap/TagsContext.php b/build/integration/features/bootstrap/TagsContext.php index 3a48cce8aea..24ee8863e29 100644 --- a/build/integration/features/bootstrap/TagsContext.php +++ b/build/integration/features/bootstrap/TagsContext.php @@ -511,7 +511,7 @@ class TagsContext implements \Behat\Behat\Context\Context { ) )); $response = file_get_contents($url, false, $context); - preg_match_all('/\(.*)\<\/oc:fileid\>/', $response, $matches); + preg_match_all('/\(.*?)\<\/oc:fileid\>/', $response, $matches); return (int)$matches[1][0]; } @@ -576,7 +576,7 @@ class TagsContext implements \Behat\Behat\Context\Context { ] ); $response = $this->client->send($request)->getBody()->getContents(); - preg_match_all('/\(.*)\<\/oc:display-name\>/', $response, $realTags); + preg_match_all('/\(.*?)\<\/oc:display-name\>/', $response, $realTags); foreach($expectedTags as $key => $row) { foreach($realTags as $tag) { @@ -631,7 +631,7 @@ class TagsContext implements \Behat\Behat\Context\Context { } catch (\GuzzleHttp\Exception\ClientException $e) { $this->response = $e->getResponse(); } - preg_match_all('/\(.*)\<\/oc:display-name\>/', $this->response, $realTags); + preg_match_all('/\(.*?)\<\/oc:display-name\>/', $this->response, $realTags); $realTags = array_filter($realTags); $expectedTags = array_filter($expectedTags);