fix: показывать вывод программы студента на панели «вывод»

modules/10-basics/10-hello-world/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'Hello, World!';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/10-basics/15-tags/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'King in the North!';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/10-basics/20-comments/SolutionTest.php

@@ -8,7 +8,7 @@ class SolutionTest extends TestCase
 {
     public function test()
     {
-        $this->expectOutputString('');
+        $this->assertOutput('');
         $content = file_get_contents('Solution.php');
         $this->assertStringContainsString('// TODO: добавить функцию приветствия', $content);
     }

modules/10-basics/30-instructions/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'RobertStannisRenly';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/10-basics/40-testing/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '9780262531962';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/10-basics/50-syntax-errors/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'Программа успешно запущена';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/20-basic/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '9';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/25-operator/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '8729';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/27-commutativity/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '2563';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/30-composition/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '660';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/40-priority/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '160';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/43-float/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '5.5511151231258E-17';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/20-arithmetics/45-linting/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '4';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/25-strings/10-quotes/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'The file "user\'s_config.json" was not found.';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/25-strings/15-escape-characters/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "Для разделения строк используйте \"\\n\"\nПример: print_r(\"строка1\\nстрока2\")";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/25-strings/20-string-concatenation/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'https://github.com/hexlet/exercises-php';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/25-strings/30-encoding/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "~\n^\n%\n";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/10-definition/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "https://hexlet.io\nhttps://hexlet.io";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/12-change/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'доставлен';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/13-variables-naming/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "2";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/15-variables-expressions/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "125\n863.75";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/18-variable-concatenation/SolutionTest.php

@@ -14,6 +14,6 @@ public function test()
 Ожидаемая дата доставки — 3 рабочих дня.
 HERE;
 
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/19-naming-style/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "2000";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/30-variables/20-magic-numbers/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "Ящиков на складе:\n102";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/100-unicode/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "13\n7\n";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/110-locales/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = setlocale(LC_CTYPE, 0);
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/120-startwith/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '18';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/25-interpolation/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'Здравствуйте, Анна! Ваш заказ #1337 принят.';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/30-symbols/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'grip';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/70-substrings/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'hexlet.io';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/31-advanced-strings/90-multiline-strings/SolutionTest.php

@@ -14,6 +14,6 @@ public function test()
 Ожидаемая дата доставки: 3-5 рабочих дней.
 Спасибо, что выбрали нас!
 EOT;
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/33-data-types/40-primitive-data-types/SolutionTest.php

@@ -15,6 +15,6 @@ public function test()
 Rating: 4.7
 HERE;
 
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/33-data-types/50-data-types-weak-typing/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '13';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/33-data-types/52-data-types-immutability/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'print';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/33-data-types/55-data-types-casting/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '36 °C';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/35-calling-functions/100-call/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "12";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/35-calling-functions/135-calling-functions-default-params/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "37.8\n2426.76\n607\n";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/35-calling-functions/150-calling-functions-expression/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "First: H\nLast: !";
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/35-calling-functions/180-variadic-parameters/SolutionTest.php

@@ -9,6 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = '-3';
-        $this->expectOutputString($expected);
+        $this->assertOutput($expected);
     }
 }

modules/35-calling-functions/270-deterministic/SolutionTest.php

@@ -8,7 +8,7 @@ class SolutionTest extends TestCase
 {
     public function test()
     {
-        $randomRoll = $this->getActualOutputForAssertion();
+        $randomRoll = $this->solutionOutput;
         $this->assertThat(
             $randomRoll,
             $this->logicalAnd(

modules/40-define-functions/100-define-function/SolutionTest.php

@@ -9,7 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = 'Hello, World!';
-        $this->expectOutputString($expected);
-        sayHello();
+        $this->assertOutputOf(fn () => sayHello(), $expected);
     }
 }

modules/50-loops/10-while/SolutionTest.php

@@ -9,7 +9,6 @@ class SolutionTest extends TestCase
     public function test()
     {
         $expected = "4\n3\n2\n1\nGo!";
-        $this->expectOutputString($expected);
-        printCountdown(4);
+        $this->assertOutputOf(fn () => printCountdown(4), $expected);
     }
 }