Author: gimler
Date: 2010-02-07 21:02:21 +0100 (Sun, 07 Feb 2010)
New Revision: 27663
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/browser/dmBrowser.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/dmCacheManager.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmAPCCache.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmFileCache.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmMetaCache.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/controller/dmFrontWebController.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/core/dmBase.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/debug/dmDebug.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/diff/dmRecordTextDiff.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/collection/dmDoctrineCollection.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/database/dmDb.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmTableRelationHolder.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/exception/dmException.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/markdown/dmMarkdown.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/media/dmMediaSynchronizer.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/menu/dmMenu.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/os/dmOs.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmFileBackup.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmProject.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/response/dmWebResponse.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchIndex.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchPageDocument.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/task/dmUpgradeTask.class.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/widget/sfWidgetFormDmInputFile.class.php
Log:
[Diem] fix phpdocs
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/browser/dmBrowser.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/browser/dmBrowser.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/browser/dmBrowser.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -21,7 +21,7 @@
$this->name = $this->version = null;
}
- /*
+ /**
* Minimal browser detection from user agent.
* It has the advantage of being compact and
* fairly performant as well, since it doesn't
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/dmCacheManager.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/dmCacheManager.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/dmCacheManager.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -39,7 +39,7 @@
return $this->caches[$cacheName];
}
- /*
+ /**
* remove all cache instances created
* does NOT clear caches content
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmAPCCache.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmAPCCache.class.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmAPCCache.class.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -47,7 +47,7 @@
return $data;
}
- /*
+ /**
* will not unserialize result
*/
public function _get($key, $default = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmFileCache.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmFileCache.class.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmFileCache.class.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -18,7 +18,7 @@
return parent::set($key, serialize($data), $lifetime);
}
- /*
+ /**
* will not serialize result
*/
public function _set($key, $data, $lifetime = null)
@@ -38,7 +38,7 @@
return $data;
}
- /*
+ /**
* will not unserialize result
*/
public function _get($key, $default = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmMetaCache.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmMetaCache.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/cache/driver/dmMetaCache.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -27,7 +27,7 @@
return $this->cache->get($key, $default);
}
- /*
+ /**
* will not unserialize result
*/
public function _get($key, $default = null)
@@ -45,7 +45,7 @@
return $this->cache->set($key, $data, $lifetime);
}
- /*
+ /**
* will not serialize result
*/
public function _set($key, $data, $lifetime = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/controller/dmFrontWebController.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/controller/dmFrontWebController.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/controller/dmFrontWebController.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -2,7 +2,7 @@
class dmFrontWebController extends sfFrontWebController
{
- /*
+ /**
* @see sfFrontWebController
*/
public function redirect($url, $delay = 0, $statusCode = 302)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/core/dmBase.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/core/dmBase.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/core/dmBase.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -50,7 +50,7 @@
return self::$startTime;
}
- /*
+ /**
* All context creations are made here.
* You can replace here the dmContext class by your own.
*/
@@ -104,7 +104,7 @@
return $parts[0].'.'.$parts[1];
}
- /*
+ /**
* Symfony common objects accessors
*/
@@ -113,7 +113,7 @@
return dmContext::getInstance()->getRouting();
}
- /*
+ /**
* @return dmWebRequest
*/
public static function getRequest()
@@ -158,11 +158,11 @@
return dmContext::getInstance()->getHelper();
}
- /*
+ /**
* Gadgets
*/
- /*
+ /**
* Diem code size
* returns array(files, lines, characters)
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/debug/dmDebug.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/debug/dmDebug.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/debug/dmDebug.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -24,7 +24,7 @@
return sfTimerManager::getTimer('[Diem] '.$name);
}
- /*
+ /**
* @return sfTimer if logging is enabled or null if logging is disabled
*/
public static function timerOrNull($name)
@@ -37,7 +37,7 @@
return null;
}
- /*
+ /**
* How many time elapsed since request ?
*/
public static function getTimeFromStart()
@@ -45,7 +45,7 @@
return sprintf('%.0f', (microtime(true) - dm::getStartTime()) * 1000);
}
- /*
+ /**
* Builds an string
*
* @param $something Any PHP type
@@ -81,7 +81,7 @@
}
- /*
+ /**
* Logs all parameters with symfony logger
*/
public static function log()
@@ -89,7 +89,7 @@
dmContext::getInstance()->getLogger()->err(self::formatAsString(func_get_args()));
}
- /*
+ /**
* Shows all parameter in the page with a <div>
*/
public static function show()
@@ -97,7 +97,7 @@
return self::debugger(func_get_args(), 2, array('tag' => 'div'));
}
- /*
+ /**
* Shows all parameter in the page with a <pre>
*/
public static function showPre()
@@ -105,7 +105,7 @@
return self::debugger(func_get_args(), 2, array("tag" => "pre"));
}
- /*
+ /**
* Shows all parameter in the page with a <div>
*/
public static function traceShow()
@@ -113,7 +113,7 @@
return self::debugger(func_get_args(), 2, array("tag" => "div"));
}
- /*
+ /**
* Shows all parameter in the page with a <pre>, even if debugging is
disabled
*/
public static function traceForce()
@@ -166,7 +166,7 @@
echo $result;
}
- /*
+ /**
* Displays a debug backtrace improved with javascript
*/
public static function stack($msg = "")
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/diff/dmRecordTextDiff.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/diff/dmRecordTextDiff.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/diff/dmRecordTextDiff.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -25,7 +25,7 @@
$this->table = $fromVersion->getTable();
}
- /*
+ /**
* @return array Diffs for each field
*/
public function getHtmlDiffs(array $fields)
@@ -40,7 +40,7 @@
return $diffs;
}
- /*
+ /**
* @return string Diff for one field
*/
public function getHtmlDiff($field)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/collection/dmDoctrineCollection.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/collection/dmDoctrineCollection.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/collection/dmDoctrineCollection.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -34,7 +34,7 @@
return parent::processDiff();
}
- /*
+ /**
* Return array representation of this collection
*
* @return array An array representation of the collection
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/database/dmDb.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/database/dmDb.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/database/dmDb.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -5,7 +5,7 @@
protected static
$tables;
- /*
+ /**
* Shortcut for myDoctrineQuery::create
*
* @return myDoctrineQuery the query with filled from
@@ -28,7 +28,7 @@
return $query;
}
- /*
+ /**
* Shortcut for Doctrine_Core::getTable
* @return myDoctrineTable the table for this model class name
*/
@@ -37,7 +37,7 @@
return Doctrine_Core::getTable(dmString::camelize($class));
}
- /*
+ /**
* Create, populate and return a new record
* @return myDoctrineRecord the new, hydrated, non-saved record
*/
@@ -46,7 +46,7 @@
return self::table($class)->create($values);
}
- /*
+ /**
* @return PDOStatement
*/
public static function pdo($query, array $values = array(),
Doctrine_Connection $conn = null)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/query/dmDoctrineQuery.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -41,7 +41,7 @@
return $this;
}
- /*
+ /**
* Join translation results if they exist
* if $model is specified, will verify that it has I18n
* return @myDoctrineQuery $this
@@ -81,7 +81,7 @@
->leftJoin($rootAlias.'.Translation '.$translationAlias.' ON
'.$rootAlias.'.id = '.$translationAlias.'.id AND '.$translationAlias.'.lang =
?', $culture);
}
- /*
+ /**
* Join media for this columnName or alias
* return @dmDoctrineQuery $this
*/
@@ -118,7 +118,7 @@
return $this->addWhere($this->getRootAlias().'.is_active = ?', (bool)
$boolean);
}
- /*
+ /**
* Will restrict results to $model records
* associated with $ancestor record
*/
@@ -127,7 +127,7 @@
return $this->whereAncestorId(get_class($ancestorRecord),
$ancestorRecord->get('id'), $model);
}
- /*
+ /**
* Will restrict results to $model records
* associated with $ancestorModel->$ancestorId record
*/
@@ -194,7 +194,7 @@
return $this;
}
- /*
+ /**
* Will restrict results to $model records
* associated with $descendant record
*/
@@ -203,7 +203,7 @@
return $this->whereDescendantId(get_class($descendantRecord),
$descendantRecord->get('id'), $model);
}
- /*
+ /**
* Will restrict results to $model records
* associated with $descendantModel->$descendantId record
*/
@@ -253,7 +253,7 @@
return $this;
}
- /*
+ /**
* Add asc order by position field
* if $model is specified, will verify that it has I18n
* @return myDoctrineQuery $this
@@ -274,7 +274,7 @@
->addOrderBy("$me.position asc");
}
- /*
+ /**
* returns join alias for a given relation alias, if joined
* ex: "Elem e, e.Categ my_categ"
* alias for joined relation Categ = my_categ
@@ -299,7 +299,7 @@
return null;
}
- /*
+ /**
* @return myDoctrineCollection|null the fetched collection
*/
public function fetchRecords($params = array())
@@ -307,7 +307,7 @@
return $this->execute($params, Doctrine_Core::HYDRATE_RECORD);
}
- /*
+ /**
* Add limit(1) to the query,
* then execute $this->fetchOne()
* @return myDoctrineRecord|null the fetched record
@@ -332,7 +332,7 @@
return $this->fetchOne($params, Doctrine_Core::HYDRATE_ARRAY);
}
- /*
+ /**
* fetch brutal PDO array with numeric keys
* @return array PDO result
*/
@@ -341,7 +341,7 @@
return $this->execute($params, DOCTRINE::HYDRATE_NONE);
}
- /*
+ /**
* fetch brutal flat array with numeric keys
* @return array PDO result
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/record/dmDoctrineRecord.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -42,7 +42,7 @@
return $this->get('Translation')->get(self::getDefaultCulture());
}
- /*
+ /**
* Add page tree watcher registering
*/
public function preSave($event)
@@ -59,7 +59,7 @@
}
}
- /*
+ /**
* Add page tree watcher registering
*/
public function postDelete($event)
@@ -119,7 +119,7 @@
return $map;
}
- /*
+ /**
* Tries to return the nearest records in table
*/
public function getNearRecords(dmDoctrineQuery $q, $nb = 11)
@@ -169,7 +169,7 @@
return $rPk->fetchRecords();
}
- /*
+ /**
* Tries to return the previous record in table
*/
public function getPreviousRecord(Doctrine_Collection $nearRecords)
@@ -191,7 +191,7 @@
return $nearRecords[$myOffset-1];
}
- /*
+ /**
* Tries to return the next record in table
*/
public function getNextRecord(Doctrine_Collection $nearRecords)
@@ -213,7 +213,7 @@
return $nearRecords[$myOffset+1];
}
- /*
+ /**
* add fluent interface to @see parent::fromArray
* @return myDoctrineRecord $this ( fluent interface )
*/
@@ -223,7 +223,7 @@
return $this;
}
- /*
+ /**
* @return DmMediaFolder the DmMediaFolder used to store this record's medias
*/
public function getDmMediaFolder()
@@ -231,7 +231,7 @@
return $this->_table->getDmMediaFolder();
}
- /*
+ /**
* @return DmMedia the associated media for this columnName or null
*/
public function getDmMediaByColumnName($columnName)
@@ -260,7 +260,7 @@
// return $relation->fetchRelatedFor($this);
}
- /*
+ /**
* sets a DmMedia record associated to this columnName
* @return DmMedia the newly associated media for this columnName
*/
@@ -283,7 +283,7 @@
->set($columnName, $media ? $media->get('id') : null);
}
- /*
+ /**
* @return dmModule this record module
*/
public function getDmModule()
@@ -291,7 +291,7 @@
return $this->_table->getDmModule();
}
- /*
+ /**
* @return dmPage this record page
*/
public function getDmPage()
@@ -304,7 +304,7 @@
return dmDb::table('DmPage')->findOneByRecordWithI18n($this);
}
- /*
+ /**
* Will find in module ancestors the requested model
* and return the ancestor record for this model
* @return myDoctrineRecord the ancestor record
@@ -329,7 +329,7 @@
->fetchOne();
}
- /*
+ /**
* Will find in module ancestors the requested model
* and return the ancestor record id for this model
* @return int the ancestor record id
@@ -354,7 +354,7 @@
->fetchValue();
}
- /*
+ /**
* Returns one record related to this one by $alias
* LocalKey relation : the related record
* ForeignKey && Association relation : the first related record
@@ -395,7 +395,7 @@
}
}
- /*
+ /**
* Return null if this record is new
* @return dmDoctrineRecord | null
*/
@@ -435,7 +435,7 @@
return $string;
}
- /*
+ /**
* Shortcut to __toString method
* used by admin generator
*/
@@ -444,7 +444,7 @@
return $this->__toString();
}
- /*
+ /**
* Return array representation of this record
*
* @return array An array representation of the record.
@@ -562,7 +562,7 @@
return $this->_get($fieldName, $load);
}
- /*
+ /**
* Pure overload without parent::_get
*/
public function _get($fieldName, $load = true)
@@ -721,7 +721,7 @@
return $this->i18nFallback;
}
- /*
+ /**
* Allow to set values by modulized fieldName
* ex : _get('cssClass') returns _get('css_class')
*/
@@ -759,7 +759,7 @@
return $this->getTable()->getModuleManager();
}
- /*
+ /**
* Hack to make Versionable behavior work with I18n tables
* it will add a where clause on the current culture
* to avoid selecting versions for all cultures.
@@ -818,7 +818,7 @@
$this->_data = $data;
}
- /*
+ /**
* dmMicroCache
*/
protected
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -7,7 +7,7 @@
$moduleManager, // mandatory
$serviceContainer; // optional
- /*
+ /**
* @return DmMediaFolder the DmMediaFolder used to store this table's
record's medias
*/
public function getDmMediaFolder()
@@ -19,7 +19,7 @@
return $this->setCache('dm_media_folder',
dmDb::table('DmMediaFolder')->findOneByRelPathOrCreate($this->getDmModule()->getUnderscore()));
}
- /*
+ /**
* @return bool if this table's records interact with page tree
* so if a record is saved or deleted, page tree must be updated
*/
@@ -60,7 +60,7 @@
return $this->setCache('interacts_with_page_tree', $interacts);
}
- /*
+ /**
* @return myDoctrineRecord the first record in the table
*/
public function findOne()
@@ -68,7 +68,7 @@
return $this->createQuery()->fetchRecord();
}
- /*
+ /**
* Will join all record available medias
* @return myDoctrineQuery
*/
@@ -82,7 +82,7 @@
return $query;
}
- /*
+ /**
* Will join all localKey relations
* @return myDoctrineQuery
*/
@@ -103,7 +103,7 @@
return $this->joinAll()->execute($params, $hydrationMode);
}
- /*
+ /**
* Will join all relations
* @return myDoctrineQuery
*/
@@ -157,7 +157,7 @@
return $query;
}
- /*
+ /**
* Will join named relations
*/
public function joinRelations(array $aliases)
@@ -191,7 +191,7 @@
return $query;
}
- /*
+ /**
* @return dmDoctrine query
* the default admin list query
*/
@@ -200,7 +200,7 @@
return $this->joinAll($query);
}
- /*
+ /**
* add i18n columns if needed
*/
public function getAllColumns()
@@ -230,7 +230,7 @@
return false;
}
- /*
+ /**
* Return columns that a human can fill
* Will exclude primary key, timestampable fields
*/
@@ -376,7 +376,7 @@
return false !==
strpos(dmArray::get($this->getColumnDefinition($columnName), 'extra', ''),
'link');
}
- /*
+ /**
* Tries to find a column name that could be used to represent a record of
this table
*/
public function getIdentifierColumnName()
@@ -417,7 +417,7 @@
return $this->setCache('dm_primary_keys', $primaryKeys);
}
- /*
+ /**
* Will return pk column name if table has only one pk, or null
*/
public function getPrimaryKey()
@@ -430,7 +430,7 @@
return null;
}
- /*
+ /**
* @return dmTableRelationHolder the table relation holder
*/
public function getRelationHolder()
@@ -476,7 +476,7 @@
unset($records, $modifiedRecords);
}
- /*
+ /**
* return dmModule this record module
*/
public function getDmModule()
@@ -488,7 +488,7 @@
return $this->setCache('dm_module',
$this->getModuleManager()->getModuleByModel($this->getComponentName()));
}
- /*
+ /**
* Usefull for generators ( admin, form, filter )
*/
public function getSfDoctrineColumns()
@@ -503,7 +503,7 @@
return $columns;
}
- /*
+ /**
* dmMicroCache
*/
protected
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmTableRelationHolder.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmTableRelationHolder.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/doctrine/table/dmTableRelationHolder.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -132,7 +132,7 @@
}
- /*
+ /**
* @return array LocalKey Relations with class === DmMedia
*/
public function getLocalMedias()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/exception/dmException.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/exception/dmException.class.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/exception/dmException.class.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -8,7 +8,7 @@
return parent::__construct(strip_tags($message));
}
- /*
+ /**
* Builds an exception
*
* @param $something Any PHP type
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/markdown/dmMarkdown.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/markdown/dmMarkdown.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/markdown/dmMarkdown.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -130,7 +130,7 @@
}
- /*
+ /**
* Link system replacement
*/
@@ -215,7 +215,7 @@
return $this->hashPart($link->render());
}
- /*
+ /**
* Image system replacement
*/
@@ -323,7 +323,7 @@
}
- /*
+ /**
* Very fast function to translate markdown text to pure text without
formatting
* This function is less efficient than toText
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/media/dmMediaSynchronizer.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/media/dmMediaSynchronizer.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/media/dmMediaSynchronizer.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -134,7 +134,7 @@
}
}
- /*
+ /**
* Sanitize files name (moves file if non regular name)
*/
protected function sanitizeFile($file)
@@ -155,7 +155,7 @@
return $file;
}
- /*
+ /**
* Sanitize dirs name (move dirs)
*/
protected function sanitizeDir($dir)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/menu/dmMenu.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/menu/dmMenu.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/menu/dmMenu.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -44,7 +44,7 @@
);
}
- /*
+ /**
* Setters
*/
@@ -99,7 +99,7 @@
return $this->setOption('li_class', $class);
}
- /*
+ /**
* Display ID html attributes ?
*/
public function showId($bool)
@@ -140,7 +140,7 @@
return $this;
}
- /*
+ /**
* Getters
*/
@@ -224,7 +224,7 @@
return $this->children[$name];
}
- /*
+ /**
* Checks
*/
@@ -265,7 +265,7 @@
return isset($this->children[$name]);
}
- /*
+ /**
* Manipulation
*/
@@ -305,7 +305,7 @@
return $this;
}
- /*
+ /**
* Recursively add children based on the page structure
*/
public function addRecursiveChildren($depth = 1)
@@ -335,7 +335,7 @@
return $this;
}
- /*
+ /**
* Rendering
*/
@@ -535,7 +535,7 @@
return $this->parent && ($this->parent->count() === $this->num);
}
- /*
+ /**
* Interfaces implementations
*/
@@ -594,7 +594,7 @@
return $this->removeChild($name);
}
- /*
+ /**
* Service getters
*/
public function getI18n()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/os/dmOs.php
===================================================================
--- plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/os/dmOs.php
2010-02-07 19:55:48 UTC (rev 27662)
+++ plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/os/dmOs.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -2,7 +2,7 @@
class dmOs
{
- /*
+ /**
* Builds a path with many path parts
*
* dmOs("/home/user/", "/dir", "sub_dir", "file.ext")
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmFileBackup.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmFileBackup.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmFileBackup.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -45,7 +45,7 @@
return $this->filesystem->deleteDirContent($this->getDir());
}
- /*
+ /**
* Backup a file
* return boolean success
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmProject.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmProject.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/project/dmProject.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -10,7 +10,7 @@
$allModels,
$dmModels;
- /*
+ /**
* Returns project key based on his dir_name
*/
public static function getKey()
@@ -23,7 +23,7 @@
return self::$key;
}
- /*
+ /**
* Returns project key based on his root dir
*/
public static function getHash()
@@ -137,7 +137,7 @@
return dmOs::normalize(self::getRootDir());
}
- /*
+ /**
* remove sfConfig::get('sf_root_dir') from path
*/
public static function unRootify($path)
@@ -150,7 +150,7 @@
return trim($path, '/');
}
- /*
+ /**
* add sfConfig::get('sf_root_dir') to path
*/
public static function rootify($path)
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/response/dmWebResponse.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/response/dmWebResponse.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/response/dmWebResponse.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -255,7 +255,7 @@
return $javascripts;
}
- /*
+ /**
* Means that request has been sent by a human, and the application will
send html for a browser.
* CLI, ajax and flash are NOT human.
* @return boolean $human
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchIndex.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchIndex.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchIndex.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -180,7 +180,7 @@
->andWhere('p.module != ? OR ( p.action != ? AND p.action != ? AND
p.action != ?)', array('main', 'error404', 'search', 'login'));
}
- /*
+ /**
* @return array of words we do not want to index ( like "the", "a", to"... )
*/
public function getStopWords()
@@ -197,7 +197,7 @@
}
- /*
+ /**
* @return Zend_Search_Lucene_Proxy instance
*/
public function getLuceneIndex()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchPageDocument.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchPageDocument.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/search/dmSearchPageDocument.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -66,7 +66,7 @@
$this->addField($field);
}
- /*
+ /**
* @todo retrieve html nodes text ( better than
Zend_Search_Lucene_Document_Html )
*/
protected function getPageBodyText()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/task/dmUpgradeTask.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/task/dmUpgradeTask.class.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/task/dmUpgradeTask.class.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -52,7 +52,7 @@
}
}
- /*
+ /**
* Rename IHM setting group
*/
protected function upgradeTo500ALPHA4()
@@ -64,7 +64,7 @@
->execute();
}
- /*
+ /**
* Fix login and secure module/action in admin/front settings.yml
*/
protected function upgradeTo500ALPHA6()
@@ -100,7 +100,7 @@
}
}
- /*
+ /**
* Change dmWidgetContent.media widgets to dmWidgetContent.image widgets in
database
*/
protected function upgradeToDeprecateMediaWidgets()
@@ -113,7 +113,7 @@
->execute();
}
- /*
+ /**
* Add ga_token setting if missing
*/
protected function upgradeToAddGaToken()
@@ -132,7 +132,7 @@
}
}
- /*
+ /**
* Clear old school formatted logs
*/
protected function upgradeToClearLogs()
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/widget/sfWidgetFormDmInputFile.class.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/widget/sfWidgetFormDmInputFile.class.php
2010-02-07 19:55:48 UTC (rev 27662)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/widget/sfWidgetFormDmInputFile.class.php
2010-02-07 20:02:21 UTC (rev 27663)
@@ -5,7 +5,7 @@
*/
class sfWidgetFormDmInputFile extends sfWidgetFormInputFile
{
- /*
+ /**
* Remove value attribute for html5 validation
*/
public function render($name, $value = null, $attributes = array(), $errors
= 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.
