Move FileList class

jrfnl · jrfnl · commit 91e4384a30b8 · 2019-08-27T06:35:58.000+02:00
... from the `scripts` directory to the `tests` directory and namespace the class.
diff --git a/package.xml b/package.xml
@@ -217,6 +217,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     </dir>
     <file baseinstalldir="" name="AllTests.php" role="test" />
     <file baseinstalldir="" name="bootstrap.php" role="test" />
+    <file baseinstalldir="" name="FileList.php" role="test" />
     <file baseinstalldir="" name="TestSuite.php" role="test" />
     <file baseinstalldir="" name="TestSuite7.php" role="test" />
    </dir>
@@ -1957,6 +1958,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install as="LICENCE" name="licence.txt" />
    <install as="phpunit.xml" name="phpunit.xml.dist" />
    <install as="AllTests.php" name="tests/AllTests.php" />
+   <install as="FileList.php" name="tests/FileList.php" />
    <install as="TestSuite.php" name="tests/TestSuite.php" />
    <install as="TestSuite7.php" name="tests/TestSuite7.php" />
    <install as="tests/bootstrap.php" name="tests/bootstrap.php" />
@@ -1994,6 +1996,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install as="phpunit.xml" name="phpunit.xml.dist" />
    <install as="tests/AllTests.php" name="tests/AllTests.php" />
    <install as="tests/bootstrap.php" name="tests/bootstrap.php" />
+   <install as="tests/FileList.php" name="tests/FileList.php" />
    <install as="tests/TestSuite.php" name="tests/TestSuite.php" />
    <install as="tests/TestSuite7.php" name="tests/TestSuite7.php" />
    <install as="CodeSniffer/Core/AbstractMethodUnitTest.php" name="tests/Core/AbstractMethodUnitTest.php" />
diff --git a/scripts/ValidatePEAR/ValidatePEARPackageXML.php b/scripts/ValidatePEAR/ValidatePEARPackageXML.php
@@ -11,6 +11,8 @@
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
+use PHP_CodeSniffer\Tests\FileList;
+
 /**
  * Validate the PHP_CodeSniffer PEAR package.xml file.
  */
diff --git a/scripts/validate-pear-package.php b/scripts/validate-pear-package.php
@@ -12,7 +12,7 @@
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-require_once __DIR__.'/ValidatePEAR/FileList.php';
+require_once dirname(__DIR__).'/tests/FileList.php';
 require_once __DIR__.'/ValidatePEAR/ValidatePEARPackageXML.php';
 
 $validate = new ValidatePEARPackageXML();
diff --git a/tests/FileList.php b/tests/FileList.php
@@ -1,19 +1,14 @@
 <?php
 /**
- * Retrieve a filtered file list.
+ * Class to retrieve a filtered file list.
  *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-/**
- * Class to create a file list with filtering.
- */
+namespace PHP_CodeSniffer\Tests;
+
 class FileList
 {
 
