Cleanup

Author: sebastianbergmann

build.xml

@@ -55,12 +55,12 @@
   <apply executable="${php}" failonerror="true">
    <arg value="-l" />
 
-   <fileset dir="${basedir}/PHPUnit">
+   <fileset dir="${basedir}/src">
     <include name="**/*.php" />
     <modified />
    </fileset>
 
-   <fileset dir="${basedir}/Tests">
+   <fileset dir="${basedir}/tests">
     <include name="**/*.php" />
     <modified />
    </fileset>
@@ -73,7 +73,7 @@
    <arg value="${basedir}/build/logs/phploc.csv" />
    <arg value="--log-xml" />
    <arg value="${basedir}/build/logs/phploc.xml" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
@@ -83,14 +83,14 @@
    <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
    <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
    <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
  <target name="phpmd"
          description="Perform project mess detection using PHPMD">
   <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
    <arg value="text" />
    <arg value="${basedir}/build/phpmd.xml" />
   </exec>
@@ -99,7 +99,7 @@
  <target name="phpmd-ci"
          description="Perform project mess detection using PHPMD">
   <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
    <arg value="xml" />
    <arg value="${basedir}/build/phpmd.xml" />
    <arg value="--reportfile" />
@@ -113,8 +113,8 @@
    <arg value="--standard=${basedir}/build/PHPCS" />
    <arg value="--extensions=php" />
    <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 
@@ -126,22 +126,22 @@
    <arg value="--standard=${basedir}/build/PHPCS" />
    <arg value="--extensions=php" />
    <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 
  <target name="phpcpd" description="Find duplicate code using PHPCPD">
   <exec executable="phpcpd">
    <arg value="--log-pmd" />
    <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
  <target name="phpunit" description="Run unit tests with PHPUnit">
   <exec executable="${php}" failonerror="true">
-   <arg path="${basedir}/phpunit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
@@ -155,24 +155,24 @@
   depends="phar">
   <exec executable="bash" outputproperty="version">
    <arg value="-c" />
-   <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
+   <arg value="${basedir}/src --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
   </exec>
 
-  <copy file="${basedir}/build/phpunit-${version}.phar" tofile="${basedir}/phpunit.phar" />
+  <copy file="${basedir}/build/phpunit-${version}.phar" tofile="${basedir}/src.phar" />
 
   <exec executable="pear">
    <arg value="package" />
   </exec>
 
-  <delete file="${basedir}/phpunit.phar"/>
+  <delete file="${basedir}/src.phar"/>
  </target>
 
  <target name="phar"
          description="Create PHAR archive of PHPUnit and all its dependencies (release)"
          depends="phar-prepare">
   <exec executable="bash" outputproperty="version">
    <arg value="-c" />
-   <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
+   <arg value="${basedir}/src --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
   </exec>
 
   <antcall target="phar-build">
@@ -325,7 +325,7 @@
 
  <target name="phar-build">
   <copy todir="${basedir}/build/phar/phpunit">
-   <fileset dir="${basedir}/PHPUnit">
+   <fileset dir="${basedir}/src">
     <include name="**/*.php" />
     <include name="**/*.tpl*" />
     <exclude name="**/Autoload.*" />

build/travis-ci.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://phpunit.de/phpunit.xsd"
-         bootstrap="../Tests/bootstrap-travis.php"
+         bootstrap="../tests/bootstrap-travis.php"
          backupGlobals="false"
          colors="true"
          verbose="true">
   <testsuites>
     <testsuite name="PHPUnit">
-      <directory suffix="Test.php">../Tests/Framework</directory>
-      <directory suffix=".phpt">../Tests/Framework/MockObject</directory>
-      <directory suffix="Test.php">../Tests/Extensions</directory>
-      <directory suffix=".phpt">../Tests/Regression</directory>
-      <directory suffix="Test.php">../Tests/Runner</directory>
-      <directory suffix=".phpt">../Tests/TextUI</directory>
-      <directory suffix="Test.php">../Tests/Util</directory>
+      <directory suffix="Test.php">../tests/Framework</directory>
+      <directory suffix="Test.php">../tests/Extensions</directory>
+      <directory suffix="Test.php">../tests/Runner</directory>
+      <directory suffix="Test.php">../tests/Util</directory>
+      <directory suffix=".phpt">../tests/TextUI</directory>
+      <directory suffix=".phpt">../tests/Regression</directory>
     </testsuite>
   </testsuites>
 
@@ -23,9 +22,9 @@
 
   <filter>
     <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../PHPUnit</directory>
+      <directory suffix=".php">../src</directory>
       <exclude>
-       <file>../PHPUnit/Framework/Assert/Functions.php</file>
+       <file>../src/Framework/Assert/Functions.php</file>
       </exclude>
     </whitelist>
   </filter>

composer.json

@@ -60,7 +60,7 @@
     },
     "autoload": {
         "classmap": [
-            "PHPUnit/"
+            "src/"
         ]
     },
     "extra": {

phpdox.xml.dist

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpdox xmlns="http://phpdox.net/config">
- <project name="PHPUnit" source="PHPUnit" workdir="build/phpdox">
+ <project name="PHPUnit" source="src" workdir="build/phpdox">
   <collector publiconly="false">
    <include mask="*.php" />
-   <exclude mask="*Autoload.php" />
   </collector>
 
   <generator output="build">

phpunit.xml.dist

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.8/phpunit.xsd"
-         bootstrap="Tests/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
          backupGlobals="false"
          verbose="true">
   <testsuites>
     <testsuite name="small">
-      <directory suffix="Test.php">Tests/Framework</directory>
-      <directory suffix="Test.php">Tests/Extensions</directory>
-      <directory suffix="Test.php">Tests/Runner</directory>
-      <directory suffix="Test.php">Tests/Util</directory>
+      <directory suffix="Test.php">tests/Framework</directory>
+      <directory suffix="Test.php">tests/Extensions</directory>
+      <directory suffix="Test.php">tests/Runner</directory>
+      <directory suffix="Test.php">tests/Util</directory>
     </testsuite>
 
     <testsuite name="large">
@@ -27,9 +27,9 @@
 
   <filter>
     <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">PHPUnit</directory>
+      <directory suffix=".php">src</directory>
       <exclude>
-       <file>PHPUnit/Framework/Assert/Functions.php</file>
+       <file>src/Framework/Assert/Functions.php</file>
       </exclude>
     </whitelist>
   </filter>
@@ -38,4 +38,3 @@
     <const name="PHPUNIT_TESTSUITE" value="true"/>
   </php>
 </phpunit>
-