replace ignore-checks in tests

.gitignore

@@ -16,3 +16,4 @@ bin/*
 ansible/playbook.retry
 test/etc/tasks/system/defaultexcludestestinput/
 test/etc/types/selectors/tmp/
+test/tmp/

test/classes/phing/PhingTest.php

@@ -24,7 +24,6 @@
  * // TODO implement all methods
  *
  * @author Kirill chEbba Chebunin <iam@chebba.org>
- * @version $Revision: $
  * @package phing
  */
 class PhingTest extends \PHPUnit\Framework\TestCase

test/classes/phing/regression/ExcludeZipTest.php

@@ -22,14 +22,13 @@
  * - Excluded files may be included in Zip/Tar tasks
  *
  * @package phing.regression
+ *
+ * @requires extension zip
  */
 class ExcludeZipTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        if (!extension_loaded('zip')) {
-            $this->markTestSkipped("Zip extension is required");
-        }
         $this->configureProject(PHING_TEST_BASE . "/etc/regression/137/build.xml");
     }
 

test/classes/phing/regression/PearPkg2CompatibilityTest.php

@@ -28,7 +28,6 @@
 class PearPkg2CompatibilityTest extends BuildFileTest
 {
     private $savedErrorLevel;
-    protected $backupGlobals = false;
 
     public function setUp(): void
     {
@@ -37,10 +36,6 @@ public function setUp(): void
         $buildFile = PHING_TEST_BASE . "/etc/regression/524/build.xml";
         $this->configureProject($buildFile);
 
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("PEAR tests do not run on HHVM");
-        }
-
         if (!class_exists('PEAR_PackageFileManager', false)) {
             $this->markTestSkipped("This test requires PEAR_PackageFileManager to be installed");
         }

test/classes/phing/system/condition/SocketConditionTest.php

@@ -21,6 +21,8 @@
  * Tests for the <socket> condition
  *
  * @package phing.tasks.system.condition
+ *
+ * @requires extension sockets
  */
 class SocketConditionTest extends \PHPUnit\Framework\TestCase
 {

test/classes/phing/system/io/AbstractWinFileSystemTestCase.php

@@ -31,11 +31,6 @@ abstract class AbstractWinFileSystemTestCase extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-            $this->markTestSkipped(
-                'Testing not on a windows os.'
-            );
-        }
         $this->fs = $this->createFileSystem();
     }
 

test/classes/phing/system/io/WindowsFileSystemTest.php

@@ -22,6 +22,8 @@
  *
  * @author Daniel Holmes
  * @package phing.system.io
+ *
+ * @requires OS WIN32|WINNT
  */
 class WindowsFileSystemTest extends AbstractWinFileSystemTestCase
 {

test/classes/phing/tasks/ext/DbDeployTaskTest.php

@@ -20,15 +20,13 @@
 /**
  * @author Michiel Rook <mrook@php.net>
  * @package phing.tasks.ext
+ *
+ * @requires extension sqlite
  */
 class DbDeployTaskTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        if (!extension_loaded('sqlite')) {
-            $this->markTestSkipped('This test require sqlite extension to be loaded');
-        }
-
         $this->configureProject(PHING_TEST_BASE . "/etc/tasks/ext/dbdeploy/build.xml");
         $this->executeTarget("prepare");
     }

test/classes/phing/tasks/ext/PHPLOCTaskTest.php

@@ -22,15 +22,13 @@
  *
  * @author Michiel Rook <mrook@php.net>
  * @package phing.tasks.ext
+ *
+ * @requires PHP < 7.3
  */
 class PHPLOCTaskTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        if (PHP_VERSION_ID >= 70300) {
-            $this->markTestSkipped('phploc task is not running on PHP 7.3');
-        }
-
         $this->configureProject(PHING_TEST_BASE . "/etc/tasks/ext/phploc/build.xml");
     }
 

