Author: Jonathan.Wage
Date: 2010-02-17 11:24:20 +0100 (Wed, 17 Feb 2010)
New Revision: 28072
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/sfSympalInstall.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
plugins/sfSympalPlugin/trunk/test/functional/AdminGenTest.php
plugins/sfSympalPlugin/trunk/test/unit/ConfigurationTest.php
Log:
[1.4][sfSympalPlugin][1.0] Renaming plugin related methods to be more
appropriate
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/sfSympalInstall.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/sfSympalInstall.class.php
2010-02-17 09:15:08 UTC (rev 28071)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/sfSympalInstall.class.php
2010-02-17 10:24:20 UTC (rev 28072)
@@ -280,7 +280,7 @@
{
$this->logSection('sympal', '...installing addon plugins', null,
'COMMENT');
- $plugins =
$this->_configuration->getPluginConfiguration('sfSympalPlugin')->getSympalConfiguration()->getOtherPlugins();
+ $plugins =
$this->_configuration->getPluginConfiguration('sfSympalPlugin')->getSympalConfiguration()->getDownloadedPlugins();
foreach ($plugins as $plugin)
{
$manager = sfSympalPluginManager::getActionInstance($plugin, 'install',
$this->_configuration, $this->_formatter);
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-17 09:15:08 UTC (rev 28071)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/toolkits/sfSympalPluginToolkit.class.php
2010-02-17 10:24:20 UTC (rev 28072)
@@ -80,7 +80,7 @@
}
}
- public static function getAvailablePluginPaths()
+ public static function getDownloadablePluginPaths()
{
$cachePath = sfConfig::get('sf_cache_dir').'/sympal/plugins.cache';
if (!file_exists($cachePath))
@@ -134,9 +134,9 @@
return $available;
}
- public static function getAvailablePlugins()
+ public static function getDownloadablePlugins()
{
- return array_keys(self::getAvailablePluginPaths());
+ return array_keys(self::getDownloadablePluginPaths());
}
public static function getPluginDownloadPath($name)
@@ -147,7 +147,7 @@
$e = explode('.', SYMFONY_VERSION);
$version = $e[0].'.'.$e[1];
- $paths = self::getAvailablePluginPaths();
+ $paths = self::getDownloadablePluginPaths();
$path = '';
foreach ($paths as $pathPluginName => $path)
{
@@ -179,7 +179,7 @@
public static function isPluginAvailable($name)
{
$pluginName = self::getLongPluginName($name);
- $availablePlugins = self::getAvailablePlugins();
+ $availablePlugins = self::getDownloadablePlugins();
return in_array($availablePlugins, $pluginName);
}
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-02-17 09:15:08 UTC (rev 28071)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalConfiguration.class.php
2010-02-17 10:24:20 UTC (rev 28072)
@@ -299,9 +299,9 @@
*
* @return array $installedPlugins
*/
- public function getInstalledPlugins()
+ public function getDownloadedPlugins()
{
- return $this->getOtherPlugins();
+ return array_diff($this->getPlugins(), $this->getRequiredPlugins());
}
/**
@@ -309,29 +309,19 @@
*
* @return array $addonPlugins
*/
- public function getAddonPlugins()
+ public function getDownloadablePlugins()
{
- return sfSympalPluginToolkit::getAvailablePlugins();
+ return sfSympalPluginToolkit::getDownloadablePlugins();
}
/**
- * Get array of other plugins that are not required
- *
- * @return array $otherPlugins
- */
- public function getOtherPlugins()
- {
- return array_diff($this->getPlugins(), $this->getRequiredPlugins());
- }
-
- /**
* Get array of all manageable plugins that can be downloaded, installed,
uninstalled, etc.
*
* @return array $allManageablePlugins
*/
public function getAllManageablePlugins()
{
- $plugins = array_merge($this->getAddonPlugins(),
$this->getInstalledPlugins());
+ $plugins = array_merge($this->getDownloadablePlugins(),
$this->getDownloadedPlugins());
$plugins = array_unique($plugins);
return $plugins;
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-17 09:15:08 UTC (rev 28071)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-17 10:24:20 UTC (rev 28072)
@@ -1,11 +1,6 @@
all:
sympal_config:
- language_codes:
- - en
- - fr
- - es
breadcrumbs_separator: ' / '
plugin_api:
username: test
password: test
- default_culture: en
Modified: plugins/sfSympalPlugin/trunk/test/functional/AdminGenTest.php
===================================================================
--- plugins/sfSympalPlugin/trunk/test/functional/AdminGenTest.php
2010-02-17 09:15:08 UTC (rev 28071)
+++ plugins/sfSympalPlugin/trunk/test/functional/AdminGenTest.php
2010-02-17 10:24:20 UTC (rev 28072)
@@ -10,7 +10,7 @@
'sympal_users' => '/admin/security/user',
'sympal_groups' => '/admin/security/group',
'sympal_permissions' => '/admin/security/permission',
- 'sympal_content' => '/admin/content',
+ 'sympal_content' => '/admin/content/manage',
'sympal_content_types' => '/admin/content/types',
'sympal_sites' => '/admin/sites'
);
@@ -24,7 +24,6 @@
end()->
with('request')->begin()->
isParameter('module', $adminGenModule)->
- isParameter('action', 'index')->
end()->
click('Edit')->
with('request')->begin()->
Modified: plugins/sfSympalPlugin/trunk/test/unit/ConfigurationTest.php
===================================================================
--- plugins/sfSympalPlugin/trunk/test/unit/ConfigurationTest.php
2010-02-17 09:15:08 UTC (rev 28071)
+++ plugins/sfSympalPlugin/trunk/test/unit/ConfigurationTest.php
2010-02-17 10:24:20 UTC (rev 28072)
@@ -73,25 +73,25 @@
$t->is($sympalConfiguration->getCorePlugins(), $corePlugins,
'->getCorePlugins() returns the correct array');
-$installedPlugins = array_values($sympalConfiguration->getInstalledPlugins());
+$installedPlugins = array_values($sympalConfiguration->getDownloadedPlugins());
sort($installedPlugins); // sort the plugins - don't depend on file system to
return with consistent order
$t->is($installedPlugins, array(
'sfSympalBlogPlugin',
'sfSympalCommentsPlugin',
'sfSympalThemeTestPlugin'
-), '->getInstalledPlugins() returns the correct array of installed, non-core
plugins');
+), '->getDownloadedPlugins() returns the correct array of installed, non-core
plugins');
-$addonPlugins = $sympalConfiguration->getAddonPlugins();
-$t->is(in_array('sfSympalBlogPlugin', $addonPlugins), true,
'->getAddonPlugins() returns an array which includes sfSympalBlogPlugin');
-$t->is(in_array('sfSympalJwageThemePlugin', $addonPlugins), true,
'->getAddonPlugins() returns an array which includes sfSympalJwageThemePlugin');
+$addonPlugins = $sympalConfiguration->getDownloadablePlugins();
+$t->is(in_array('sfSympalBlogPlugin', $addonPlugins), true,
'->getDownloadablePlugins() returns an array which includes
sfSympalBlogPlugin');
+$t->is(in_array('sfSympalJwageThemePlugin', $addonPlugins), true,
'->getDownloadablePlugins() returns an array which includes
sfSympalJwageThemePlugin');
-$otherPlugins = array_values($sympalConfiguration->getOtherPlugins());
+$otherPlugins = array_values($sympalConfiguration->getDownloadedPlugins());
sort($otherPlugins); // sort the plugins - don't depend on file system to
return with consistent order
$t->is($otherPlugins, array(
'sfSympalBlogPlugin',
'sfSympalCommentsPlugin',
'sfSympalThemeTestPlugin'
-), '->getOtherPlugins() returns the correct array of installed, non-core
plugins (equivalent to getInstalledPlugins())');
+), '->getDownloadedPlugins() returns the correct array of installed, non-core
plugins (equivalent to getDownloadedPlugins())');
$pluginPaths = $sympalConfiguration->getPluginPaths();
--
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.
