Skip to content

Commit ed405f2

Browse files
authored
[CLEANUP] Move the PHPUnit configuration file (#54)
This will bring the project closer to the default Symfony project structure.
1 parent 1aabe89 commit ed405f2

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ When running the integration tests, you will need to specify the database name
9292
and access credentials on the command line (in the same line):
9393

9494
```bash
95-
PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Integration/
95+
PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit tests/Integration/
9696
```
9797

9898

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ script:
6666
- >
6767
echo;
6868
echo "Running the integration tests";
69-
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Integration/;
69+
vendor/bin/phpunit tests/Integration/;
7070
7171
- >
7272
echo;
7373
echo "Running the system tests";
74-
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/System/;
74+
vendor/bin/phpunit tests/System/;
7575
7676
- >
7777
echo;

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1010
- Integration tests for the dev and test environment (#44)
1111

1212
### Changed
13+
- Move the PHPUnit configuration file (#54)
1314
- Use the renamed phplist/core package (#53)
1415
- Adopt more of the default Symfony project structure (#49, #50, #51)
1516

Configuration/.gitkeep

Whitespace-only changes.

Configuration/PHPUnit/phpunit.xml renamed to phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
66
backupGlobals="false"
77
colors="true"
8-
bootstrap="../../vendor/autoload.php"
8+
bootstrap="vendor/autoload.php"
99
>
1010
<php>
1111
<ini name="error_reporting" value="-1"/>

0 commit comments

Comments
 (0)