From e5e93fa60810be262a8d19620726b21fe6594ba0 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 18 Nov 2019 16:36:49 +0100
Subject: [PATCH] Update for recent version of nette

---
 src/@elementlist.latte     |   2 +-
 src/@layout.latte          |  18 ++--
 src/annotation-group.latte |  26 ++---
 src/class.latte            | 214 +++++++++++++++++++------------------
 src/constant.latte         |  24 ++---
 src/function.latte         |  28 ++---
 src/tree.latte             |  10 +-
 7 files changed, 164 insertions(+), 158 deletions(-)

diff --git a/src/@elementlist.latte b/src/@elementlist.latte
index 9988198..55885cc 100644
--- a/src/@elementlist.latte
+++ b/src/@elementlist.latte
@@ -1,6 +1,6 @@
 {define elements}
 <tr n:foreach="$elements as $element">
-	<td class="name"><a href="{$element|elementUrl}" n:class="$element->deprecated ? deprecated, !$element->valid ? invalid">{if $namespace}{$element->shortName}{else}{$element->name}{/if}</a></td>
+	<td class="name"><a href="{$element|elementUrl}" n:class="$element->isDeprecated() ? deprecated, !$element->isValid() ? invalid">{if $namespace}{$element->getShortName()}{else}{$element->getName()}{/if}</a></td>
 	<td>{$element|shortDescription|noescape}</td>
 </tr>
 {/define}
diff --git a/src/@layout.latte b/src/@layout.latte
index ce206ab..348712b 100644
--- a/src/@layout.latte
+++ b/src/@layout.latte
@@ -8,7 +8,7 @@
 
 	<meta http-equiv="content-language" content="en"/>
 	<meta name="Keywords" content="PRADO PHP framework component template event property OOP PHP5 object oriented programming Web programming development" />
-	<meta name="Description" content="PRADO is a component-based and event-driven framework for Web application development in PHP 5." />
+	<meta name="Description" content="PRADO is a component-based and event-driven framework for Web application development in PHP 7." />
 	<meta name="Author" content="Qiang Xue" />
 	<meta name="Subject" content="Web programming, PHP framework" />
 	<meta name="Language" content="en" />
@@ -76,7 +76,7 @@
 
 		{define elements}
 			<ul>
-				<li n:foreach="$elements as $element" n:class="$activeElement === $element ? active"><a n:class="$element->deprecated ? deprecated, !$element->valid ? invalid" href="{$element|elementUrl}">{if $namespace}{$element->shortName}{else}{$element->name}{/if}</a></li>
+				<li n:foreach="$elements as $element" n:class="$activeElement === $element ? active"><a n:class="$element->isDeprecated() ? deprecated, !$element->isValid() ? invalid" href="{$element|elementUrl}">{if $namespace}{$element->getShortName()}{else}{$element->getName()}{/if}</a></li>
 			</ul>
 		{/define}
 
@@ -136,23 +136,23 @@
 				<a n:tag-if="'namespace' !== $active && $namespace" href="{$namespace|namespaceUrl}" title="Summary of {$namespace}"><span>Namespace</span></a>
 			</li>
 			<li n:class="'class' === $active ? active" n:if="!$function && !$constant">
-				<a n:tag-if="'class' !== $active && $class" href="{$class|classUrl}" title="Summary of {$class->name}"><span>Class</span></a>
+				<a n:tag-if="'class' !== $active && $class" href="{$class|classUrl}" title="Summary of {$class->getName()}"><span>Class</span></a>
 			</li>
 			<li n:class="'function' === $active ? active" n:if="$function">
-				<a n:tag-if="'function' !== $active" href="{$function|functionUrl}" title="Summary of {$function->name}"><span>Function</span></a>
+				<a n:tag-if="'function' !== $active" href="{$function|functionUrl}" title="Summary of {$function->getName()}"><span>Function</span></a>
 			</li>
 			<li n:class="'constant' === $active ? active" n:if="$constant">
-				<a n:tag-if="'constant' !== $active" href="{$constant|constantUrl}" title="Summary of {$constant->name}"><span>Constant</span></a>
+				<a n:tag-if="'constant' !== $active" href="{$constant|constantUrl}" title="Summary of {$constant->getName()}"><span>Constant</span></a>
 			</li>
 		</ul>
 		<ul>
 			<li n:class="'tree' === $active ? active" n:if="$config->tree">
 				<a n:tag-if="'tree' !== $active" href="tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
 			</li>
-			{foreach $annotationGroups as $annotation}
-				<li n:class="$active === 'annotation-group-' . $annotation ? active">
-					<a n:tag-if="$active !== 'annotation-group-' . $annotation" href="annotation-group-{$annotation}.html" title="List of elements with {$annotation} annotation">
-						<span>{$annotation|firstUpper}</span>
+			{foreach $annotationGroups as $annotationItem}
+				<li n:class="$active === 'annotation-group-' . $annotationItem ? active">
+					<a n:tag-if="$active !== 'annotation-group-' . $annotationItem" href="annotation-group-{$annotationItem}.html" title="List of elements with {$annotationItem} annotation">
+						<span>{$annotationItem|firstUpper}</span>
 					</a>
 				</li>
 			{/foreach}
diff --git a/src/annotation-group.latte b/src/annotation-group.latte
index 39c4976..9635b3a 100644
--- a/src/annotation-group.latte
+++ b/src/annotation-group.latte
@@ -31,11 +31,11 @@
 		<table class="summary" id="methods" n:if="$annotationMethods">
 			<caption>Methods summary</caption>
 			<tr n:foreach="$annotationMethods as $method">
-				<td class="name"><a href="{$method->declaringClassName|classUrl}">{$method->declaringClassName}</a></td>
-				<td class="name"><code><a href="{$method|methodUrl}">{$method->name}()</a></code></td>
+				<td class="name"><a href="{$method->getDeclaringClassName()|classUrl}">{$method->getDeclaringClassName()}</a></td>
+				<td class="name"><code><a href="{$method|methodUrl}">{$method->getName()}()</a></code></td>
 				<td>
 					{if $method->hasAnnotation($annotation)}
-						{foreach $method->annotations[$annotation] as $description}
+						{foreach $method->getAnnotation($annotation) as $description}
 							{if $description}
 								{$description|annotation:$annotation:$method|noescape}<br>
 							{/if}
