Author: gimler
Date: 2010-02-07 20:55:48 +0100 (Sun, 07 Feb 2010)
New Revision: 27662
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/i18n/dmMessageFormat.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageSynchronizer.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageTreeWatcher.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/dmHelper.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmHtmlTag.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmRecursivePageList.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/dmMediaResource.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/tag/dmMediaTagImage.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/theme/dmTheme.php
Log:
[Diem] fix phpdocs
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/i18n/dmMessageFormat.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/i18n/dmMessageFormat.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/i18n/dmMessageFormat.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -1,6 +1,6 @@
<?php
-/*
+/**
* As Diem only runs on UTF-8,
* let's gain some microseconds
* bypassing utf8 conversions
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageSynchronizer.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageSynchronizer.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageSynchronizer.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -126,7 +126,7 @@
elseif(!$module->hasListPage()) // parent page is a show page
{
$record = $records[$showPage['record_id']];
- /*
+ /**
* If the parent is a show page, verify that it exists,
* unless the child page is useless
*/
@@ -178,7 +178,7 @@
foreach($projectModules as $moduleKey => $module)
{
- /*
+ /**
* Only root modules, wich have no parent, need a list page
*/
if (!isset($listPages[$moduleKey]))
@@ -230,7 +230,7 @@
return;
}
- /*
+ /**
* prepares pages to update
*/
$_showPages = dmDb::pdo('SELECT p.id, p.module, p.record_id, p.lft, p.rgt
FROM dm_page p WHERE p.module = ? AND p.action = ?', array(
@@ -246,12 +246,12 @@
{
$parentModule = $module;
- /*
+ /**
* prepare records
*/
$records = dmDb::pdo('SELECT r.id FROM
'.$module->getTable()->getTableName().' r')->fetchAll(PDO::FETCH_ASSOC);
- /*
+ /**
* prepare parent pages
*/
$parentPageIds = dmDb::pdo('SELECT p.id FROM dm_page p WHERE p.module =
? AND p.action = ?', array($moduleKey, 'list'))->fetch(PDO::FETCH_NUM);
@@ -274,7 +274,7 @@
));
}
- /*
+ /**
* prepare records
*/
$select = 'r.id';
@@ -284,7 +284,7 @@
}
$records = dmDb::pdo('SELECT '.$select.' FROM
'.$module->getTable()->getTableName().' r')->fetchAll(PDO::FETCH_ASSOC);
- /*
+ /**
* prepare parent pages
*/
$_parentPageIds = dmDb::pdo('SELECT p.id, p.record_id FROM dm_page p
WHERE p.module = ? AND p.action = ?', array($parentModule->getKey(),
'show'))->fetchAll(PDO::FETCH_NUM);
@@ -411,7 +411,7 @@
protected function getParentRecordIds(dmProjectModule $module,
dmProjectModule $parentModule)
{
- /*
+ /**
* if parent is local relation for module,
* we can prepare parent records
*/
@@ -432,7 +432,7 @@
$parentRecordIds[$_parentRecordId[0]] = $_parentRecordId[1];
}
}
- /*
+ /**
* if parent is association relation for module,
* we can prepare parent records
*/
@@ -459,7 +459,7 @@
$parentRecordIds[$value[1]] = $value[0];
}
}
- /*
+ /**
* parent records are to far to be prepared.
* they will be evaluated later.
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageTreeWatcher.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageTreeWatcher.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/page/dmPageTreeWatcher.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -108,7 +108,7 @@
$modifiedModules = array();
foreach($this->modifiedTables as $table)
{
- /*
+ /**
* If table belongs to a project module,
* it may interact with tree
*/
@@ -119,7 +119,7 @@
$modifiedModules[] = $module->getKey();
}
}
- /*
+ /**
* If table owns project tables,
* it may interact with tree
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/test/dmCoreFunctionalCoverageTest.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -41,7 +41,7 @@
{
$this->login();
}
- /*
+ /**
* Preload cache to ensure stats consistency
*/
$this->browser->get('');
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/dmHelper.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/dmHelper.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/dmHelper.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -29,7 +29,7 @@
public function renderPartial($moduleName, $actionName, $vars = array())
{
- /*
+ /**
* partial -> _partial
* dir/partial -> dir/partial
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmHtmlTag.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmHtmlTag.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmHtmlTag.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -65,7 +65,7 @@
$this->setOption($name, $value);
}
}
- /*
+ /**
* As value is null,
* name probably contains inlined data
*/
@@ -87,7 +87,7 @@
return $this;
}
- /*
+ /**
* get an option by key
* @return mixed option value or default
*/
@@ -140,7 +140,7 @@
protected function convertAttributesToHtml(array $attributes)
{
- /*
+ /**
* Implode classes
*/
if (isset($attributes['class']))
@@ -148,7 +148,7 @@
$attributes['class'] = dmArray::toHtmlCssClasses($attributes['class']);
}
- /*
+ /**
* Remove non html attributes
*/
foreach($this->attributesToRemove as $key)
@@ -159,12 +159,12 @@
}
}
- /*
+ /**
* Remove empty attributes
*/
$attributes = dmArray::unsetEmpty($attributes,
$this->emptyAttributesToRemove);
- /*
+ /**
* Convert attributes array into html string params
*/
$htmlAttributesString = '';
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmRecursivePageList.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmRecursivePageList.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/dmRecursivePageList.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -57,7 +57,7 @@
{
$id = $page[0];
- /*
+ /**
* First time, don't insert nothing
*/
if ($this->lastLevel === false)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -103,7 +103,7 @@
public function renderMetas()
{
- /*
+ /**
* Allow listeners of dm.response.filter_metas event
* to filter and modify the metas list
*/
@@ -145,7 +145,7 @@
public function renderStylesheets()
{
- /*
+ /**
* Allow listeners of dm.layout.filter_stylesheets event
* to filter and modify the stylesheets list
*/
@@ -174,7 +174,7 @@
return $html;
}
- /*
+ /**
* JavaScript libs declared in dm_js_head_inclusion
* are declared in the <head> section
*/
@@ -199,7 +199,7 @@
public function renderJavascripts()
{
- /*
+ /**
* Allow listeners of dm.layout.filter_javascripts event
* to filter and modify the javascripts list
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -37,7 +37,7 @@
return false;
}
- /*
+ /**
* @return string baseHref the href without query string
*/
abstract protected function getBaseHref();
@@ -49,7 +49,7 @@
: $this->requestContext['script_name'];
}
- /*
+ /**
* Set text
* @return dmLinkTag $this
*/
@@ -58,7 +58,7 @@
return $this->setOption('text', (string) $v);
}
- /*
+ /**
* Set title
* @return dmLinkTag $this
*/
@@ -67,7 +67,7 @@
return $this->setOption('title', (string) $v);
}
- /*
+ /**
* Set text and title
* @return dmLinkTag $this
*/
@@ -76,7 +76,7 @@
return $this->text($v)->title($v);
}
- /*
+ /**
* Set link target
* @return dmLinkTag $this
*/
@@ -90,7 +90,7 @@
return $this->setOption('target', strtolower($v));
}
- /*
+ /**
* Add an anchor
* @return dmLinkTag $this
*/
@@ -99,7 +99,7 @@
return $this->setOption('anchor', trim((string) $v, '#'));
}
- /*
+ /**
* Add a request parameter
* @return dmLinkTag $this
*/
@@ -108,7 +108,7 @@
return $this->params(array($key => $value));
}
- /*
+ /**
* Add request parameters
* @return dmLinkTag $this
*/
@@ -122,7 +122,7 @@
return $this->setOption('params', array_merge($this->get('params',
array()), $params));
}
- /*
+ /**
* Whether to display current links with span tag
* @return dmLinkTag $this
*/
@@ -131,7 +131,7 @@
return $this->setOption('current_span', (bool) $bool);
}
- /*
+ /**
* Sets the current css class
* @return dmLinkTag $this
*/
@@ -140,7 +140,7 @@
return $this->setOption('current_class', (string) $class);
}
- /*
+ /**
* Sets the parent css class
* @return dmLinkTag $this
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/dmMediaResource.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/dmMediaResource.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/dmMediaResource.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -122,7 +122,7 @@
$source = str_replace('%culture%', $this->culture, $source);
}
- /*
+ /**
* Server full path
*/
if(strpos($source, sfConfig::get('sf_web_dir')) === 0)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/tag/dmMediaTagImage.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/tag/dmMediaTagImage.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/html/media/tag/dmMediaTagImage.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -256,7 +256,7 @@
$filter = dmArray::get($attributes, 'filter');
$overlay = dmArray::get($attributes, 'overlay', array());
- /*
+ /**
* Nothing to change, return the original image
*/
if ($attributes['width'] == $media->getWidth() && $attributes['height'] ==
$media->getHeight() && !$filter && !$overlay)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/theme/dmTheme.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/theme/dmTheme.php
2010-02-07 19:54:43 UTC (rev 27661)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/view/theme/dmTheme.php
2010-02-07 19:55:48 UTC (rev 27662)
@@ -121,7 +121,7 @@
return $this->getBasePath().$this->getPath($path);
}
- /*
+ /**
* public path
* example : /theme/css/style.css or /public_html/theme/css/style.css if no
virtual host
*/
@@ -130,7 +130,7 @@
return $this->requestContext['relative_url_root'].$this->getPath($path);
}
- /*
+ /**
* full public path
* example : http://mysite.com/theme/css/style.css or
http://localhost/mysite/public_html/theme/css/style.css if no virtual host
*/
@@ -139,7 +139,7 @@
return $this->requestContext['absolute_url_root'].$this->getPath($path);
}
- /*
+ /**
* path from web dir
* example : /theme/css/style.css
*/
--
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.
