|
4 | 4 |
|
5 | 5 | namespace Codeception\Constraint; |
6 | 6 |
|
7 | | -use Codeception\Lib\Console\Message; |
8 | 7 | use PHPUnit\Framework\Constraint\Constraint; |
9 | 8 |
|
10 | | -use function codecept_output_dir; |
11 | 9 | use function mb_stripos; |
12 | 10 | use function mb_strlen; |
13 | 11 | use function mb_substr; |
@@ -69,25 +67,21 @@ public function toString(): string |
69 | 67 | protected function failureDescription($pageContent): string |
70 | 68 | { |
71 | 69 | $message = $this->uriMessage('on page'); |
72 | | - $message->append("\n--> "); |
73 | | - $message->append(mb_substr($pageContent, 0, 300, 'utf-8')); |
74 | | - if (mb_strlen($pageContent, 'utf-8') > 300) { |
75 | | - $debugMessage = new Message( |
76 | | - "[Content too long to display. See complete response in '" . codecept_output_dir() . "' directory]" |
77 | | - ); |
78 | | - $message->append("\n")->append($debugMessage); |
| 70 | + $message .= "\n--> "; |
| 71 | + $message .= mb_substr($pageContent, 0, 300, 'utf-8'); |
| 72 | + if (mb_strlen($pageContent, 'utf-8') > 300 && function_exists('codecept_output_dir')) { |
| 73 | + $message .= "\n[Content too long to display. See complete response in '" |
| 74 | + . codecept_output_dir() . "' directory]"; |
79 | 75 | } |
80 | | - $message->append("\n--> "); |
81 | | - return $message->getMessage() . $this->toString(); |
| 76 | + |
| 77 | + return $message . "\n--> " . $this->toString(); |
82 | 78 | } |
83 | 79 |
|
84 | | - protected function uriMessage(string $onPage = ''): Message |
| 80 | + protected function uriMessage(string $onPage = ''): string |
85 | 81 | { |
86 | 82 | if (!$this->uri) { |
87 | | - return new Message(''); |
| 83 | + return ''; |
88 | 84 | } |
89 | | - $message = new Message($this->uri); |
90 | | - $message->prepend(" {$onPage} "); |
91 | | - return $message; |
| 85 | + return " {$onPage} {$this->uri}"; |
92 | 86 | } |
93 | 87 | } |
0 commit comments