test/classes/phing/tasks/ext/PearPackageTest.php

@@ -25,8 +25,6 @@
  */
 class PearPackageTest extends BuildFileTest
 {
-    protected $backupGlobals = false;
-
     private $savedErrorLevel;
 
     public function setUp(): void
@@ -36,10 +34,6 @@ public function setUp(): void
         $buildFile = PHING_TEST_BASE . "/etc/tasks/ext/pearpackage.xml";
         $this->configureProject($buildFile);
 
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("PEAR tests do not run on HHVM");
-        }
-
         if (!class_exists('PEAR_PackageFileManager', false)) {
             $this->markTestSkipped("This test requires PEAR_PackageFileManager to be installed");
         }

test/classes/phing/tasks/ext/PharDataTaskTest.php

@@ -25,16 +25,11 @@
  */
 class PharDataTaskTest extends BuildFileTest
 {
+    /**
+     * @requires extension phar
+     */
     public function setUp(): void
     {
-        if (!extension_loaded('phar')) {
-            $this->markTestSkipped("PharDataTask require either PHP 5.3 or better or the PECL's Phar extension");
-        }
-
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("PHAR tests do not run on HHVM");
-        }
-
         $this->configureProject(
             PHING_TEST_BASE
             . "/etc/tasks/ext/PharDataTaskTest.xml"

test/classes/phing/tasks/ext/PharPackageTaskTest.php

@@ -23,6 +23,7 @@
  * @author François Poirotte <clicky@erebot.net>
  * @package phing.tasks.ext
  * @requires extension phar
+ * @requires extension openssl
  */
 class PharPackageTaskTest extends BuildFileTest
 {
@@ -32,10 +33,6 @@ public function setUp(): void
             $this->markTestSkipped("This test require phar.readonly php.ini setting to be disabled");
         }
 
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("PHAR tests do not run on HHVM");
-        }
-
         $this->configureProject(PHING_TEST_BASE . "/etc/tasks/ext/pharpackage/build.xml");
     }
 

test/classes/phing/tasks/ext/PhpCodeSnifferTaskTest.php

@@ -27,10 +27,6 @@ class PhpCodeSnifferTaskTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("PHP CodeSniffer tests do not (yet) run on HHVM");
-        }
-
         if (!class_exists('PHP_CodeSniffer')) {
             $this->markTestSkipped('PHP CodeSniffer package not available.');
         }

test/classes/phing/tasks/ext/PhpLintTaskTest.php