@@ -48,13 +48,13 @@
 		<table class="summary" id="constants" n:if="$annotationConstants">
 			<caption>Constants summary</caption>
 			<tr n:foreach="$annotationConstants as $constant">
-				{if $constant->declaringClassName}
-					<td class="name"><a href="{$constant->declaringClassName|classUrl}">{$constant->declaringClassName}</a></td>
-					<td class="name"><code><a href="{$constant|constantUrl}"><b>{$constant->name}</b></a></code></td>
+				{if $constant->getDeclaringClassName()}
+					<td class="name"><a href="{$constant->getDeclaringClassName()|classUrl}">{$constant->getDeclaringClassName()}</a></td>
+					<td class="name"><code><a href="{$constant|constantUrl}"><b>{$constant->getName()}</b></a></code></td>
 
 				{else}
-					<td class="name" n:if="$namespaces || $classes || $interfaces || $traits || $exceptions"><a n:if="$constant->namespaceName" href="{$constant->namespaceName|namespaceUrl}">{$constant->namespaceName}</a></td>
-					<td n:class="name"><code><a href="{$constant|constantUrl}"><b>{$constant->shortName}</b></a></code></td>
+					<td class="name" n:if="$namespaces || $classes || $interfaces || $traits || $exceptions"><a n:if="$constant->getNamespaceName()" href="{$constant->getNamespaceName()|namespaceUrl}">{$constant->getNamespaceName()}</a></td>
+					<td n:class="name"><code><a href="{$constant|constantUrl}"><b>{$constant->getShortName()}</b></a></code></td>
 				{/if}
 				<td>
 					{foreach $constant->annotations[$annotation] as $description}
@@ -69,8 +69,8 @@
 		<table class="summary" id="properties" n:if="$annotationProperties">
 			<caption>Properties summary</caption>
 			<tr n:foreach="$annotationProperties as $property">
-				<td class="name"><a href="{$property->declaringClassName|classUrl}">{$property->declaringClassName}</a></td>
-				<td class="name"><a href="{$property|propertyUrl}"><var>${$property->name}</var></a></td>
+				<td class="name"><a href="{$property->getDeclaringClassName()|classUrl}">{$property->getDeclaringClassName()}</a></td>
+				<td class="name"><a href="{$property|propertyUrl}"><var>${$property->getName()}</var></a></td>
 				<td>
 					{foreach $property->annotations[$annotation] as $description}
 						{if $description}
@@ -84,8 +84,8 @@
 		<table class="summary" id="functions" n:if="$annotationFunctions">
 			<caption>Functions summary</caption>
 			<tr n:foreach="$annotationFunctions as $function">
-				<td class="name" n:if="$namespaces"><a n:if="$function->namespaceName" href="{$function->namespaceName|namespaceUrl}">{$function->namespaceName}</a></td>
-				<td class="name"><code><a href="{$function|functionUrl}">{$function->shortName}</a></code></td>
+				<td class="name" n:if="$namespaces"><a n:if="$function->getNamespaceName()" href="{$function->getNamespaceName()|namespaceUrl}">{$function->getNamespaceName()}</a></td>
+				<td class="name"><code><a href="{$function|functionUrl}">{$function->getShortName()}</a></code></td>
 				<td>
 					{foreach $function->annotations[$annotation] as $description}
 						{if $description}
@@ -105,7 +105,7 @@
 
 {define classes}
 	<tr n:foreach="$items as $class">
-		<td class="name"><a href="{$class|classUrl}">{$class->name}</a></td>
+		<td class="name"><a href="{$class|classUrl}">{$class->getName()}</a></td>
 		<td>
 			{foreach $class->annotations[$annotation] as $description}
 				{if $description}
diff --git a/src/class.latte b/src/class.latte
index 4555d79..211a453 100644
--- a/src/class.latte
+++ b/src/class.latte
@@ -1,35 +1,37 @@
 {layout '@layout.latte'}
 {var $active = 'class'}
 
-{block title}{if $class->deprecated}Deprecated {/if}{if $class->interface}Interface{elseif $class->trait}Trait{else}Class{/if} {$class->name}{/block}
+{block title}{if $class->isDeprecated()}Deprecated {/if}{if $class->isInterface()}Interface{elseif $class->isTrait()}Trait{else}Class{/if} {$class->getName()}{/block}
 
 {block content}
 <div id="content" class="class">
-	<h1 n:class="$class->deprecated ? deprecated">{if $class->interface}Interface{elseif $class->trait}Trait{else}Class{/if} {$class->shortName}</h1>
+	<h1 n:class="$class->isDeprecated() ? deprecated">{if $class->isInterface()}Interface{elseif $class->isTrait()}Trait{else}Class{/if} {$class->getShortName()}</h1>
 
-	{if $class->valid}
+	{if $class->isValid()}
 
-	<div class="description" n:if="$template->longDescription($class)">
-	{$class|longDescription|noescape}
-	</div>
+	{if $class->getLongDescription()}
+		<div class="description">
+		{$class|longDescription|noescape}
+		</div>
+	{/if}
 
-	<dl class="tree" n:if="$class->parentClass || $class->ownInterfaces || $class->ownTraits">
+	<dl class="tree" n:if="$class->getParentClass() || $class->getOwnInterfaces() || $class->getOwnTraits()">
 		<dd n:foreach="$tree as $item" style="padding-left:{($iterator->counter - 1) * 30}px">
 			<img src="resources/inherit.png" alt="Extended by" n:if="$iterator->counter > 1">
-			{if $item->documented}
-			<a href="{$item|classUrl}" n:tag-if="!$iterator->last">{last}<b>{/last}<span n:class="$item->deprecated ? deprecated, !$item->valid ? invalid">{$item->name}</span>{last}</b>{/last}</a>
-			{else}{$item->name}{/if}
-			{var $itemOwnInterfaces = $item->ownInterfaces}
+			{if $item->isDocumented()}
+			<a href="{$item|classUrl}" n:tag-if="!$iterator->last">{last}<b>{/last}<span n:class="$item->isDeprecated() ? deprecated, !$item->isValid() ? invalid">{$item->getName()}</span>{last}</b>{/last}</a>
+			{else}{$item->getName()}{/if}
+			{var $itemOwnInterfaces = $item->getOwnInterfaces()}
 			{if $itemOwnInterfaces} implements {foreach $itemOwnInterfaces as $interface}
