From daa4dde508865ef0f08e584987b0695d4847809a Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 24 Apr 2013 09:59:46 +0200 Subject: Update to 3.2.1 --- framework/Collections/TAttributeCollection.php | 6 +++--- framework/Collections/TDummyDataSource.php | 6 +++--- framework/Collections/TList.php | 6 +++--- framework/Collections/TMap.php | 6 +++--- framework/Collections/TPagedDataSource.php | 8 ++++---- framework/Collections/TPagedList.php | 8 ++++---- framework/Collections/TStack.php | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'framework/Collections') diff --git a/framework/Collections/TAttributeCollection.php b/framework/Collections/TAttributeCollection.php index fcec52bb..7abc8b43 100644 --- a/framework/Collections/TAttributeCollection.php +++ b/framework/Collections/TAttributeCollection.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TAttributeCollection.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -38,7 +38,7 @@ Prado::using('System.Collections.TMap'); * in the collection storage. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TAttributeCollection.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -142,7 +142,7 @@ class TAttributeCollection extends TMap */ public function hasProperty($name) { - return $this->contains($name) || parent::canGetProperty($name) || parent::canSetProperty($name); + return $this->contains($name) || parent::hasProperty($name); } /** diff --git a/framework/Collections/TDummyDataSource.php b/framework/Collections/TDummyDataSource.php index 060559f8..bf74dbec 100644 --- a/framework/Collections/TDummyDataSource.php +++ b/framework/Collections/TDummyDataSource.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TDummyDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -22,7 +22,7 @@ * * * @author Qiang Xue - * @version $Id$ + * @version $Id: TDummyDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -76,7 +76,7 @@ class TDummyDataSource extends TComponent implements IteratorAggregate, Countabl * for traversing its dummy items. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TDummyDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php index 4603033a..b82f676e 100644 --- a/framework/Collections/TList.php +++ b/framework/Collections/TList.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -32,7 +32,7 @@ * operation, override {@link insertAt()}, and {@link removeAt()}. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -405,7 +405,7 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl * * @deprecated Issue 264 : ArrayIterator should be used instead * @author Qiang Xue - * @version $Id$ + * @version $Id: TList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php index 8b5baf90..d5f2ffce 100644 --- a/framework/Collections/TMap.php +++ b/framework/Collections/TMap.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -28,7 +28,7 @@ * * * @author Qiang Xue - * @version $Id$ + * @version $Id: TMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -274,7 +274,7 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable * * @deprecated Issue 264 : ArrayIterator should be used instead * @author Qiang Xue - * @version $Id$ + * @version $Id: TMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ diff --git a/framework/Collections/TPagedDataSource.php b/framework/Collections/TPagedDataSource.php index 330c09c3..60d2736b 100644 --- a/framework/Collections/TPagedDataSource.php +++ b/framework/Collections/TPagedDataSource.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TPagedDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -24,7 +24,7 @@ * within the specified page will be returned and traversed. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -277,7 +277,7 @@ class TPagedDataSource extends TComponent implements IteratorAggregate,Countable * to return a new iterator for traversing the items in a {@link TList} object. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -363,7 +363,7 @@ class TPagedListIterator implements Iterator * to return a new iterator for traversing the items in a {@link TMap} object. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedDataSource.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ diff --git a/framework/Collections/TPagedList.php b/framework/Collections/TPagedList.php index 7be246e1..ff03606f 100644 --- a/framework/Collections/TPagedList.php +++ b/framework/Collections/TPagedList.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -51,7 +51,7 @@ * * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -372,7 +372,7 @@ class TPagedList extends TList * To obtain the page index before it was changed, use {@link getOldPageIndex OldPageIndex}. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -410,7 +410,7 @@ class TPagedListPageChangedEventParameter extends TEventParameter * Newly fetched data should be saved in {@link setData Data} property. * * @author Qiang Xue - * @version $Id$ + * @version $Id: TPagedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ diff --git a/framework/Collections/TStack.php b/framework/Collections/TStack.php index 727949b3..06c97046 100644 --- a/framework/Collections/TStack.php +++ b/framework/Collections/TStack.php @@ -6,7 +6,7 @@ * @link http://www.pradosoft.com/ * @copyright Copyright © 2005-2013 PradoSoft * @license http://www.pradosoft.com/license/ - * @version $Id$ + * @version $Id: TStack.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections */ @@ -27,7 +27,7 @@ * * * @author Qiang Xue - * @version $Id$ + * @version $Id: TStack.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ @@ -182,7 +182,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable * * @deprecated Issue 264 : ArrayIterator should be used instead * @author Qiang Xue - * @version $Id$ + * @version $Id: TStack.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Collections * @since 3.0 */ -- cgit v1.2.3