Skip to content

Commit

Permalink
Revert "Closes #2015"
Browse files Browse the repository at this point in the history
This reverts commit defa9b9.
  • Loading branch information
sebastianbergmann committed Dec 23, 2017
1 parent 86112b9 commit a19b93d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 30 deletions.
1 change: 0 additions & 1 deletion ChangeLog-7.0.md
Expand Up @@ -6,7 +6,6 @@ All notable changes of the PHPUnit 7.0 release series are documented in this fil

### Changed

* Implemented [#2015](https://github.com/sebastianbergmann/phpunit/issues/2015): Prefix all code bundled in PHAR distribution with `PHPUnit` namespace
* Implemented [#2566](https://github.com/sebastianbergmann/phpunit/issues/2566): Use `Throwable` instead of `Exception` in `PHPUnit\Framework\TestListener` method signatures
* Implemented [#2920](https://github.com/sebastianbergmann/phpunit/pull/2920): Replace CLI TestDox printer with `rpkamp/fancy-testdox-printer`

Expand Down
16 changes: 1 addition & 15 deletions build.xml
Expand Up @@ -336,19 +336,6 @@
<arg value="${type}"/>
</exec>

<exec executable="${basedir}/build/tools/php-scoper" taskname="php-scoper">
<arg value="add-prefix" />
<arg value="--no-ansi" />
<arg value="--no-config" />
<arg value="--no-interaction" />
<arg value="--stop-on-failure" />
<arg value="--output-dir" />
<arg path="${basedir}/build/phar-prefixed" />
<arg value="--prefix" />
<arg value="PHPUnit" />
<arg path="${basedir}/build/phar" />
</exec>

<exec executable="${basedir}/build/tools/phpab" taskname="phpab">
<arg value="--all" />
<arg value="--static" />
Expand Down Expand Up @@ -377,13 +364,12 @@
<arg path="${basedir}/build/phpunit-${_version}.phar" />
<arg value="--template" />
<arg path="${basedir}/build/binary-phar-autoload.php" />
<arg path="${basedir}/build/phar-prefixed" />
<arg path="${basedir}/build/phar" />
</exec>

<chmod file="${basedir}/build/phpunit-${_version}.phar" perm="ugo+rx"/>

<delete dir="${basedir}/build/phar"/>
<delete dir="${basedir}/build/phar-prefixed"/>
<delete file="${basedir}/build/binary-phar-autoload.php"/>
</target>

Expand Down
Binary file removed build/tools/php-scoper
Binary file not shown.
14 changes: 0 additions & 14 deletions build/tools/php-scoper.pubkey

This file was deleted.

0 comments on commit a19b93d

Please sign in to comment.