-				<a href="{$interface|classUrl}" n:tag-if="$interface->documented"><span n:class="$interface->deprecated ? deprecated, !$interface->valid ? invalid">{$interface->name}</span></a>{sep}, {/sep}
+				<a href="{$interface|classUrl}" n:tag-if="$interface->isDocumented()"><span n:class="$interface->isDeprecated() ? deprecated, !$interface->isValid() ? invalid">{$interface->getName()}</span></a>{sep}, {/sep}
 			{/foreach}{/if}
-			{var $itemOwnTraits = $item->ownTraits}
+			{var $itemOwnTraits = $item->getOwnTraits()}
 			{if $itemOwnTraits} uses {foreach $itemOwnTraits as $trait}
 				{if is_string($trait)}
 					{$trait} (not available)
 
 				{else}
-					<a href="{$trait|classUrl}" n:tag-if="$trait->documented"><span n:class="$trait->deprecated ? deprecated, !$trait->valid ? invalid">{$trait->name}</span></a>{sep}, {/sep}
+					<a href="{$trait|classUrl}" n:tag-if="$trait->isDocumented()"><span n:class="$trait->isDeprecated() ? deprecated, !$trait->isValid() ? invalid">{$trait->getName()}</span></a>{sep}, {/sep}
 				{/}
 			{/foreach}{/if}
 		</dd>
@@ -37,7 +39,7 @@
 
 	{define children}
 		{foreach $children as $child}
-			<a href="{$child|classUrl}" n:tag-if="$child->documented"><span n:tag-if="$child->deprecated" class="deprecated">{$child->name}</span></a>{sep}, {/sep}
+			<a href="{$child|classUrl}" n:tag-if="$child->isDocumented()"><span n:tag-if="$child->isDeprecated()" class="deprecated">{$child->getName()}</span></a>{sep}, {/sep}
 		{/foreach}
 	{/define}
 
@@ -72,34 +74,35 @@
 	</div>
 
 	<div class="info">
-		{if !$class->interface && !$class->trait && ($class->abstract || $class->final)}<b>{if $class->abstract}Abstract{else}Final{/if}</b><br>{/if}
-		{if $class->internal}<b>PHP Extension:</b> <a href="{$class->extension|manualUrl}" title="Go to PHP documentation">{$class->extension->name|firstUpper}</a><br>{/if}
-		{if $class->inNamespace()}<b>Namespace:</b> {$class->namespaceName|namespaceLinks|noescape}<br>{/if}
-		{if $class->inPackage()}<b>Package:</b> {$class->packageName|packageLinks|noescape}<br>{/if}
+		{if !$class->isInterface() && !$class->isTrait() && ($class->isAbstract() || $class->isFinal())}<b>{if $class->isAbstract()}Abstract{else}Final{/if}</b><br>{/if}
+		{if $class->isInternal()}<b>PHP Extension:</b> <a href="{$class->extension|manualUrl}" title="Go to PHP documentation">{$class->extension->name|firstUpper}</a><br>{/if}
+		{if $class->inNamespace()}<b>Namespace:</b> {$class->getNamespaceName()|namespaceLinks|noescape}<br>{/if}
+		{if $class->inPackage()}<b>Package:</b> {$class->getPackageName()|packageLinks|noescape}<br>{/if}
 
-		{foreach $template->annotationSort($template->annotationFilter($class->annotations)) as $annotation => $values}
+		{var $filteredAnnotations = ($class->getAnnotations()|annotationFilter: [])}
+		{foreach $filteredAnnotations as $annotationItem => $values}
 			{foreach $values as $value}
-				<b>{$annotation|annotationBeautify}{if $value}:{/if}</b>
-				{$value|annotation:$annotation:$class|noescape}<br>
+				<b>{$annotationItem|annotationBeautify}{if $value}:{/if}</b>
+				{$value|annotation:$annotationItem:$class|noescape}<br>
 			{/foreach}
 		{/foreach}
-		{if $class->internal}
+		{if $class->isInternal()}
 			<b>Documented at</b> <a href="{$class|manualUrl}" title="Go to PHP documentation">php.net</a>
 		{else}
-			<b>Located at</b> <a n:tag-if="$config->sourceCode" href="{$class|sourceUrl}" title="Go to source code">{$class->fileName|relativePath}</a>
+			<b>Located at</b> <a n:tag-if="$config->sourceCode" href="{$class|sourceUrl}" title="Go to source code">{$class->getFileName()|relativePath}</a>
 		{/if}
 		<br>
 	</div>
 
-	{var $ownMethods = $class->ownMethods}
-	{var $ownMagicMethods = $class->ownMagicMethods}
+	{var $ownMethods = $class->getOwnMethods()}
+	{var $ownMagicMethods = $class->getOwnMagicMethods()}
 
 	{define method}
-	<tr data-order="{$method->name}" id="{if $method->magic}m{/if}_{$method->name}" n:class="$method->deprecated ? deprecated">
-		{var $annotations = $method->annotations}
+	<tr data-order="{$method->getName()}" id="{if $method->isMagic()}m{/if}_{$method->getName()}" n:class="$method->isDeprecated() ? deprecated">
+		{var $annotations = $method->getAnnotations()}
 
 		<td class="attributes"><code>
-			{if !$class->interface && $method->abstract}abstract{elseif $method->final}final{/if} {if $method->protected}protected{elseif $method->private}private{else}public{/if} {if $method->static}static{/if}
+			{if !$class->isInterface() && $method->isAbstract()}abstract{elseif $method->isFinal()}final{/if} {if $method->isProtected()}protected{elseif $method->isPrivate()}private{else}public{/if} {if $method->isStatic()}static{/if}
 
 			{ifset $annotations['return']}{$annotations['return'][0]|typeLinks:$method|noescape}{/ifset}
 			{if $method->returnsReference()}&amp;{/if}
@@ -107,16 +110,16 @@
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#{if $method->magic}m{/if}_{$method->name}">#</a>
+		<a class="anchor" href="#{if $method->isMagic()}m{/if}_{$method->getName()}">#</a>
 		<code>{block|strip}
