Merge branch '8.5' into 9.5

sebastianbergmann · Jan 23, 2022 · e354bc6 · e354bc6
2 parents 53aa87a + 6411097
commit e354bc6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/tests/phar/phpunit.xml b/tests/phar/phpunit.xml
@@ -6,7 +6,8 @@
          failOnWarning="true">
     <testsuites>
         <testsuite name="default">
-            <directory>tests</directory>
+            <directory>tests/standard</directory>
+            <directory suffix="phpt">tests/phpt</directory>
         </testsuite>
     </testsuites>
 

diff --git a/tests/phar/tests/phpt/greeter.phpt b/tests/phar/tests/phpt/greeter.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Greeter
+--FILE--
+<?php declare(strict_types=1);
+require_once __DIR__ . '/../../src/Greeter.php';
+
+use PHPUnit\TestFixture\Phar\Greeter;
+
+print (new Greeter)->greet();
+--EXPECT--
+Hello world!
diff --git a/tests/phar/tests/GreeterTest.php → tests/phar/tests/standard/GreeterTest.php b/tests/phar/tests/GreeterTest.php → tests/phar/tests/standard/GreeterTest.php
diff --git a/tests/phar/tests/Issue4399Test.php → tests/phar/tests/standard/Issue4399Test.php b/tests/phar/tests/Issue4399Test.php → tests/phar/tests/standard/Issue4399Test.php