merged branch willdurand/propel-bridge (PR #3949)

Commits ------- 51e19d5 Added propel1-bridge to the main composer.json fba5d68 [Propel1] Added composer.json bbf0122 [Propel1] Fixed phpunit.xml.dist Discussion ---------- Added composer.json to the Propel bridge --------------------------------------------------------------------------- by stof at 2012-04-15T00:14:12Z you need to add it in the ``replace`` section for the main package too --------------------------------------------------------------------------- by willdurand at 2012-04-15T00:17:13Z Ah done, I forgot that file, thanks.
symfony · Apr 15, 2012 · e7470ff · e7470ff
2 parents 45d43d3 + 51e19d5
commit e7470ff
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
     "replace": {
         "symfony/doctrine-bridge": "self.version",
         "symfony/monolog-bridge": "self.version",
+        "symfony/propel1-bridge": "self.version",
         "symfony/twig-bridge": "self.version",
         "symfony/framework-bundle": "self.version",
         "symfony/security-bundle": "self.version",

diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "symfony/propel1-bridge",
+    "type": "symfony-bridge",
+    "description": "Symfony Propel1 Bridge",
+    "keywords": [],
+    "homepage": "http://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "http://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.2",
+        "symfony/http-foundation": "self.version",
+        "symfony/http-kernel": "self.version",
+        "symfony/form": "self.version",
+        "propel/propel1": "1.6.*"
+    },
+    "autoload": {
+        "psr-0": { "Symfony\\Bridge\\Propel1": "" }
+    },
+    "target-dir": "Symfony/Bridge/Propel1",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1-dev"
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Propel1/phpunit.xml.dist b/src/Symfony/Bridge/Propel1/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="Tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Symfony Propel1 Bridge Test Suite">