Kohana v3.3.5
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
* @package Kohana/Userguide
|
||||
* @category Base
|
||||
* @author Kohana Team
|
||||
* @copyright (c) 2008-2012 Kohana Team
|
||||
* @license http://kohanaphp.com/license
|
||||
* @copyright (c) 2008-2013 Kohana Team
|
||||
* @license http://kohanaframework.org/license
|
||||
*/
|
||||
class Kohana_Kodoc {
|
||||
|
||||
@@ -34,6 +34,10 @@ class Kohana_Kodoc {
|
||||
{
|
||||
$member = '#property:'.substr($matches[3], 1);
|
||||
}
|
||||
elseif (preg_match('/^[A-Z_\x7f-\xff][A-Z0-9_\x7f-\xff]*$/', $matches[3]))
|
||||
{
|
||||
$member = '#constant:'.substr($matches[3],0);
|
||||
}
|
||||
else
|
||||
{
|
||||
$member = '#'.$matches[3];
|
||||
@@ -275,7 +279,7 @@ class Kohana_Kodoc {
|
||||
* @param string $text Content of the tag
|
||||
* @return void
|
||||
*/
|
||||
$add_tag = function($tag, $text) use ($html, &$tags)
|
||||
$add_tag = function ($tag, $text) use ($html, & $tags)
|
||||
{
|
||||
// Don't show @access lines, they are shown elsewhere
|
||||
if ($tag !== 'access')
|
||||
@@ -290,7 +294,7 @@ class Kohana_Kodoc {
|
||||
}
|
||||
};
|
||||
|
||||
$comment = $tag = null;
|
||||
$comment = $tag = NULL;
|
||||
$end = count($lines[1]) - 1;
|
||||
|
||||
foreach ($lines[1] as $i => $line)
|
||||
@@ -415,12 +419,12 @@ class Kohana_Kodoc {
|
||||
*
|
||||
* Module developers can therefore add their own transparent extension
|
||||
* namespaces and exclude them from the userguide.
|
||||
*
|
||||
* @param string $class The name of the class to check for transparency
|
||||
* @param array $classes An optional list of all defined classes
|
||||
* @return false If this is not a transparent extension class
|
||||
* @return string The name of the class that extends this (in the case provided)
|
||||
* @throws InvalidArgumentException If the $classes array is provided and the $class variable is not lowercase
|
||||
*
|
||||
* @param string $class The name of the class to check for transparency
|
||||
* @param array $classes An optional list of all defined classes
|
||||
* @return false If this is not a transparent extension class
|
||||
* @return string The name of the class that extends this (in the case provided)
|
||||
* @throws InvalidArgumentException If the $classes array is provided and the $class variable is not lowercase
|
||||
*/
|
||||
public static function is_transparent($class, $classes = NULL)
|
||||
{
|
||||
@@ -447,11 +451,11 @@ class Kohana_Kodoc {
|
||||
// Cater for Foo extends Module_Foo naming
|
||||
$child_class = $segments[1];
|
||||
}
|
||||
|
||||
|
||||
// It is only a transparent class if the unprefixed class also exists
|
||||
if ($classes AND ! isset($classes[$child_class]))
|
||||
return FALSE;
|
||||
|
||||
|
||||
// Return the name of the child class
|
||||
return $child_class;
|
||||
}
|
||||
@@ -462,5 +466,4 @@ class Kohana_Kodoc {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // End Kodoc
|
||||
|
Reference in New Issue
Block a user