Skip to content

Commit 36eeb25

Browse files
TobionTobion
committed
use autoload-dev completely instead of an init script
1 parent fd037df commit 36eeb25

File tree

7 files changed

+73
-53
lines changed

7 files changed

+73
-53
lines changed

‎phpunit.xml.dist‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,34 @@
1111
tests/ folder: phpunit -c <filename> ...
1212
Example: phpunit -c mysqlconf.xml
1313
-->
14-
<phpunit backupGlobals="false"
15-
backupStaticAttributes="false"
14+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
16+
backupGlobals="false"
1617
colors="true"
17-
convertErrorsToExceptions="true"
18-
convertNoticesToExceptions="true"
19-
convertWarningsToExceptions="true"
20-
processIsolation="false"
21-
stopOnFailure="false"
22-
syntaxCheck="false"
23-
bootstrap="./tests/Doctrine/Tests/TestInit.php"
18+
bootstrap="vendor/autoload.php"
2419
>
25-
<php>
26-
<!-- "Real" test database -->
27-
<!-- Uncomment, otherwise SQLite runs
28-
<var name="db_type" value="pdo_mysql"/>
29-
<var name="db_host" value="localhost" />
30-
<var name="db_username" value="root" />
31-
<var name="db_password" value="" />
32-
<var name="db_name" value="doctrine_tests" />
33-
<var name="db_port" value="3306"/>
34-
-->
35-
<!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
20+
<php>
21+
<ini name="error_reporting" value="-1" />
22+
23+
<!-- "Real" test database -->
24+
<!-- Uncomment, otherwise SQLite runs
25+
<var name="db_type" value="pdo_mysql"/>
26+
<var name="db_host" value="localhost" />
27+
<var name="db_username" value="root" />
28+
<var name="db_password" value="" />
29+
<var name="db_name" value="doctrine_tests" />
30+
<var name="db_port" value="3306"/>
31+
-->
32+
<!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
3633

37-
<!-- Database for temporary connections (i.e. to drop/create the main database) -->
38-
<var name="tmpdb_type" value="pdo_mysql"/>
39-
<var name="tmpdb_host" value="localhost" />
40-
<var name="tmpdb_username" value="root" />
41-
<var name="tmpdb_password" value="" />
42-
<var name="tmpdb_name" value="doctrine_tests_tmp" />
43-
<var name="tmpdb_port" value="3306"/>
44-
</php>
34+
<!-- Database for temporary connections (i.e. to drop/create the main database) -->
35+
<var name="tmpdb_type" value="pdo_mysql"/>
36+
<var name="tmpdb_host" value="localhost" />
37+
<var name="tmpdb_username" value="root" />
38+
<var name="tmpdb_password" value="" />
39+
<var name="tmpdb_name" value="doctrine_tests_tmp" />
40+
<var name="tmpdb_port" value="3306"/>
41+
</php>
4542

4643
<testsuites>
4744
<testsuite name="Doctrine DBAL Test Suite">

‎tests/Doctrine/Tests/TestInit.php‎

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

‎tests/travis/mariadb.travis.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
4+
backupGlobals="false"
5+
colors="true"
6+
bootstrap="../../vendor/autoload.php"
7+
>
38
<php>
9+
<ini name="error_reporting" value="-1" />
10+
411
<var name="db_type" value="pdo_mysql"/>
512
<var name="db_host" value="localhost" />
613
<var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
2027
<directory>../Doctrine/Tests/DBAL</directory>
2128
</testsuite>
2229
</testsuites>
30+
2331
<groups>
2432
<exclude>
2533
<group>performance</group>
2634
<group>locking_functional</group>
2735
</exclude>
2836
</groups>
29-
3037
</phpunit>
3138

‎tests/travis/mysql.travis.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
4+
backupGlobals="false"
5+
colors="true"
6+
bootstrap="../../vendor/autoload.php"
7+
>
38
<php>
9+
<ini name="error_reporting" value="-1" />
10+
411
<var name="db_type" value="pdo_mysql"/>
512
<var name="db_host" value="localhost" />
613
<var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
2027
<directory>../Doctrine/Tests/DBAL</directory>
2128
</testsuite>
2229
</testsuites>
30+
2331
<groups>
2432
<exclude>
2533
<group>performance</group>
2634
<group>locking_functional</group>
2735
</exclude>
2836
</groups>
29-
3037
</phpunit>
3138

‎tests/travis/mysqli.travis.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
4+
backupGlobals="false"
5+
colors="true"
6+
bootstrap="../../vendor/autoload.php"
7+
>
38
<php>
9+
<ini name="error_reporting" value="-1" />
10+
411
<var name="db_type" value="mysqli"/>
512
<var name="db_host" value="localhost" />
613
<var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
2027
<directory>../Doctrine/Tests/DBAL</directory>
2128
</testsuite>
2229
</testsuites>
30+
2331
<groups>
2432
<exclude>
2533
<group>performance</group>
2634
<group>locking_functional</group>
2735
</exclude>
2836
</groups>
29-
3037
</phpunit>
3138

‎tests/travis/pgsql.travis.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
4+
backupGlobals="false"
5+
colors="true"
6+
bootstrap="../../vendor/autoload.php"
7+
>
38
<php>
9+
<ini name="error_reporting" value="-1" />
10+
411
<var name="db_type" value="pdo_pgsql"/>
512
<var name="db_host" value="localhost" />
613
<var name="db_username" value="postgres" />
@@ -14,11 +21,13 @@
1421
<var name="tmpdb_password" value="" />
1522
<var name="tmpdb_port" value="5432"/>
1623
</php>
24+
1725
<testsuites>
1826
<testsuite name="Doctrine DBAL Test Suite">
1927
<directory>../Doctrine/Tests/DBAL</directory>
2028
</testsuite>
2129
</testsuites>
30+
2231
<groups>
2332
<exclude>
2433
<group>performance</group>

‎tests/travis/sqlite.travis.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
4+
backupGlobals="false"
5+
colors="true"
6+
bootstrap="../../vendor/autoload.php"
7+
>
8+
<php>
9+
<ini name="error_reporting" value="-1" />
10+
</php>
11+
312
<testsuites>
413
<testsuite name="Doctrine DBAL Test Suite">
514
<directory>../Doctrine/Tests/DBAL</directory>
615
</testsuite>
716
</testsuites>
17+
818
<groups>
919
<exclude>
1020
<group>performance</group>

0 commit comments

Comments
 (0)