Author: Jonathan.Wage
Date: 2010-02-17 02:00:26 +0100 (Wed, 17 Feb 2010)
New Revision: 28067
Modified:
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/ProjectConfiguration.class.php
Log:
[1.4][sfSympalPlugin][1.0] Make sure app is enabled for sympal and prepared
when installing
Modified:
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
2010-02-17 00:46:17 UTC (rev 28066)
+++
plugins/sfSympalPlugin/trunk/lib/events/sfSympalContextLoadFactoriesListener.class.php
2010-02-17 01:00:26 UTC (rev 28067)
@@ -90,12 +90,6 @@
*/
private function _checkInstalled()
{
- // Don't run this if we are under the cli
- if (PHP_SAPI == 'cli')
- {
- return;
- }
-
$request = $this->_symfonyContext->getRequest();
// Prepare the symfony application is it has not been prepared yet
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
2010-02-17 00:46:17 UTC (rev 28066)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
2010-02-17 01:00:26 UTC (rev 28067)
@@ -49,6 +49,10 @@
*/
protected function execute($arguments = array(), $options = array())
{
+ // Make sure the application is enabled and prepared for sympal before we
try and install
+ $task = new sfSympalEnableForAppTask($this->dispatcher, $this->formatter);
+ $task->run(array($arguments['application']), array());
+
$this->createContext($this->configuration);
$install = new sfSympalInstall($this->configuration, $this->dispatcher,
$this->formatter);
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/ProjectConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/ProjectConfiguration.class.php
2010-02-17 00:46:17 UTC (rev 28066)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/config/ProjectConfiguration.class.php
2010-02-17 01:00:26 UTC (rev 28067)
@@ -19,8 +19,6 @@
{
require_once(dirname(__FILE__).'/../../../../config/sfSympalPluginConfiguration.class.php');
sfSympalPluginConfiguration::enableSympalPlugins($this);
-
- $this->enableAllPluginsExcept('sfPropelPlugin');
}
public function setupPlugins()
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
