Skip to content

Commit 9b9569e

Browse files
sebastianbergmannsebastianbergmann
committed
Cleanup
1 parent d081431 commit 9b9569e

File tree

11 files changed

+65
-128
lines changed

11 files changed

+65
-128
lines changed

‎.gitignore

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
.idea
2-
phpunit.xml
3-
composer.lock
4-
composer.phar
5-
vendor/
6-
cache.properties
7-
build/SebastianBergmann
8-
build/LICENSE
9-
build/README.md
10-
build/*.tgz
1+
/.idea
2+
/composer.lock
3+
/vendor

‎.php_cs

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎.travis.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
language: php
22

3-
install:
4-
- travis_retry composer install --no-interaction --prefer-source
5-
63
php:
7-
- 5.3.3
84
- 5.3
95
- 5.4
106
- 5.5
117
- 5.6
12-
- hhvm
8+
- 7.0
9+
- 7.0snapshot
10+
- 7.1
11+
- 7.1snapshot
12+
- master
13+
14+
sudo: false
15+
16+
before_install:
17+
- composer self-update
18+
- composer clear-cache
19+
20+
install:
21+
- travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader --prefer-stable
22+
23+
script:
24+
- ./vendor/bin/phpunit
1325

1426
notifications:
1527
email: false
16-
irc: "irc.freenode.org#phpunit"
28+

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Diff
22

3-
Copyright (c) 2002-2015, Sebastian Bergmann <[email protected]>.
3+
Copyright (c) 2002-2017, Sebastian Bergmann <[email protected]>.
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

‎build.xml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="diff">
3-
<target name="clean" description="Cleanup build artifacts">
4-
<delete dir="${basedir}/vendor"/>
5-
<delete file="${basedir}/composer.lock"/>
6-
</target>
2+
<project name="diff" default="setup">
3+
<target name="setup" depends="clean,composer"/>
74

8-
<target name="composer" depends="clean" description="Install dependencies with Composer">
9-
<tstamp>
10-
<format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
11-
</tstamp>
12-
<delete>
13-
<fileset dir="${basedir}">
14-
<include name="composer.phar" />
15-
<date datetime="${thirty.days.ago}" when="before"/>
16-
</fileset>
17-
</delete>
5+
<target name="clean" description="Cleanup build artifacts">
6+
<delete dir="${basedir}/vendor"/>
7+
<delete file="${basedir}/composer.lock"/>
8+
</target>
189

19-
<get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
20-
21-
<exec executable="php">
22-
<arg value="composer.phar"/>
23-
<arg value="install"/>
24-
</exec>
25-
</target>
10+
<target name="composer" depends="clean" description="Install dependencies with Composer">
11+
<exec executable="composer" taskname="composer">
12+
<arg value="update"/>
13+
<arg value="--no-interaction"/>
14+
<arg value="--no-progress"/>
15+
<arg value="--no-ansi"/>
16+
<arg value="--no-suggest"/>
17+
<arg value="--optimize-autoloader"/>
18+
<arg value="--prefer-stable"/>
19+
</exec>
20+
</target>
2621
</project>
22+

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
}
1616
],
1717
"require": {
18-
"php": ">=5.3.3"
18+
"php": "^5.3.3 || ^7.0"
1919
},
2020
"require-dev": {
21-
"phpunit/phpunit": "~4.8"
21+
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
2222
},
2323
"autoload": {
2424
"classmap": [

‎phpunit.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.0/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
forceCoversAnnotation="true"
6+
beStrictAboutCoversAnnotation="true"
7+
beStrictAboutOutputDuringTests="true"
8+
beStrictAboutTodoAnnotatedTests="true"
9+
verbose="true">
10+
<testsuite>
11+
<directory suffix="Test.php">tests</directory>
12+
</testsuite>
13+
14+
<filter>
15+
<whitelist processUncoveredFilesFromWhitelist="true">
16+
<directory suffix=".php">src</directory>
17+
</whitelist>
18+
</filter>
19+
</phpunit>

‎phpunit.xml.dist

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tests/DifferTest.php

-18 Bytes
Binary file not shown.

‎tests/LCS/TimeEfficientImplementationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
namespace SebastianBergmann\Diff\LCS;
1212

13-
use PHPUnit_Framework_TestCase;
13+
use PHPUnit\Framework\TestCase;
1414

1515
/**
1616
* Some of these tests are volontary stressfull, in order to give some approximative benchmark hints.
1717
*/
18-
class TimeEfficientImplementationTest extends PHPUnit_Framework_TestCase
18+
class TimeEfficientImplementationTest extends TestCase
1919
{
2020
private $implementation;
2121
private $memory_limit;

0 commit comments

Comments
 (0)