Author: gimler
Date: 2010-02-07 20:54:43 +0100 (Sun, 07 Feb 2010)
New Revision: 27661
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/context/dmContext.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmForm.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmFormDoctrine.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/DmMediaForRecordForm.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/PluginDmRedirectForm.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/helper/DmHelper.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/request/dmWebRequest.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/routing/dmPatternRouting.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/user/dmCoreUser.php
Log:
[Diem] fix phpdocs
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/context/dmContext.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/context/dmContext.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/context/dmContext.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -48,12 +48,12 @@
// connect the service container and its services to the event dispatcher
$this->serviceContainer->connect();
- /*
+ /**
* dmForm requires service container...
*/
dmForm::setServiceContainer($this->serviceContainer);
- /*
+ /**
* some classes needs the event dispatcher to communicate
* and the service container...
*/
@@ -104,7 +104,7 @@
&& $this->factories['response']->isHtml()
);
- /*
+ /**
* Configure i18n
*/
$this->factories['i18n']->setUseInternalCatalogue($this->getUser()->can('admin'));
@@ -118,7 +118,7 @@
dmModule::setManager($this->factories['module_manager']);
}
- /*
+ /**
* Loads the diem services
*/
protected function loadServiceContainer()
@@ -179,7 +179,7 @@
$loader = new dmServiceContainerLoaderConfiguration($sc,
$this->dispatcher);
$loader->load(dmConfig::getAll());
- /*
+ /**
* Allow listeners of dm.service_container.pre_dump event
* to modify the loader
*/
@@ -205,7 +205,7 @@
unset($dumper, $loader, $sc);
}
- /*
+ /**
* Load the required classes to load a service container from yml
configuration
*/
public function loadServiceContainerExtraStuff()
@@ -218,7 +218,7 @@
}
}
- /*
+ /**
* @return sfServiceContainer
*/
public function getServiceContainer()
@@ -226,7 +226,7 @@
return $this->serviceContainer;
}
- /*
+ /**
* @return dmCacheManager
*/
public function getCacheManager()
@@ -234,7 +234,7 @@
return $this->serviceContainer->getService('cache_manager');
}
- /*
+ /**
* @return dmFilesystem
*/
public function getFilesystem()
@@ -242,7 +242,7 @@
return $this->serviceContainer->getService('filesystem');
}
- /*
+ /**
* @return dmHelper
*/
public function getHelper()
@@ -250,7 +250,7 @@
return $this->helper;
}
- /*
+ /**
* @return dmModuleManager
*/
public function getModuleManager()
@@ -291,7 +291,7 @@
return $this->getModuleName() === $module && $this->getActionName() ===
$action;
}
- /*
+ /**
* @return DmPage the current page object
*/
public function getPage()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmForm.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmForm.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmForm.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -214,7 +214,7 @@
return $return;
}
- /*
+ /**
* Usefull for debugging : will throw the error exception
*/
public function throwError()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmFormDoctrine.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmFormDoctrine.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/dmFormDoctrine.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -10,7 +10,7 @@
*/
abstract class dmFormDoctrine extends sfFormDoctrine
{
- /*
+ /**
* Unset automatic fields like 'created_at', 'updated_at', 'position'
*/
protected function unsetAutoFields($autoFields = null)
@@ -79,7 +79,7 @@
->where('m.dm_media_folder_id = ?',
$values[$formName]['dm_media_folder_id'])
->andWhere('m.file = ?', $values[$formName]['file']->getOriginalName())
->fetchRecord();
- /*
+ /**
* We have a media with same folder / filename
* let's reuse the media, and replace the file
*/
@@ -89,7 +89,7 @@
$this->embeddedForms[$formName]->setObject($existingMedia);
}
- /*
+ /**
* We have a new file for an existing media.
* Let's create a new media
*/
@@ -131,7 +131,7 @@
$this->mergeForm($this->createI18nForm());
}
- /*
+ /**
* Create current i18n form
*/
protected function createI18nForm($culture = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/DmMediaForRecordForm.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/DmMediaForRecordForm.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/DmMediaForRecordForm.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -8,7 +8,7 @@
public static function factory(myDoctrineRecord $record, $local, $alias,
$required)
{
- /*
+ /**
* Check first is local column has a value
* not to modify the record
*/
@@ -48,7 +48,7 @@
{
$this->getValidator('file')->setOption('required', $required &&
$this->getValidator('file')->getOption('required'));
- /*
+ /**
* Add checkbox to remove Media
*/
if(!$required && $this->object->exists() &&
!isset($this->widgetSchema['remove']))
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/PluginDmRedirectForm.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/PluginDmRedirectForm.class.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/form/doctrine/PluginDmRedirectForm.class.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -13,7 +13,7 @@
public function setup()
{
parent::setup();
- /*
+ /**
* Here, the plugin form code
*/
}
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/helper/DmHelper.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/helper/DmHelper.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/helper/DmHelper.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -5,7 +5,7 @@
return dmString::escape($text);
}
-/*
+/**
* @return dmLinkTag a link to $source
*/
function _link($source = null)
@@ -17,7 +17,7 @@
return _link($source);
}
-/*
+/**
* @return dmMediaTag
*/
function _media($source)
@@ -29,7 +29,7 @@
return _media($source);
}
-/*
+/**
* @return dmTableTag
*/
function _table()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/request/dmWebRequest.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/request/dmWebRequest.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/request/dmWebRequest.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -22,7 +22,7 @@
*/
public function isXmlHttpRequest()
{
- /*
+ /**
* When a file is submitted during an ajax request,
* parent::isXmlHttpRequest() returns false,
* so we have to specify the request parameter dm_xhr
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/routing/dmPatternRouting.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/routing/dmPatternRouting.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/routing/dmPatternRouting.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -4,12 +4,12 @@
{
public function initialize(sfEventDispatcher $dispatcher, sfCache $cache =
null, $options = array())
{
- /*
+ /**
* This option is great only if APC is active
*/
$options['lookup_cache_dedicated_keys'] = dmAPCCache::isEnabled();
- /*
+ /**
* Performance cost on debug on is too high
*/
$options['debug'] = false;
@@ -17,7 +17,7 @@
parent::initialize($dispatcher, $cache, $options);
}
- /*
+ /**
* Disable cache when the request contain a "_" paremeter
* This parameter is set randomly by jQuery to avoid browser cache
* Cache it quickly leads to thousands cache entries
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/user/dmCoreUser.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/user/dmCoreUser.php
2010-02-07 19:53:26 UTC (rev 27660)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/user/dmCoreUser.php
2010-02-07 19:54:43 UTC (rev 27661)
@@ -22,7 +22,7 @@
}
}
- /*
+ /**
* Guess user's browser
* @return dmBrowser browser object
*/
@@ -42,7 +42,7 @@
$this->browser = $browser;
}
- /*
+ /**
* Adds a value to a flash array
*/
public function addFlash($name, $value, $persist = true)
@@ -53,7 +53,7 @@
)), $persist);
}
- /*
+ /**
* Log methods
*/
public function logInfo($message, $persist = true)
@@ -71,7 +71,7 @@
return $this->addFlash('dm_log_error', $message, $persist);
}
- /*
+ /**
* Cache methods
*/
public function getCache($cacheKey)
--
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.
