Add sfPropelORMPlugin, disabling default sfPropelPlugin.

Upgrading Propel from 1.4 to 1.6.

config/ProjectConfiguration.class.php

@@ -6,6 +6,6 @@
 class ProjectConfiguration extends sfProjectConfiguration {
 	public function setup() {
 		// for compatibility / remove and enable only the plugins you want
-		$this->enableAllPluginsExcept(array('sfDoctrinePlugin'));
+		$this->enableAllPluginsExcept(array('sfDoctrinePlugin', 'sfPropelPlugin'));
 	}
 }

config/propel.ini

@@ -48,8 +48,8 @@ propel.builder.addBehaviors = true
 
 ; behaviors
 propel.behavior.default                        = symfony,symfony_i18n
-propel.behavior.symfony.class                  = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfony
-propel.behavior.symfony_i18n.class             = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18n
-propel.behavior.symfony_i18n_translation.class = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18nTranslation
-propel.behavior.symfony_behaviors.class        = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfonyBehaviors
-propel.behavior.symfony_timestampable.class    = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorTimestampable
+propel.behavior.symfony.class                  = plugins.sfPropelORMPlugin.lib.behavior.SfPropelBehaviorSymfony
+propel.behavior.symfony_i18n.class             = plugins.sfPropelORMPlugin.lib.behavior.SfPropelBehaviorI18n
+propel.behavior.symfony_i18n_translation.class = plugins.sfPropelORMPlugin.lib.behavior.SfPropelBehaviorI18nTranslation
+propel.behavior.symfony_behaviors.class        = plugins.sfPropelORMPlugin.lib.behavior.SfPropelBehaviorSymfonyBehaviors
+propel.behavior.symfony_timestampable.class    = plugins.sfPropelORMPlugin.lib.behavior.SfPropelBehaviorTimestampable

lib/model/AuthorQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'author' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class AuthorQuery extends BaseAuthorQuery {
+
+} // AuthorQuery

lib/model/PluginDependencyQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'plugin_dependency' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class PluginDependencyQuery extends BasePluginDependencyQuery {
+
+} // PluginDependencyQuery

lib/model/PluginQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'plugin' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class PluginQuery extends BasePluginQuery {
+
+} // PluginQuery

lib/model/PluginScreenshotQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'plugin_screenshot' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class PluginScreenshotQuery extends BasePluginScreenshotQuery {
+
+} // PluginScreenshotQuery

lib/model/PluginSectionQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'plugin_section' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class PluginSectionQuery extends BasePluginSectionQuery {
+
+} // PluginSectionQuery

lib/model/PluginTagQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'plugin_tag' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class PluginTagQuery extends BasePluginTagQuery {
+
+} // PluginTagQuery

lib/model/TermQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'term' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class TermQuery extends BaseTermQuery {
+
+} // TermQuery

lib/model/TermRelationshipQuery.php

@@ -0,0 +1,22 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'term_relationship' table.
+ *
+ * 
+ *
+ * This class was autogenerated by Propel 1.6.4 on:
+ *
+ * Sat Jun  1 11:58:08 2013
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.lib.model
+ */
+class TermRelationshipQuery extends BaseTermRelationshipQuery {
+
+} // TermRelationshipQuery

plugins/sfPropelORMPlugin/.gitignore

@@ -0,0 +1,7 @@
+test/functional/fixtures/data/database.sqlite
+test/functional/fixtures/data/sql/
+test/functional/fixtures/lib/form/base/
+test/functional/fixtures/lib/model/map/
+test/functional/fixtures/lib/model/om/
+mockproject/
+junit.xml

plugins/sfPropelORMPlugin/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "lib/vendor/propel"]
+	path = lib/vendor/propel
+	url = git://github.com/propelorm/Propel.git
+[submodule "lib/vendor/phing"]
+	path = lib/vendor/phing
+	url = git://github.com/Xosofox/phing.git

plugins/sfPropelORMPlugin/.travis.yml

@@ -0,0 +1,12 @@
+language: php
+
+php:
+    - 5.3
+    - 5.4
+
+env:
+    - SYMFONY_VERSION=symfony-1.4.15
+
+before_script: ./prepare_tests.sh
+
+script: php mockproject/plugins/sfPropelORMPlugin/test/bin/prove.php

plugins/sfPropelORMPlugin/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2004-2012 Fabien Potencier, Francois Zaninotto, William Durand,
+Julien Muetton, Vincent Mazenod
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

plugins/sfPropelORMPlugin/LICENSE.Propel

@@ -0,0 +1,19 @@
+Copyright (c) 2005-2010 Hans Lellelid, David Zuelke, Francois Zaninotto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.