Permalink
Browse files

Merge remote-tracking branches 'propel/master' and 'origin/master'

  • Loading branch information...
2 parents 055a837 + ed8361b commit 065f51e717d20a8338e4568b1416d28d07f701fe @ldath ldath committed Oct 3, 2012
Showing with 30 additions and 0 deletions.
  1. +14 −0 README.md
  2. +16 −0 composer.json
View
@@ -7,6 +7,20 @@ Replaces symfony's core Propel plugin by the latest version of Propel, in branch
## Installation
+### The Composer way
+
+Add the require to your composer.json. It's oddly named but like this Composer's symfony1 installer camelcases it correctly.
+Composer will install it into your project's plugins directory automatically, and add the requirements.
+
+ {
+ "config": {
+ "vendor-dir": "lib/vendor"
+ },
+ "require": {
+ "propel/sf-propel-o-r-m-plugin": "dev-master"
+ }
+ }
+
### The Git way
Clone the plugin from Github:
View
@@ -0,0 +1,16 @@
+{
+ "name": "propel/sf-propel-o-r-m-plugin",
+ "type": "symfony1-plugin",
+ "description": "symfony 1.x plugin for Propel.",
+ "keywords": ["symfony", "propel", "orm", "active record", "mapping", "database", "persistence"],
+ "homepage": "http://www.propelorm.org/",
+ "require": {
+ "composer/installers": "*",
+ "propel/propel1": "1.6.*"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.5-dev"
+ }
+ }
+}

0 comments on commit 065f51e

Please sign in to comment.