Author: gimler
Date: 2010-02-07 20:53:26 +0100 (Sun, 07 Feb 2010)
New Revision: 27660
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmAutoSeoTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLayout.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolder.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolderTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPage.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmWidget.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoSynchronizer.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoValidator.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/service/dmBaseServiceContainer.php
Log:
[Diem] fix phpdocs
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmAutoSeoTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmAutoSeoTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmAutoSeoTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -24,7 +24,7 @@
->fetchOne();
}
- /*
+ /**
* @return DmAutoSeo created record
*/
public function createFromModuleAndAction($module, $action, $culture = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLayout.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLayout.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLayout.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -15,7 +15,7 @@
protected static
$areaTypes = array('top', 'bottom', 'left', 'right');
- /*
+ /**
* How many pages use this layout?
*/
public function getNbPages()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -4,7 +4,7 @@
class PluginDmLockTable extends myDoctrineTable
{
- /*
+ /**
* @return array usernames of current active users on the same page
*/
public function getLocks(array $data)
@@ -20,7 +20,7 @@
return $this->toUsernames($locks);
}
- /*
+ /**
* @return array usernames of current active users
*/
public function getUserNames()
@@ -44,7 +44,7 @@
return $usernames;
}
- /*
+ /**
* When a user displays a page
*/
public function update(array $data)
@@ -63,7 +63,7 @@
$this->removeOldLocks();
}
- /*
+ /**
* When receiving an ajax ping
*/
public function ping(array $data)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMedia.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -10,7 +10,7 @@
return $this->checkFileExists() ?
substr(md5(filemtime($this->getFullPath())), -5) : null;
}
- /*
+ /**
* Store a copy of the file in backup folder
*/
public function backup()
@@ -148,7 +148,7 @@
return substr($this->get('mime'), 0, strpos($this->get('mime'), '/'));
}
- /*
+ /**
* @return dmImage
*/
public function getImage()
@@ -190,7 +190,7 @@
return $this->create($file);
}
- /*
+ /**
* @return DmMedia the new media with $toMedia values
*/
public function copyTo(DmMedia $toMedia)
@@ -262,7 +262,7 @@
$this->mime = $mimeTypeResolver->getByFilename($this->getFullPath());
}
- /*
+ /**
* Important to set dimensions without reload data
*/
$this->set('dimensions', null, false);
@@ -317,7 +317,7 @@
throw new dmException(sprintf('Trying to save DmMedia with no existing
file : %s', $this->file));
}
- /*
+ /**
* If this media is new, and shares its name with another media in the
same folder,
* this media is not saved and the other one is updated with this media's
value
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolder.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolder.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolder.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -3,7 +3,7 @@
abstract class PluginDmMediaFolder extends BaseDmMediaFolder
{
- /*
+ /**
* Getter methods
*/
public function getName()
@@ -88,7 +88,7 @@
return $this->setCache('medias', $medias);
}
- /*
+ /**
* Check methods
*/
@@ -136,7 +136,7 @@
->exists();
}
- /*
+ /**
* Shortcut to ->getNode()->isRoot()
*/
public function isRoot()
@@ -144,7 +144,7 @@
return $this->getNode()->isRoot();
}
- /*
+ /**
* Setter methods
*/
@@ -153,7 +153,7 @@
return $this->_set('rel_path', trim($v, '/'));
}
- /*
+ /**
* Manipulation methods
*/
@@ -304,7 +304,7 @@
return $this->getService('media_synchronizer')->execute($this, $depth);
}
- /*
+ /**
* Same as getNode()->getParent()->id
* but will not hydrate full parent
*/
@@ -328,7 +328,7 @@
return $result[0];
}
- /*
+ /**
* Common methods
*/
@@ -337,7 +337,7 @@
return $this->get('rel_path').' ('.$this->get('id').')';
}
- /*
+ /**
* Override methods
*/
public function save(Doctrine_Connection $conn = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolderTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolderTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaFolderTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -36,7 +36,7 @@
return $record;
}
- /*
+ /**
* Performance shortcuts
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmMediaTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -4,7 +4,7 @@
class PluginDmMediaTable extends myDoctrineTable
{
- /*
+ /**
* Performance shortcuts
*/
public function findOneByIdWithFolder($id)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPage.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPage.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPage.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -18,7 +18,7 @@
protected static
$autoSeoFields = array('slug', 'name', 'title', 'h1', 'description',
'keywords');
- /*
+ /**
* Is this page source referring to me ?
*/
public function isSource($source)
@@ -26,7 +26,7 @@
return ($page = $this->getTable()->findOneBySource($source)) &&
$page->get('id') === $this->get('id');
}
- /*
+ /**
* Is this this page source referring to a parent of mine ?
*/
public function isDescendantOfSource($source)
@@ -34,7 +34,7 @@
return ($page = $this->getTable()->findOneBySource($source)) &&
$this->getNode()->isDescendantOf($page);
}
- /*
+ /**
* An automatic page represents an myDoctrineRecord object ( article,
product... )
* It will be created, updated and deleted according to its object
* Automatic pages with the same module will share the same DmPageView &
DmAutoSeo
@@ -153,7 +153,7 @@
return $this->get('module') == $module && $this->get('action') == $action;
}
- /*
+ /**
* Same as getNode()->getParent()->id
* but will not hydrate full parent
*/
@@ -236,7 +236,7 @@
);
}
- /*
+ /**
* SEO methods
*/
@@ -260,7 +260,7 @@
return self::$autoSeoFields;
}
- /*
+ /**
* @return boolean true if the field must be setted automatically
*/
public function isSeoAuto($seoField)
@@ -268,7 +268,7 @@
return strpos($this->get('auto_mod'), $seoField{0}) !== false;
}
- /*
+ /**
* Update auto_mod field according to modified fields
* when fieds are updated manualy
* if description has been changed,
@@ -305,7 +305,7 @@
return $this;
}
- /*
+ /**
* Get html produced by widgets in this page
* usefull for search engine indexation
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -7,7 +7,7 @@
$recordPageCache = array(),
$findByStringCache = array();
- /*
+ /**
* Check that basic pages exist
* ( main/root, main/error404, main/login )
* and, if they don't, will create them
@@ -67,7 +67,7 @@
}
}
- /*
+ /**
* Check that search page exist
* and, if doesn't, will create it
*/
@@ -149,7 +149,7 @@
unset($pages);
}
- /*
+ /**
* Queries
*/
@@ -167,7 +167,7 @@
->execute(array(), $hydrationMode);
}
- /*
+ /**
* Performance finder shortcuts
*/
public function findOneBySource($source)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmPageViewTable.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -12,7 +12,7 @@
->fetchRecord();
}
- /*
+ /**
* @return DmPageView created record
*/
public function createFromModuleAndAction($module, $action)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmWidget.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmWidget.class.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/model/doctrine/PluginDmWidget.class.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -12,7 +12,7 @@
*/
abstract class PluginDmWidget extends BaseDmWidget
{
- /*
+ /**
* Add the i18n or fallback i18n value to the widget array
*/
public function toArrayWithMappedValue()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoSynchronizer.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoSynchronizer.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoSynchronizer.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -59,7 +59,7 @@
return;
}
- /*
+ /**
* get autoSeo patterns
*/
$autoSeoRecord = dmDb::query('DmAutoSeo a')
@@ -86,7 +86,7 @@
unset($patterns['keywords']);
}
- /*
+ /**
* get pages
*/
$pdoPages = dmDb::pdo('
@@ -102,14 +102,14 @@
}
unset($pdoPages);
- /*
+ /**
* get records
*/
$records = $module->getTable()->createQuery('r INDEXBY r.id')
->withI18n($this->culture, $module->getModel(), 'r')
->fetchRecords();
- /*
+ /**
* get parent slugs
* if slug pattern starts with a /
* we don't use parent slug to build the page slug
@@ -141,12 +141,12 @@
// disable freeing records because it makes tests using records after
synchronisation fail.
//$records->free(true);
- /*
+ /**
* Save modifications
*/
if(!empty($modifiedPages))
{
- /*
+ /**
* Fix bug when no DmPage instance have been loaded yet
* ( this can happen when synchronization is run in a thread )
* DmPageTranslation class does not exist
@@ -211,17 +211,17 @@
}
}
- /*
+ /**
* Calculate replacements
*/
$replacements = $this->getReplacementsForPatterns($module, $patterns,
$record);
- /*
+ /**
* Assign replacements to patterns
*/
$values = $this->compilePatterns($patterns, $replacements, $parentSlug);
- /*
+ /**
* Compare obtained seo values with page values
*/
$modifiedFields = array();
@@ -294,7 +294,7 @@
$replacements[$this->wrap($placeholder)] = $this->culture;
continue;
}
- /*
+ /**
* Extract model and field from 'model.field' or 'model'
*/
if (strpos($placeholder, '.'))
@@ -309,7 +309,7 @@
$usedModuleKey = dmString::modulize($usedModuleKey);
$usedRecord = null;
- /*
+ /**
* Retrieve used record
*/
if ($usedModuleKey == $moduleKey)
@@ -327,7 +327,7 @@
if ($usedRecord instanceof dmDoctrineRecord)
{
- /*
+ /**
* get record value for field
*/
if ($field == '__toString')
@@ -460,7 +460,7 @@
return $result[0];
}
- /*
+ /**
* Static methods
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoValidator.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoValidator.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/seo/dmSeoValidator.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -27,7 +27,7 @@
{
$allValues = $duplicated = $this->getAttributesAsArrayKeys();
- /*
+ /**
* Let's store all page values
*/
$allPages = dmDb::query('DmPage p INDEXBY p.id')->fetchRecords();
@@ -49,7 +49,7 @@
}
}
- /*
+ /**
* Now, find values that hove more than one page
*/
foreach($allValues as $attribute => $values)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/service/dmBaseServiceContainer.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-02-07 19:51:27 UTC (rev 27659)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-02-07 19:53:26 UTC (rev 27660)
@@ -79,12 +79,12 @@
{
if (!dmConfig::isCli())
{
- /*
+ /**
* Connect the tree watcher to make it aware of database modifications
*/
$this->getService('page_tree_watcher')->connect();
- /*
+ /**
* Connect the cache cleaner
*/
$this->getService('cache_cleaner')->connect();
@@ -92,17 +92,17 @@
if ('test' != sfConfig::get('sf_environment'))
{
- /*
+ /**
* Connect the error watcher to make it aware of thrown exceptions
*/
$this->getService('error_watcher')->connect();
- /*
+ /**
* Connect the event log to make it aware of database modifications
*/
$this->getService('event_log')->connect();
- /*
+ /**
* Connect the request log to make it aware of controller end
*/
$this->getService('request_log')->connect();
@@ -110,12 +110,12 @@
if ($this->getService('response')->isHtmlForHuman())
{
- /*
+ /**
* Enable stylesheet compression
*/
$this->getService('stylesheet_compressor')->connect();
- /*
+ /**
* Enable javascript compression
*/
$this->getService('javascript_compressor')->connect();
@@ -123,7 +123,7 @@
$this->getService('user')->connect();
- /*
+ /**
* Enable page i18n builder for multilingual sites
*/
$cultures = $this->getService('i18n')->getCultures();
@@ -168,7 +168,7 @@
$this->setParameter('controller.action', $event['action']);
}
- /*
+ /**
* Compatibility with sfContext
*/
public function get($name, $class = null)
@@ -191,7 +191,7 @@
return $this;
}
- /*
+ /**
* Will recreate a new shared service
*/
public function reload($id)
--
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.
