Skip to content

Commit cffa450

Browse files
committed
Merge pull request Exercise#18 from shieldo/use_composer_for_tests
add symfony/twig to composer.json, and make test suite boot using composer autoload
2 parents 0891818 + 39ee5af commit cffa450

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Tests/bootstrap.php

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

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
],
1111
"require": {
1212
"php": ">=5.3.2",
13+
"symfony/framework-bundle": "~2.0",
1314
"ezyang/htmlpurifier": "~4.0"
1415
},
16+
"require-dev": {
17+
"symfony/form": "~2.0",
18+
"twig/twig": "~1.3"
19+
},
1520
"extra": {
1621
"branch-alias": {
1722
"dev-master": "1.0.x-dev"

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
3+
<phpunit bootstrap="./vendor/autoload.php" colors="true">
44
<!--
55
<php>
66
<server name="HTMLPURIFIER" value="../../htmlpurifier/library" />

0 commit comments

Comments
 (0)