Skip to content

Commit 7a4d345

Browse files
committed
Define env vars in .env file only
The tests are using env vars to run. These env vars are storing the credentials to the different backends. For the CI, these env vars are set on the project settings (on travis for instance). For the development of Gaufrette, and considering the merge of (#580), the tests should be ran using docker. The docker setup uses env vars defined in .env files, so we no longer need to define such vars in the phpunit.xml file.
1 parent 7507f57 commit 7a4d345

File tree

2 files changed

+12
-44
lines changed

2 files changed

+12
-44
lines changed

.env.dist

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ AWS_KEY=
22
AWS_SECRET=
33
AWS_BUCKET=
44

5-
MONGO_URI=mongodb://mongodb:27017
6-
MONGO_DBNAME=gridfs_test
7-
8-
SFTP_HOST=sftp
9-
SFTP_PORT=22
10-
SFTP_USER=gaufrette
11-
SFTP_PASSWORD=gaufrette
12-
SFTP_BASE_DIR=gaufrette
5+
AZURE_ACCOUNT=
6+
AZURE_KEY=
7+
AZURE_CONTAINER=
138

149
FTP_HOST=ftp
1510
FTP_PORT=21
1611
FTP_USER=gaufrette
1712
FTP_PASSWORD=gaufrette
1813
FTP_BASE_DIR=/gaufrette
1914

20-
AZURE_ACCOUNT=
21-
AZURE_KEY=
22-
AZURE_CONTAINER=
15+
MONGO_URI=mongodb://mongodb:27017
16+
MONGO_DBNAME=gridfs_test
2317

2418
RACKSPACE_USER=
2519
RACKSPACE_APIKEY=
2620
RACKSPACE_CONTAINER=
21+
22+
SFTP_HOST=sftp
23+
SFTP_PORT=22
24+
SFTP_USER=gaufrette
25+
SFTP_PASSWORD=gaufrette
26+
SFTP_BASE_DIR=gaufrette

phpunit.xml.dist

+1-33
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,7 @@
1010
stopOnFailure="false"
1111
bootstrap="vendor/autoload.php"
1212
>
13-
14-
<php>
15-
<!-- Parameters for GridFS adapter -->
16-
<!--<env name="MONGO_URI" value="mongodb://localhost:27017" />
17-
<env name="MONGO_DBNAME" value="gridfs_test" />-->
18-
19-
<!-- Configuration for AwsS3 adapter -->
20-
<!--<env name="AWS_KEY" value="" />
21-
<env name="AWS_SECRET" value="" />
22-
<env name="AWS_BUCKET" value="" />-->
23-
24-
<!-- Configuration for PhpseclibSftp adapter -->
25-
<!--<env name="SFTP_HOST" value="" />
26-
<env name="SFTP_PORT" value="" />
27-
<env name="SFTP_USER" value="" />
28-
<env name="SFTP_PASSWORD" value="" />-->
29-
30-
<!-- Configuration for Ftp adapter -->
31-
<!--<env name="FTP_HOST" value="" />
32-
<env name="FTP_USER" value="" />
33-
<env name="FTP_PASSWORD" value="" />
34-
<env name="FTP_BASE_DIR" value="" />-->
35-
36-
<!-- Configuration for Azure adapter -->
37-
<!--<env name="AZURE_ACCOUNT" value="" />
38-
<env name="AZURE_KEY" value="" />
39-
<env name="AZURE_CONTAINER" value="" />-->
40-
41-
<!-- Configuration for OpenCloud/Rackspace adapter -->
42-
<!--<env name="RACKSPACE_USER" value="" />
43-
<env name="RACKSPACE_APIKEY" value="" />
44-
<env name="RACKSPACE_CONTAINER" value="" />-->
45-
</php>
13+
<!-- The env vars are defined in the .env file -->
4614

4715
<testsuites>
4816
<testsuite name="Gaufrette Test Suite">

0 commit comments

Comments
 (0)