@@ -52,13 +52,11 @@ public function testSyntaxError()
 
     /**
      * Regression test for ticket http://www.phing.info/trac/ticket/590
+     *
+     * @requires PHP < 7.0
      */
     public function testDeprecated()
     {
-        if (defined('HHVM_VERSION') || PHP_MAJOR_VERSION > 5) {
-            $this->markTestSkipped("Testing for deprecated statements only works on PHP 5.x");
-        }
-
         file_put_contents(
             PHING_TEST_BASE . '/tmp/phplint_file.php',
             '<?php class TestClass {}; $t = & new TestClass();'

test/classes/phing/tasks/ext/VisualizerTaskTest.php

@@ -17,6 +17,9 @@
  * <http://phing.info>.
  */
 
+/**
+ * @requires extension xsl
+ */
 class VisualizerTaskTest extends BuildFileTest
 {
     public function setUp(): void

test/classes/phing/tasks/ext/ZipUnzipTaskTest.php

@@ -22,14 +22,13 @@
  *
  * @author  Michiel Rook <mrook@php.net>
  * @package phing.tasks.ext
+ *
+ * @requires extension zip
  */
 class ZipUnzipTaskTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        if (!extension_loaded('zip')) {
-            $this->markTestSkipped("Zip extension is required");
-        }
         $this->configureProject(
             PHING_TEST_BASE
             . "/etc/tasks/ext/ZipUnzipTaskTest.xml"

test/classes/phing/tasks/ext/property/VariableTest.php

@@ -33,11 +33,11 @@ public function setUp(): void
         );
     }
 
+    /**
+     * @requires PHP > 5.3
+     */
     public function testVariable()
     {
-        if (version_compare(PHP_VERSION, '5.3', '<')) {
-            $this->markTestSkipped('PHP Version less than 5.3');
-        }
         $this->executeTarget(__FUNCTION__);
 
         $this->assertInLogs('1: aazz');

test/classes/phing/tasks/ext/rST/RSTTaskTest.php

@@ -72,38 +72,35 @@ protected function assertFileCreated($file)
         unlink(PHING_TEST_BASE . '/etc/tasks/ext/rst/' . $file);
     }
 
+    /**
+     * @requires function ReflectionMethod::setAccessible
+     */
     public function testGetToolPathFail()
     {
-        if (method_exists('ReflectionMethod', 'setAccessible')) {
-            $rt = new RSTTask();
-            $ref = new ReflectionClass($rt);
-            $method = $ref->getMethod('getToolPath');
-            $method->setAccessible(true);
-
-            $this->expectException(BuildException::class);
-            $this->expectExceptionMessage('"rst2doesnotexist" not found. Install python-docutils.');
-
-            $method->invoke($rt, 'doesnotexist');
-        } else {
-            $this->markTestSkipped('No ReflectionMethod::setAccessible available.');
-        }
+        $rt = new RSTTask();
+        $ref = new ReflectionClass($rt);
+        $method = $ref->getMethod('getToolPath');
+        $method->setAccessible(true);
+
+        $this->expectException(BuildException::class);
+        $this->expectExceptionMessage('"rst2doesnotexist" not found. Install python-docutils.');
+
+        $method->invoke($rt, 'doesnotexist');
     }
 
     /**
      * Get the tool path previously set with setToolpath()
+     *
+     * @requires function ReflectionMethod::setAccessible
      */
     public function testGetToolPathCustom()
     {
-        if (method_exists('ReflectionMethod', 'setAccessible')) {
-            $rt = new RSTTask();
-            $rt->setToolpath('true'); //mostly /bin/true on unix
-            $ref = new ReflectionClass($rt);
-            $method = $ref->getMethod('getToolPath');
-            $method->setAccessible(true);
-            $this->assertContains('/true', $method->invoke($rt, 'foo'));
-        } else {
-            $this->markTestSkipped('No ReflectionMethod::setAccessible available.');
-        }
+        $rt = new RSTTask();
+        $rt->setToolpath('true'); //mostly /bin/true on unix
+        $ref = new ReflectionClass($rt);
+        $method = $ref->getMethod('getToolPath');
+        $method->setAccessible(true);
+        $this->assertContains('/true', $method->invoke($rt, 'foo'));
     }
 
     public function testSetToolpathNotExisting()
@@ -126,17 +123,17 @@ public function testSetToolpathNonExecutable()
         $rt->setToolpath(__FILE__);
     }
 
+    /**
+     * @throws ReflectionException
+     * @requires function ReflectionMethod::setAccessible
+     */
     public function testGetToolPathHtmlFormat()
     {
-        if (method_exists('ReflectionMethod', 'setAccessible')) {
-            $rt = new RSTTask();
-            $ref = new ReflectionClass($rt);
-            $method = $ref->getMethod('getToolPath');
-            $method->setAccessible(true);
-            $this->assertContains('rst2html', $method->invoke($rt, 'html'));
-        } else {
-            $this->markTestSkipped('No ReflectionMethod::setAccessible available.');
-        }
+        $rt = new RSTTask();
+        $ref = new ReflectionClass($rt);
+        $method = $ref->getMethod('getToolPath');
+        $method->setAccessible(true);
+        $this->assertContains('rst2html', $method->invoke($rt, 'html'));
     }
 
     public function testSingleFileParameterFile()