Merge pull request #18 from shieldo/use_composer_for_tests

add symfony/twig to composer.json, and make test suite boot using composer autoload
Exercise · Apr 10, 2014 · cffa450 · cffa450
2 parents 0891818 + 39ee5af
commit cffa450
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
diff --git a/composer.json b/composer.json
@@ -10,8 +10,13 @@
     ],
     "require": {
         "php": ">=5.3.2",
+        "symfony/framework-bundle": "~2.0",
         "ezyang/htmlpurifier": "~4.0"
     },
+    "require-dev": {
+        "symfony/form": "~2.0",
+        "twig/twig": "~1.3"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
 <!--
     <php>
         <server name="HTMLPURIFIER" value="../../htmlpurifier/library" />