-			{if $class->internal}
-				<a href="{$method|manualUrl}" title="Go to PHP documentation">{$method->name}</a>(
+			{if $class->isInternal()}
+				<a href="{$method|manualUrl}" title="Go to PHP documentation">{$method->getName()}</a>(
 			{else}
-				<a n:tag-if="$config->sourceCode" href="{$method|sourceUrl}" title="Go to source code">{$method->name}</a>(
+				<a n:tag-if="$config->sourceCode" href="{$method|sourceUrl}" title="Go to source code">{$method->getName()}</a>(
 			{/if}
-			{foreach $method->parameters as $parameter}
-				<span>{$parameter->typeHint|typeLinks:$method|noescape}
-				<var>{if $parameter->passedByReference}&amp; {/if}${$parameter->name}</var>{if $parameter->defaultValueAvailable} = {$parameter->defaultValueDefinition|highlightPHP:$class|noescape}{elseif $parameter->unlimited},…{/if}</span>{sep}, {/sep}
+			{foreach $method->getParameters() as $parameter}
+				<span>{$parameter->getTypeHint()|typeLinks:$method|noescape}
+				<var>{if $parameter->isPassedByReference()}&amp; {/if}${$parameter->getName()}</var>{if $parameter->isDefaultValueAvailable()} = {$parameter->getDefaultValueDefinition()|highlightPHP:$class|noescape}{elseif $parameter->isUnlimited()},…{/if}</span>{sep}, {/sep}
 			{/foreach}
 		){/block}</code>
 
@@ -129,7 +132,7 @@
 		<div n:class="description, detailed, $config->template['options']['elementDetailsCollapsed'] ? hidden">
 			{$method|longDescription|noescape}
 
-			{if !$class->deprecated && $method->deprecated}
+			{if !$class->isDeprecated() && $method->isDeprecated()}
 				<h4>Deprecated</h4>
 				{ifset $annotations['deprecated']}
 				<div class="list">
@@ -142,12 +145,12 @@
 				{/ifset}
 			{/if}
 
-			{if $method->parameters && isset($annotations['param'])}
+			{if $method->getParameters() && isset($annotations['param'])}
 				<h4>Parameters</h4>
 				<div class="list"><dl>
-				{foreach $method->parameters as $parameter}
-					<dt><var>${$parameter->name}</var>{if $parameter->unlimited},…{/if}</dt>
-					<dd>{$parameter->description|description:$method|noescape}</dd>
+				{foreach $method->getParameters() as $parameter}
+					<dt><var>${$parameter->getName()}</var>{if $parameter->isUnlimited()},…{/if}</dt>
+					<dd>{$parameter->getDescription()|description:$method|noescape}</dd>
 				{/foreach}
 				</dl></div>
 			{/if}
@@ -170,27 +173,28 @@
 				</div>
 			{/ifset}
 
-			{foreach $template->annotationSort($template->annotationFilter($annotations, array('deprecated', 'param', 'return', 'throws'))) as $annotation => $descriptions}
-				<h4>{$annotation|annotationBeautify}</h4>
+			{var $filteredAnnotations = ($annotations|annotationFilter: ['deprecated', 'param', 'return', 'throws'])}
+			{foreach $filteredAnnotations as $annotationItem => $descriptions}
+				<h4>{$annotationItem|annotationBeautify}</h4>
 				<div class="list">
 				{foreach $descriptions as $description}
 					{if $description}
-						{$description|annotation:$annotation:$method|noescape}<br>
+						{$description|annotation:$annotationItem:$method|noescape}<br>
 					{/if}
 				{/foreach}
 				</div>
 			{/foreach}
 
-			{var $overriddenMethod = $method->overriddenMethod}
+			{var $overriddenMethod = $method->getOverriddenMethod()}
 			{if $overriddenMethod}
 				<h4>Overrides</h4>
-				<div class="list"><code><a n:tag-if="$template->getClass($overriddenMethod->declaringClassName)" href="{$overriddenMethod|methodUrl}">{$overriddenMethod->prettyName}</a></code></div>
+				<div class="list"><code><a href="{$overriddenMethod|methodUrl}">{$overriddenMethod->getPrettyName()}</a></code></div>
 			{/if}
 
-			{var $implementedMethod = $method->implementedMethod}
+			{var $implementedMethod = $method->getImplementedMethod()}
 			{if $implementedMethod}
 				<h4>Implementation of</h4>
-				<div class="list"><code><a n:tag-if="$template->getClass($implementedMethod->declaringClassName)" href="{$implementedMethod|methodUrl}">{$implementedMethod->prettyName}</a></code></div>
+				<div class="list"><code><a href="{$implementedMethod|methodUrl}">{$implementedMethod->getPrettyName()}</a></code></div>
 			{/if}
 		</div>
 		</div></td>
@@ -204,23 +208,23 @@
 	{/foreach}
 	</table>
 
-	<table n:foreach="$class->inheritedMethods as $parentName => $methods" class="summary inherited">
-	<caption>Methods inherited from <a href="{$parentName|classUrl}#methods" n:tag-if="$template->getClass($parentName)">{$parentName}</a></caption>
+	<table n:foreach="$class->getInheritedMethods() as $parentName => $methods" class="summary inherited">
+	<caption>Methods inherited from <a href="{$parentName|classUrl}#methods">{$parentName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $methods as $method}
-			<a href="{$method|methodUrl}" n:tag-if="$template->getClass($parentName)"><span n:tag-if="$method->deprecated" class="deprecated">{$method->name}()</span></a>{sep}, {/sep}
+			<a href="{$method|methodUrl}"><span n:tag-if="$method->isDeprecated()" class="deprecated">{$method->getName()}()</span></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
-	<table n:foreach="$class->usedMethods as $traitName => $methods" class="summary used">
-	<caption>Methods used from <a href="{$traitName|classUrl}#methods" n:tag-if="$template->getClass($traitName)">{$traitName}</a></caption>
+	<table n:foreach="$class->getUsedMethods() as $traitName => $methods" class="summary used">
+	<caption>Methods used from <a href="{$traitName|classUrl}#methods">{$traitName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $methods as $data}
-			<a href="{$data['method']|methodUrl:$data['method']->declaringTrait}" n:tag-if="$template->getClass($traitName)"><span n:tag-if="$data['method']->deprecated" class="deprecated">{$data['method']->name}()</span></a>{if $data['aliases']}(as {foreach $data['aliases'] as $alias}<span n:tag-if="$data['method']->deprecated" class="deprecated">{$alias->name}()</span>{sep}, {/sep}{/foreach}){/if}{sep}, {/sep}
+			<a href="{$data['method']|methodUrl:$data['method']->declaringTrait}"><span n:tag-if="$data['method']->isDeprecated()" class="deprecated">{$data['method']->getName()}()</span></a>{if $data['aliases']}(as {foreach $data['aliases'] as $alias}<span n:tag-if="$data['method']->isDeprecated()" class="deprecated">{$alias->getName()}()</span>{sep}, {/sep}{/foreach}){/if}{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
@@ -233,43 +237,43 @@
 	{/foreach}
 	</table>
 
-	<table n:foreach="$class->inheritedMagicMethods as $parentName => $methods" class="summary inherited">
-	<caption>Magic methods inherited from <a href="{$parentName|classUrl}#methods" n:tag-if="$template->getClass($parentName)">{$parentName}</a></caption>
+	<table n:foreach="$class->getInheritedMagicMethods() as $parentName => $methods" class="summary inherited">
+	<caption>Magic methods inherited from <a href="{$parentName|classUrl}#methods">{$parentName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $methods as $method}
-			<a href="{$method|methodUrl}" n:tag-if="$template->getClass($parentName)"><span n:tag-if="$method->deprecated" class="deprecated">{$method->name}()</span></a>{sep}, {/sep}
+			<a href="{$method|methodUrl}"><span n:tag-if="$method->isDeprecated()" class="deprecated">{$method->getName()}()</span></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
-	<table n:foreach="$class->usedMagicMethods as $traitName => $methods" class="summary used">
-	<caption>Magic methods used from <a href="{$traitName|classUrl}#methods" n:tag-if="$template->getClass($traitName)">{$traitName}</a></caption>
+	<table n:foreach="$class->getUsedMagicMethods() as $traitName => $methods" class="summary used">
+	<caption>Magic methods used from <a href="{$traitName|classUrl}#methods">{$traitName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $methods as $data}
-			<a href="{$data['method']|methodUrl:$data['method']->declaringTrait}" n:tag-if="$template->getClass($traitName)"><span n:tag-if="$data['method']->deprecated" class="deprecated">{$data['method']->originalName}()</span></a>{if $data['aliases']}(as {foreach $data['aliases'] as $alias}<span n:tag-if="$data['method']->deprecated" class="deprecated">{$alias->name}()</span>{sep}, {/sep}{/foreach}){/if}{sep}, {/sep}
+			<a href="{$data['method']|methodUrl:$data['method']->declaringTrait}"><span n:tag-if="$data['method']->isDeprecated()" class="deprecated">{$data['method']->originalName}()</span></a>{if $data['aliases']}(as {foreach $data['aliases'] as $alias}<span n:tag-if="$data['method']->isDeprecated()" class="deprecated">{$alias->getName()}()</span>{sep}, {/sep}{/foreach}){/if}{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
 
-	{var $ownConstants = $class->ownConstants}
+	{var $ownConstants = $class->getOwnConstants()}
 
 	<table class="summary constants" id="constants" n:if="$ownConstants">
 	<caption>Constants summary</caption>
-	<tr n:foreach="$ownConstants as $constant" data-order="{$constant->name}" id="{$constant->name}">
-		{var $annotations = $constant->annotations}
+	<tr n:foreach="$ownConstants as $constant" data-order="{$constant->getName()}" id="{$constant->getName()}">
+		{var $annotations = $constant->getAnnotations()}
 
-		<td class="attributes"><code>{$constant->typeHint|typeLinks:$constant|noescape}</code></td>
+		<td class="attributes"><code>{$constant->getTypeHint()|typeLinks:$constant|noescape}</code></td>
 		<td class="name">
 			<code>
-			{if $class->internal}
-				<a href="{$constant|manualUrl}" title="Go to PHP documentation"><b>{$constant->name}</b></a>
+			{if $class->isInternal()}
+				<a href="{$constant|manualUrl}" title="Go to PHP documentation"><b>{$constant->getName()}</b></a>
 			{else}
-				<a n:tag-if="$config->sourceCode" href="{$constant|sourceUrl}" title="Go to source code"><b>{$constant->name}</b></a>
+				<a n:tag-if="$config->sourceCode" href="{$constant|sourceUrl}" title="Go to source code"><b>{$constant->getName()}</b></a>
 			{/if}
 			</code>
 
@@ -280,12 +284,13 @@
 			<div n:class="description, detailed, $config->template['options']['elementDetailsCollapsed'] ? hidden">
 				{$constant|longDescription|noescape}
 
-				{foreach $template->annotationSort($template->annotationFilter($annotations, array('var'))) as $annotation => $descriptions}
-					<h4>{$annotation|annotationBeautify}</h4>
+				{var $filteredAnnotations = ($annotations|annotationFilter: ['var'])}
+				{foreach $filteredAnnotations as $annotationItem => $descriptions}
+					<h4>{$annotationItem|annotationBeautify}</h4>
 					<div class="list">
 					{foreach $descriptions as $description}
 						{if $description}
-							{$description|annotation:$annotation:$constant|noescape}<br>
+							{$description|annotation:$annotationItem:$constant|noescape}<br>
 						{/if}
 					{/foreach}
 					</div>
@@ -294,36 +299,36 @@
 		</td>
 		<td class="value">
 			<div>
-				<a href="#{$constant->name}" class="anchor">#</a>
-				<code>{$constant->valueDefinition|highlightValue:$class|noescape}</code>
+				<a href="#{$constant->getName()}" class="anchor">#</a>
+				<code>{$constant->getValueDefinition()|highlightValue:$class|noescape}</code>
 			</div>
 		</td>
 	</tr>
 	</table>
 
-	<table n:foreach="$class->inheritedConstants as $parentName => $constants" class="summary inherited">
-	<caption>Constants inherited from <a href="{$parentName|classUrl}#constants" n:tag-if="$template->getClass($parentName)">{$parentName}</a></caption>
+	<table n:foreach="$class->getInheritedConstants() as $parentName => $constantsItems" class="summary inherited">
+	<caption>Constants inherited from <a href="{$parentName|classUrl}#constants">{$parentName}</a></caption>
 	<tr>
 		<td><code>
-		{foreach $constants as $constant}
-			<a href="{$constant|constantUrl}" n:tag-if="$template->getClass($parentName)"><b><span n:tag-if="$constant->deprecated" class"deprecated">{$constant->name}</span></b></a>{sep}, {/sep}
+		{foreach $constantsItems as $constant}
+			<a href="{$constant|constantUrl}"><b><span n:tag-if="$constant->isDeprecated()" class"deprecated">{$constant->getName()}</span></b></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
 	{define property}
-	<tr data-order="{$property->name}" id="{if $property->magic}m{/if}${$property->name}">
+	<tr data-order="{$property->getName()}" id="{if $property->isMagic()}m{/if}${$property->getName()}">
 		<td class="attributes"><code>
-			{if $property->protected}protected{elseif $property->private}private{else}public{/if} {if $property->static}static{/if} {if $property->readOnly}read-only{elseif $property->writeOnly}write-only{/if}
-			{$property->typeHint|typeLinks:$property|noescape}
+			{if $property->isProtected()}protected{elseif $property->isPrivate()}private{else}public{/if} {if $property->isStatic()}static{/if} {if $property->isReadOnly()}read-only{elseif $property->isWriteOnly()}write-only{/if}
+			{$property->getTypeHint()|typeLinks:$property|noescape}
 		</code></td>
 
 		<td class="name">
-			{if $class->internal}
-				<a href="{$property|manualUrl}" title="Go to PHP documentation"><var>${$property->name}</var></a>
+			{if $class->isInternal()}
+				<a href="{$property|manualUrl}" title="Go to PHP documentation"><var>${$property->getName()}</var></a>
 			{else}
-				<a n:tag-if="$config->sourceCode" href="{$property|sourceUrl}" title="Go to source code"><var>${$property->name}</var></a>
+				<a n:tag-if="$config->sourceCode" href="{$property|sourceUrl}" title="Go to source code"><var>${$property->getName()}</var></a>
 			{/if}
 
 			<div n:if="$config->template['options']['elementDetailsCollapsed']" class="description short">
@@ -333,29 +338,30 @@
 			<div n:class="description, detailed, $config->template['options']['elementDetailsCollapsed'] ? hidden">
 				{$property|longDescription|noescape}
 
-				{foreach $template->annotationSort($template->annotationFilter($property->annotations, array('var'))) as $annotation => $descriptions}
-					<h4>{$annotation|annotationBeautify}</h4>
+				{var $filteredAnnotations = ($property->getAnnotations()|annotationFilter: ['var'])}
+				{foreach $filteredAnnotations as $annotationItem => $descriptions}
+					<h4>{$annotationItem|annotationBeautify}</h4>
 					<div class="list">
 					{foreach $descriptions as $description}
 						{if $description}
-							{$description|annotation:$annotation:$property|noescape}<br>
+							{$description|annotation:$annotationItem:$property|noescape}<br>
 						{/if}
 					{/foreach}
 					</div>
 				{/foreach}
 			</div>
 		</td>
-		<td n:if="!$property->magic" class="value">
+		<td n:if="!$property->isMagic()" class="value">
 			<div>
-				<a href="#{if $property->magic}m{/if}${$property->name}" class="anchor">#</a>
-				<code>{$property->defaultValueDefinition|highlightValue:$class|noescape}</code>
+				<a href="#{if $property->isMagic()}m{/if}${$property->getName()}" class="anchor">#</a>
+				<code>{$property->getDefaultValueDefinition()|highlightValue:$class|noescape}</code>
 			</div>
 		</td>
 	</tr>
 	{/define}
 
-	{var $ownProperties = $class->ownProperties}
-	{var $ownMagicProperties = $class->ownMagicProperties}
+	{var $ownProperties = $class->getOwnProperties()}
+	{var $ownMagicProperties = $class->getOwnMagicProperties()}
 
 	<table class="summary properties" id="properties" n:if="$ownProperties">
 	<caption>Properties summary</caption>
@@ -364,23 +370,23 @@
 	{/foreach}
 	</table>
 
-	<table n:foreach="$class->inheritedProperties as $parentName => $properties" class="summary inherited">
-	<caption>Properties inherited from <a href="{$parentName|classUrl}#properties" n:tag-if="$template->getClass($parentName)">{$parentName}</a></caption>
+	<table n:foreach="$class->getInheritedProperties() as $parentName => $properties" class="summary inherited">
+	<caption>Properties inherited from <a href="{$parentName|classUrl}#properties">{$parentName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $properties as $property}
-			<a href="{$property|propertyUrl}" n:tag-if="$template->getClass($parentName)"><var><span n:tag-if="$property->deprecated" class="deprecated">${$property->name}</span></var></a>{sep}, {/sep}
+			<a href="{$property|propertyUrl}"><var><span n:tag-if="$property->isDeprecated()" class="deprecated">${$property->getName()}</span></var></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
-	<table n:foreach="$class->usedProperties as $traitName => $properties" class="summary used">
-	<caption>Properties used from <a href="{$traitName|classUrl}#properties" n:tag-if="$template->getClass($traitName)">{$traitName}</a></caption>
+	<table n:foreach="$class->getUsedProperties() as $traitName => $properties" class="summary used">
+	<caption>Properties used from <a href="{$traitName|classUrl}#properties">{$traitName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $properties as $property}
-			<a href="{$property|propertyUrl:$property->declaringTrait}" n:tag-if="$template->getClass($traitName)"><var><span n:tag-if="$property->deprecated" class="deprecated">${$property->name}</span></var></a>{sep}, {/sep}
+			<a href="{$property|propertyUrl:$property->declaringTrait}"><var><span n:tag-if="$property->isDeprecated()" class="deprecated">${$property->getName()}</span></var></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
@@ -393,23 +399,23 @@
 	{/foreach}
 	</table>
 
-	<table n:foreach="$class->inheritedMagicProperties as $parentName => $properties" class="summary inherited">
-	<caption>Magic properties inherited from <a href="{$parentName|classUrl}#properties" n:tag-if="$template->getClass($parentName)">{$parentName}</a></caption>
+	<table n:foreach="$class->getInheritedMagicProperties() as $parentName => $properties" class="summary inherited">
+	<caption>Magic properties inherited from <a href="{$parentName|classUrl}#properties">{$parentName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $properties as $property}
-			<a href="{$property|propertyUrl}" n:tag-if="$template->getClass($parentName)"><var><span n:tag-if="$property->deprecated" class="deprecated">${$property->name}</span></var></a>{sep}, {/sep}
+			<a href="{$property|propertyUrl}"><var><span n:tag-if="$property->isDeprecated()" class="deprecated">${$property->getName()}</span></var></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
 	</table>
 
-	<table n:foreach="$class->usedMagicProperties as $traitName => $properties" class="summary used">
-	<caption>Magic properties used from <a href="{$traitName|classUrl}#properties" n:tag-if="$template->getClass($traitName)">{$traitName}</a></caption>
+	<table n:foreach="$class->getUsedMagicProperties() as $traitName => $properties" class="summary used">
+	<caption>Magic properties used from <a href="{$traitName|classUrl}#properties">{$traitName}</a></caption>
 	<tr>
 		<td><code>
 		{foreach $properties as $property}
-			<a href="{$property|propertyUrl:$property->declaringTrait}" n:tag-if="$template->getClass($traitName)"><var><span n:tag-if="$property->deprecated" class="deprecated">${$property->name}</span></var></a>{sep}, {/sep}
+			<a href="{$property|propertyUrl:$property->declaringTrait}"><var><span n:tag-if="$property->isDeprecated()" class="deprecated">${$property->getName()}</span></var></a>{sep}, {/sep}
 		{/foreach}
 		</code></td>
 	</tr>
@@ -421,10 +427,10 @@
 				Documentation of this class could not be generated.
 			</p>
 			<p>
-				Class was originally declared in {$class->fileName|relativePath} and is invalid because of:
+				Class was originally declared in {$class->getFileName()|relativePath} and is invalid because of:
 			</p>
 			<ul>
-				<li n:foreach="$class->reasons as $reason">Class was redeclared in {$reason->getSender()->getFileName()|relativePath}.</li>
+				<li n:foreach="$class->getReasons() as $reason">Class was redeclared in {$reason->getSender()->getFileName()|relativePath}.</li>
 			</ul>
 		</div>
 	{/if}
diff --git a/src/constant.latte b/src/constant.latte
index 8552446..df6d293 100644
--- a/src/constant.latte
+++ b/src/constant.latte
@@ -1,22 +1,22 @@
 {layout '@layout.latte'}
 {var $active = 'constant'}
 
-{block title}{if $constant->deprecated}Deprecated {/if}Constant {$constant->name}{/block}
+{block title}{if $constant->isDeprecated()}Deprecated {/if}Constant {$constant->getName()}{/block}
 
 {block content}
 <div id="content" class="constant">
-	<h1 n:class="$constant->deprecated ? deprecated">Constant {$constant->shortName}</h1>
+	<h1 n:class="$constant->isDeprecated() ? deprecated">Constant {$constant->getShortName()}</h1>
 
-	{if $constant->valid}
+	{if $constant->isValid()}
 
 	<div class="description" n:if="$template->longDescription($constant)">
 	{$constant|longDescription|noescape}
 	</div>
 
 	<div class="info">
-		{if $constant->inNamespace()}<b>Namespace:</b> {$constant->namespaceName|namespaceLinks|noescape}<br>{/if}
-		{if $constant->inPackage()}<b>Package:</b> {$constant->packageName|packageLinks|noescape}<br>{/if}
-		{foreach $template->annotationSort($template->annotationFilter($constant->annotations, array('var'))) as $annotation => $values}
+		{if $constant->inNamespace()}<b>Namespace:</b> {$constant->getNamespaceName()|namespaceLinks|noescape}<br>{/if}
+		{if $constant->inPackage()}<b>Package:</b> {$constant->getPackageName()|packageLinks|noescape}<br>{/if}
+		{foreach $template->annotationFilter($constant->annotations, array('var')) as $annotation => $values}
 			{foreach $values as $value}
 				<b>{$annotation|annotationBeautify}{if $value}:{/if}</b>
 				{$value|annotation:$annotation:$constant|noescape}<br>
@@ -24,19 +24,19 @@
 		{/foreach}
 		<b>Located at</b>
 		<a n:tag-if="$config->sourceCode" href="{$constant|sourceUrl}" title="Go to source code">
-			{$constant->fileName|relativePath}
+			{$constant->getFileName()|relativePath}
 		</a><br>
 	</div>
 
-	{var $annotations = $constant->annotations}
+	{var $annotations = $constant->getAnnotations()}
 
 	<table class="summary" id="vars">
 	<caption>Value summary</caption>
 	<tr>
-		<td class="name"><code>{$constant->typeHint|typeLinks:$constant|noescape}</code></td>
+		<td class="name"><code>{$constant->getTypeHint()|typeLinks:$constant|noescape}</code></td>
 		<td class="value">{block|strip}
-			{var $element = $template->resolveElement($constant->valueDefinition, $constant)}
-			{if $element}<a href="{$element|constantUrl}">{$constant->valueDefinition}</a>{else}<code>{$constant->valueDefinition|highlightValue:$constant|noescape}</code>{/if}
+			{var $element = $template->resolveElement($constant->getValueDefinition(), $constant)}
+			{if $element}<a href="{$element|constantUrl}">{$constant->getValueDefinition()}</a>{else}<code>{$constant->getValueDefinition()|highlightValue:$constant|noescape}</code>{/if}
 		{/block}</td>
 	</tr>
 	</table>
@@ -47,7 +47,7 @@
 				Documentation of this constant could not be generated.
 			</p>
 			<p>
-				Constant was originally declared in {$constant->fileName|relativePath} and is invalid because of:
+				Constant was originally declared in {$constant->getFileName()|relativePath} and is invalid because of:
 			</p>
 			<ul>
 				<li n:foreach="$constant->reasons as $reason">Constant was redeclared in {$reason->getSender()->getFileName()|relativePath}.</li>
diff --git a/src/function.latte b/src/function.latte
index 5797cf1..02b37ce 100644
--- a/src/function.latte
+++ b/src/function.latte
@@ -1,22 +1,22 @@
 {layout '@layout.latte'}
 {var $active = 'function'}
 
-{block title}{if $function->deprecated}Deprecated {/if}Function {$function->name}{/block}
+{block title}{if $function->isDeprecated()}Deprecated {/if}Function {$function->getName()}{/block}
 
 {block content}
 <div id="content" class="function">
-	<h1 n:class="$function->deprecated ? deprecated">Function {$function->shortName}</h1>
+	<h1 n:class="$function->isDeprecated() ? deprecated">Function {$function->getShortName()}</h1>
 
-	{if $function->valid}
+	{if $function->isValid()}
 
 	<div class="description" n:if="$template->longDescription($function)">
 	{$function|longDescription|noescape}
 	</div>
 
 	<div class="info">
-		{if $function->inNamespace()}<b>Namespace:</b> {$function->namespaceName|namespaceLinks|noescape}<br>{/if}
-		{if $function->inPackage()}<b>Package:</b> {$function->packageName|packageLinks|noescape}<br>{/if}
-		{foreach $template->annotationSort($template->annotationFilter($function->annotations, array('param', 'return', 'throws'))) as $annotation => $values}
+		{if $function->inNamespace()}<b>Namespace:</b> {$function->getNamespaceName()|namespaceLinks|noescape}<br>{/if}
+		{if $function->inPackage()}<b>Package:</b> {$function->getPackageName()|packageLinks|noescape}<br>{/if}
+		{foreach $template->annotationFilter($function->annotations, array('param', 'return', 'throws')) as $annotation => $values}
 			{foreach $values as $value}
 				<b>{$annotation|annotationBeautify}{if $value}:{/if}</b>
 				{$value|annotation:$annotation:$function|noescape}<br>
@@ -24,20 +24,20 @@
 		{/foreach}
 		<b>Located at</b>
 		<a n:tag-if="$config->sourceCode" href="{$function|sourceUrl}" title="Go to source code">
-			{$function->fileName|relativePath}
+			{$function->getFileName()|relativePath}
 		</a><br>
 	</div>
 
-	{var $annotations = $function->annotations}
+	{var $annotations = $function->getAnnotations()}
 
-	<table class="summary" id="parameters" n:if="count($function->parameters)">
+	<table class="summary" id="parameters" n:if="count($function->getParameters())">
 	<caption>Parameters summary</caption>
-	<tr n:foreach="$function->parameters as $parameter" id="${$parameter->name}">
-		<td class="name"><code>{$parameter->typeHint|typeLinks:$function|noescape}</code></td>
+	<tr n:foreach="$function->getParameters() as $parameter" id="${$parameter->getName()}">
+		<td class="name"><code>{$parameter->getTypeHint()|typeLinks:$function|noescape}</code></td>
 		<td class="value"><code>{block|strip}
-			<var>{if $parameter->passedByReference}&amp; {/if}${$parameter->name}</var>{if $parameter->defaultValueAvailable} = {$parameter->defaultValueDefinition|highlightPHP:$function|noescape}{elseif $parameter->unlimited},…{/if}
+			<var>{if $parameter->isPassedByReference()}&amp; {/if}${$parameter->getName()}</var>{if $parameter->isDefaultValueAvailable()} = {$parameter->getDefaultValueDefinition()|highlightPHP:$function|noescape}{elseif $parameter->isUnlimited()},…{/if}
 		{/block}</code></td>
-		<td>{$parameter->description|description:$function}</td>
+		<td>{$parameter->getDescription()|description:$function}</td>
 	</tr>
 	</table>
 
@@ -71,7 +71,7 @@
 				Documentation of this function could not be generated.
 			</p>
 			<p>
-				Function was originally declared in {$function->fileName|relativePath} and is invalid because of:
+				Function was originally declared in {$function->getFileName()|relativePath} and is invalid because of:
 			</p>
 			<ul>
 				<li n:foreach="$function->reasons as $reason">Function was redeclared in {$reason->getSender()->getFileName()|relativePath}.</li>
diff --git a/src/tree.latte b/src/tree.latte
index 79a625b..2641f9b 100644
--- a/src/tree.latte
+++ b/src/tree.latte
@@ -16,18 +16,18 @@
 				<ul>
 			{/if}
 
-			<li n:class="!$tree->hasSibling() ? last"><div class="{if $tree->hasSibling()}not{/if}last"><a href="{$reflectionName|classUrl}" n:tag-if="$reflection->documented"><span n:class="$reflection->deprecated ? deprecated, !$reflection->valid ? invalid">{$reflectionName}</span></a>
-			{var $interfaces = $reflection->ownInterfaces}
+			<li n:class="!$tree->hasSibling() ? last"><div class="{if $tree->hasSibling()}not{/if}last"><a href="{$reflectionName|classUrl}" n:tag-if="$reflection->isDocumented()"><span n:class="$reflection->isDeprecated() ? deprecated, !$reflection->isValid() ? invalid">{$reflectionName}</span></a>
+			{var $interfaces = $reflection->getOwnInterfaces()}
 			{if $interfaces} implements {foreach $interfaces as $interface}
-				<a href="{$interface|classUrl}" n:tag-if="$interface->documented"><span n:class="$interface->deprecated ? deprecated, !$interface->valid ? invalid">{$interface->name}</span></a>{sep}, {/sep}
+				<a href="{$interface|classUrl}" n:tag-if="$interface->isDocumented()"><span n:class="$interface->isDeprecated() ? deprecated, !$interface->isValid() ? invalid">{$interface->getName()}</span></a>{sep}, {/sep}
 			{/foreach}{/if}
-			{var $traits = $reflection->ownTraits}
+			{var $traits = $reflection->getOwnTraits()}
 			{if $traits}{if $interfaces}<br><span class="padding"></span>{/if} uses {foreach $traits as $trait}
 				{if is_string($trait)}
 					{$trait} (not available)
 
 				{else}
-					<a href="{$trait|classUrl}" n:tag-if="$trait->documented"><span n:class="$trait->deprecated ? deprecated, !$trait->valid ? invalid">{$trait->name}</span></a>{sep}, {/sep}
+					<a href="{$trait|classUrl}" n:tag-if="$trait->isDocumented()"><span n:class="$trait->isDeprecated() ? deprecated, !$trait->isValid() ? invalid">{$trait->getName()}</span></a>{sep}, {/sep}
 				{/}
 			{/foreach}{/if}
 			</div>