added a phpunit file + fixed composer file

symfony · Jun 30, 2012 · 4140ae9 · 4140ae9
1 parent d05c9c5
commit 4140ae9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/vendor/
+/composer.lock
+
diff --git a/composer.json b/composer.json
@@ -18,16 +18,21 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "swiftmailer/swiftmailer": ">=4.1.8,<4.2-dev",
-        "symfony/swiftmailer-bridge": "self.version"
+        "swiftmailer/swiftmailer": ">=4.2-dev",
+        "symfony/swiftmailer-bridge": "2.1.*"
+    },
+    "require-dev": {
+        "symfony/dependency-injection": "2.1.*",
+        "symfony/http-kernel": "2.1.*",
+        "symfony/config": "2.1.*"
     },
     "autoload": {
         "psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" }
     },
     "target-dir": "Symfony/Bundle/SwiftmailerBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit colors="true" bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="SwiftmailerBundle for the Symfony Framework">
+            <directory>./Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>.</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>