Author: Jonathan.Wage
Date: 2010-02-18 03:49:02 +0100 (Thu, 18 Feb 2010)
New Revision: 28106
Modified:
plugins/sfSympalPlugin/trunk/config/sfSympalPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/config/sfSympalPagesPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/config/sfSympalPluginManagerPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
Log:
[1.4][sfSympalPlugin][1.0] Removing old dependencies code as it is not used any
longer
Modified:
plugins/sfSympalPlugin/trunk/config/sfSympalPluginConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/config/sfSympalPluginConfiguration.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++ plugins/sfSympalPlugin/trunk/config/sfSympalPluginConfiguration.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -8,11 +8,10 @@
const VERSION = '1.0.0-ALPHA3';
/**
- * Array of plugins sfSympalPlugin depends on. Used to autoenabled
- * all the plugins that make up sfSympalPlugin functionality as a whole.
+ * Array of all the core Sympal plugins
*/
public static
- $dependencies = array(
+ $corePlugins = array(
'sfDoctrineGuardPlugin',
'sfFormExtraPlugin',
'sfTaskExtraPlugin',
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/config/sfSympalMenuPluginConfiguration.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -2,11 +2,6 @@
class sfSympalMenuPluginConfiguration extends sfPluginConfiguration
{
- public static
- $dependencies = array(
- 'sfSympalPlugin'
- );
-
public function initialize()
{
$this->dispatcher->connect('sympal.load_admin_menu', array($this,
'loadAdminMenu'));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/config/sfSympalPagesPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/config/sfSympalPagesPluginConfiguration.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPagesPlugin/config/sfSympalPagesPluginConfiguration.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -2,11 +2,6 @@
class sfSympalPagesPluginConfiguration extends sfPluginConfiguration
{
- public static
- $dependencies = array(
- 'sfSympalPlugin'
- );
-
public function initialize()
{
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/config/sfSympalPluginManagerPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/config/sfSympalPluginManagerPluginConfiguration.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/config/sfSympalPluginManagerPluginConfiguration.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -2,11 +2,6 @@
class sfSympalPluginManagerPluginConfiguration extends sfPluginConfiguration
{
- public static
- $dependencies = array(
- 'sfSympalPlugin'
- );
-
public function initialize()
{
$this->dispatcher->connect('sympal.load_admin_menu', array($this,
'loadAdminMenu'));
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -11,35 +11,6 @@
}
}
- public static function getRequiredPlugins()
- {
- $requiredPlugins = array();
-
- $context = sfContext::getInstance();
- $configuration = $context->getConfiguration();
-
- $plugins = $configuration->getPlugins();
- foreach ($plugins as $plugin)
- {
- $dependencies = sfSympalPluginToolkit::getPluginDependencies($plugin);
- $requiredPlugins = array_merge($requiredPlugins, $dependencies);
- }
-
- $requiredPlugins = array_unique($requiredPlugins);
-
- return $requiredPlugins;
- }
-
- public static function getPluginDependencies($pluginName)
- {
- try {
- $refClass = new ReflectionClass($pluginName.'Configuration');
- return $refClass->getStaticPropertyValue('dependencies');
- } catch (Exception $e) {
- return array();
- }
- }
-
public static function isPluginInstalled($plugin)
{
$pluginName = sfSympalPluginToolkit::getLongPluginName($plugin);
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -129,16 +129,7 @@
$this->_doctrineManager->setAttribute(Doctrine_Core::ATTR_TABLE_CLASS,
'sfSympalDoctrineTable');
$this->_doctrineManager->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS,
'sfSympalDoctrineQuery');
$this->_doctrineManager->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS,
'sfSympalDoctrineCollection');
- $this->_configureDoctrineCache();
- }
- /**
- * Configure Doctrine cache if it is enabled
- *
- * @return void
- */
- private function _configureDoctrineCache()
- {
if (sfSympalConfig::get('orm_cache', 'enabled', true))
{
$driver = sfSympalCache::getOrmCacheDriver();
@@ -153,16 +144,34 @@
}
}
+ /**
+ * Set the sfSympalCache instance for this sympal configuration instance
+ *
+ * @param sfSympalCache $cache
+ * @return void
+ */
public function setCache(sfSympalCache $cache)
{
$this->_cache = $cache;
}
+ /**
+ * Set the symfony context for this sympal configuration instance
+ *
+ * @param sfContext $symfonyContext
+ * @return void
+ */
public function setSymfonyContext(sfContext $symfonyContext)
{
$this->_symfonyContext = $symfonyContext;
}
+ /**
+ * Set the sympal context for this sympal configuration instance
+ *
+ * @param sfSympalContext $sympalContext
+ * @return void
+ */
public function setSympalContext(sfSympalContext $sympalContext)
{
$this->_sympalContext = $sympalContext;
@@ -225,7 +234,7 @@
*/
public function getCorePlugins()
{
- return sfSympalPluginConfiguration::$dependencies;
+ return sfSympalPluginConfiguration::$corePlugins;
}
/**
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-18 02:34:33 UTC (rev 28105)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-18 02:49:02 UTC (rev 28106)
@@ -58,7 +58,7 @@
$this->_configuration->enablePlugins('sfSympalPlugin');
$this->_configuration->setPluginPath('sfSympalPlugin',
$this->_sympalPluginPath);
- $this->enableSympalCorePlugins(sfSympalPluginConfiguration::$dependencies);
+ $this->enableSympalCorePlugins(sfSympalPluginConfiguration::$corePlugins);
$plugins = $this->_configuration->getPlugins();
$foundPlugins = array();
--
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.
