Skip to content
Browse files

updated ApiGen to 2.6.1

  • Loading branch information...
1 parent 4eb6346 commit 853710702f997f8f2e1de9589581390cafffca65 @dg dg committed May 16, 2012
Showing with 165 additions and 157 deletions.
  1. +10 −6 tools/ApiGen/ApiGen/Backend.php
  2. +1 −1 tools/ApiGen/ApiGen/Config.php
  3. +1 −1 tools/ApiGen/ApiGen/ConfigException.php
  4. +10 −6 tools/ApiGen/ApiGen/Generator.php
  5. +1 −1 tools/ApiGen/ApiGen/ReflectionBase.php
  6. +1 −1 tools/ApiGen/ApiGen/ReflectionClass.php
  7. +1 −1 tools/ApiGen/ApiGen/ReflectionConstant.php
  8. +1 −1 tools/ApiGen/ApiGen/ReflectionElement.php
  9. +1 −1 tools/ApiGen/ApiGen/ReflectionExtension.php
  10. +1 −1 tools/ApiGen/ApiGen/ReflectionFunction.php
  11. +1 −1 tools/ApiGen/ApiGen/ReflectionFunctionBase.php
  12. +1 −1 tools/ApiGen/ApiGen/ReflectionMethod.php
  13. +1 −1 tools/ApiGen/ApiGen/ReflectionParameter.php
  14. +1 −1 tools/ApiGen/ApiGen/ReflectionProperty.php
  15. +3 −3 tools/ApiGen/ApiGen/Template.php
  16. +1 −1 tools/ApiGen/ApiGen/Tree.php
  17. +1 −1 tools/ApiGen/apigen.php
  18. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker.php
  19. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker/Backend.php
  20. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker/Backend/Memory.php
  21. +11 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Dummy/ReflectionClass.php
  22. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/BaseException.php
  23. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/BrokerException.php
  24. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/FileProcessingException.php
  25. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/ParseException.php
  26. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/RuntimeException.php
  27. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/StreamException.php
  28. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflection.php
  29. +8 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionClass.php
  30. +8 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionConstant.php
  31. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionExtension.php
  32. +8 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionFunction.php
  33. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionFunctionBase.php
  34. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionMethod.php
  35. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionNamespace.php
  36. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionParameter.php
  37. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionProperty.php
  38. +11 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionClass.php
  39. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionConstant.php
  40. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionFunction.php
  41. +1 −8 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/IReflection.php
  42. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionClass.php
  43. +16 −16 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionConstant.php
  44. +1 −11 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionExtension.php
  45. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionFunction.php
  46. +1 −11 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionMethod.php
  47. +1 −11 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionParameter.php
  48. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionProperty.php
  49. +2 −2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionAnnotation.php
  50. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionBase.php
  51. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionClass.php
  52. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionConstant.php
  53. +1 −8 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionElement.php
  54. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFile.php
  55. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFileNamespace.php
  56. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFunction.php
  57. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFunctionBase.php
  58. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionMethod.php
  59. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionNamespace.php
  60. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionParameter.php
  61. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionProperty.php
  62. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Resolver.php
  63. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/FileStream.php
  64. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/StreamBase.php
  65. +1 −1 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/StringStream.php
  66. +1 −1 tools/ApiGen/templates/@elementlist.latte
  67. +1 −1 tools/ApiGen/templates/@layout.latte
  68. +1 −1 tools/ApiGen/templates/class.latte
  69. +1 −1 tools/ApiGen/templates/combined.js.latte
  70. +1 −1 tools/ApiGen/templates/constant.latte
  71. +1 −1 tools/ApiGen/templates/deprecated.latte
  72. +1 −1 tools/ApiGen/templates/elementlist.js.latte
  73. +1 −1 tools/ApiGen/templates/function.latte
  74. +1 −1 tools/ApiGen/templates/js/main.js
  75. +1 −1 tools/ApiGen/templates/namespace.latte
  76. +2 −1 tools/ApiGen/templates/opensearch.xml.latte
  77. +1 −1 tools/ApiGen/templates/overview.latte
  78. +1 −1 tools/ApiGen/templates/package.latte
  79. +2 −2 tools/ApiGen/templates/resources/style.css
  80. +2 −1 tools/ApiGen/templates/robots.txt.latte
  81. +2 −1 tools/ApiGen/templates/sitemap.xml.latte
  82. +1 −1 tools/ApiGen/templates/source.latte
  83. +1 −1 tools/ApiGen/templates/todo.latte
  84. +1 −1 tools/ApiGen/templates/tree.latte
View
16 tools/ApiGen/ApiGen/Backend.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -13,7 +13,7 @@
namespace ApiGen;
-use TokenReflection, TokenReflection\IReflectionConstant, TokenReflection\IReflectionFunction, TokenReflection\Broker;
+use TokenReflection, TokenReflection\IReflectionConstant, TokenReflection\IReflectionFunction, TokenReflection\Broker, TokenReflection\Resolver;
use InvalidArgumentException, RuntimeException;
/**
@@ -179,8 +179,10 @@ protected function parseClassLists()
foreach ($annotations['var'] as $doc) {
foreach (explode('|', preg_replace('~\\s.*~', '', $doc)) as $name) {
- $name = rtrim($name, '[]');
- $allClasses = $this->addClass($declared, $allClasses, $name);
+ if ($name = rtrim($name, '[]')) {
+ $name = Resolver::resolveClassFQN($name, $class->getNamespaceAliases(), $class->getNamespaceName());
+ $allClasses = $this->addClass($declared, $allClasses, $name);
+ }
}
}
}
@@ -221,8 +223,10 @@ private function processFunction(array $declared, array $allClasses, $function)
foreach ($annotations[$annotation] as $doc) {
foreach (explode('|', preg_replace('~\\s.*~', '', $doc)) as $name) {
- $name = rtrim($name, '[]');
- $allClasses = $this->addClass($declared, $allClasses, $name);
+ if ($name) {
+ $name = Resolver::resolveClassFQN(rtrim($name, '[]'), $function->getNamespaceAliases(), $function->getNamespaceName());
+ $allClasses = $this->addClass($declared, $allClasses, $name);
+ }
}
}
}
View
2 tools/ApiGen/ApiGen/Config.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ConfigException.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
16 tools/ApiGen/ApiGen/Generator.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -34,7 +34,7 @@ class Generator extends Nette\Object
*
* @var string
*/
- const VERSION = '2.6.0';
+ const VERSION = '2.6.1';
/**
* Configuration.
@@ -1438,9 +1438,10 @@ public function getFunction($functionName, $namespace = '')
*
* @param string $definition Definition
* @param \ApiGen\ReflectionElement $context Link context
+ * @param string $expectedName Expected element name
* @return \ApiGen\ReflectionElement|null
*/
- public function resolveElement($definition, ReflectionElement $context)
+ public function resolveElement($definition, ReflectionElement $context, &$expectedName = null)
{
// No simple type resolving
static $types = array(
@@ -1464,9 +1465,12 @@ public function resolveElement($definition, ReflectionElement $context)
$context = $this->getClass($context->getDeclaringClassName());
}
- if (($class = $this->getClass(\TokenReflection\Resolver::resolveClassFQN($definition, $context->getNamespaceAliases(), $context->getNamespaceName()), $context->getNamespaceName()))
- || ($class = $this->getClass($definition, $context->getNamespaceName()))
- ) {
+ $namespaceAliases = $context->getNamespaceAliases();
+ if (isset($namespaceAliases[$definition]) && $definition !== ($className = \TokenReflection\Resolver::resolveClassFQN($definition, $namespaceAliases, $context->getNamespaceName()))) {
+ // Aliased class
+ $expectedName = $className;
+ return $this->getClass($className, $context->getNamespaceName());
+ } elseif ($class = $this->getClass($definition, $context->getNamespaceName())) {
// Class
return $class;
} elseif ($constant = $this->getConstant($definition, $context->getNamespaceName())) {
View
2 tools/ApiGen/ApiGen/ReflectionBase.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionClass.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionConstant.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionElement.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionExtension.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionFunction.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionFunctionBase.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionMethod.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionParameter.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/ApiGen/ReflectionProperty.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
6 tools/ApiGen/ApiGen/Template.php
@@ -1,7 +1,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -638,9 +638,9 @@ public function resolveLink($definition, ReflectionElement $context)
$suffix = '[]';
}
- $element = $this->generator->resolveElement($definition, $context);
+ $element = $this->generator->resolveElement($definition, $context, $expectedName);
if (null === $element) {
- return null;
+ return $expectedName;
}
$classes = array();
View
2 tools/ApiGen/ApiGen/Tree.php
@@ -1,6 +1,6 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/apigen.php
@@ -2,7 +2,7 @@
<?php
/**
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker/Backend.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Broker/Backend/Memory.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
12 tools/ApiGen/libs/TokenReflection/TokenReflection/Dummy/ReflectionClass.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -103,6 +103,16 @@ public function inNamespace()
}
/**
+ * Returns imported namespaces and aliases from the declaring namespace.
+ *
+ * @return array
+ */
+ public function getNamespaceAliases()
+ {
+ return array();
+ }
+
+ /**
* Returns the PHP extension reflection.
*
* @return null
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/BaseException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/BrokerException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/FileProcessingException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/ParseException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/RuntimeException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Exception/StreamException.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflection.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
9 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionClass.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -42,6 +42,13 @@ public function getNamespaceName();
public function inNamespace();
/**
+ * Returns imported namespaces and aliases from the declaring namespace.
+ *
+ * @return array
+ */
+ public function getNamespaceAliases();
+
+ /**
* Returns the PHP extension reflection.
*
* @return \TokenReflection\IReflectionExtension|null
View
9 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionConstant.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -56,6 +56,13 @@ public function getNamespaceName();
public function inNamespace();
/**
+ * Returns imported namespaces and aliases from the declaring namespace.
+ *
+ * @return array
+ */
+ public function getNamespaceAliases();
+
+ /**
* Returns the file name the reflection object is defined in.
*
* @return string
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionExtension.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
9 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionFunction.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -62,4 +62,11 @@ public function getClosure();
* @return boolean
*/
public function isValid();
+
+ /**
+ * Returns imported namespaces and aliases from the declaring namespace.
+ *
+ * @return array
+ */
+ public function getNamespaceAliases();
}
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionFunctionBase.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionMethod.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionNamespace.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionParameter.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/IReflectionProperty.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
12 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionClass.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -114,6 +114,16 @@ public function inNamespace()
}
/**
+ * Returns imported namespaces and aliases from the declaring namespace.
+ *
+ * @return array
+ */
+ public function getNamespaceAliases()
+ {
+ return array();
+ }
+
+ /**
* Returns the PHP extension reflection.
*
* @return null
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionConstant.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Invalid/ReflectionFunction.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
9 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/IReflection.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -26,13 +26,6 @@
interface IReflection extends TokenReflection\IReflection
{
/**
- * Returns imported namespaces and aliases from the declaring namespace.
- *
- * @return array
- */
- public function getNamespaceAliases();
-
- /**
* Creates a reflection instance.
*
* @param \Reflector $internalReflection Internal reflection instance
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionClass.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
32 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionConstant.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -83,24 +83,25 @@ public function __construct($name, $value, Broker $broker, ReflectionClass $pare
if (null !== $parent) {
$realParent = null;
- $parentConstants = $parent->getOwnConstants();
- if (isset($parentConstants[$name])) {
+ if (array_key_exists($name, $parent->getOwnConstants())) {
$realParent = $parent;
}
- foreach ($parent->getParentClasses() as $grandParent) {
- $grandParentConstants = $grandParent->getOwnConstants();
- if (isset($grandParentConstants[$name])) {
- $realParent = $grandParent;
- break;
+ if (null === $realParent) {
+ foreach ($parent->getParentClasses() as $grandParent) {
+ if (array_key_exists($name, $grandParent->getOwnConstants())) {
+ $realParent = $grandParent;
+ break;
+ }
}
}
- foreach ($parent->getInterfaces() as $interface) {
- $interfaceConstants = $interface->getOwnConstants();
- if (isset($interfaceConstants[$name])) {
- $realParent = $interface;
- break;
+ if (null === $realParent) {
+ foreach ($parent->getInterfaces() as $interface) {
+ if (array_key_exists($name, $interface->getOwnConstants())) {
+ $realParent = $interface;
+ break;
+ }
}
}
@@ -111,12 +112,11 @@ public function __construct($name, $value, Broker $broker, ReflectionClass $pare
$this->declaringClassName = $realParent->getName();
$this->userDefined = $realParent->isUserDefined();
} else {
- $declared = get_defined_constants(false);
- if (!isset($declared[$name])) {
+ if (!array_key_exists($name, get_defined_constants(false))) {
$this->userDefined = true;
} else {
$declared = get_defined_constants(true);
- $this->userDefined = isset($declared['user'][$name]);
+ $this->userDefined = array_key_exists($name, $declared['user']);
}
}
}
View
12 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionExtension.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -236,16 +236,6 @@ public function getBroker()
}
/**
- * Returns imported namespaces and aliases from the declaring namespace.
- *
- * @return array
- */
- public function getNamespaceAliases()
- {
- return array();
- }
-
- /**
* Magic __get method.
*
* @param string $key Variable name
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionFunction.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
12 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionMethod.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -211,16 +211,6 @@ public function getBroker()
}
/**
- * Returns imported namespaces and aliases from the declaring namespace.
- *
- * @return array
- */
- public function getNamespaceAliases()
- {
- return array();
- }
-
- /**
* Magic __get method.
*
* @param string $key Variable name
View
12 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionParameter.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -203,16 +203,6 @@ public function getBroker()
}
/**
- * Returns imported namespaces and aliases from the declaring namespace.
- *
- * @return array
- */
- public function getNamespaceAliases()
- {
- return array();
- }
-
- /**
* Returns if the paramter value can be passed by value.
*
* @return boolean
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Php/ReflectionProperty.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
4 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionAnnotation.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -204,7 +204,7 @@ private function parse()
}
// @annotation
- if (preg_match('~^@([\\S]+)\\s*(.*)~', $line, $matches)) {
+ if (preg_match('~^\\s*@([\\S]+)\\s*(.*)~', $line, $matches)) {
$name = $matches[1];
$this->annotations[$name][] = $matches[2];
continue;
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionBase.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionClass.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionConstant.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
9 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionElement.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
@@ -219,13 +219,6 @@ public function getEndPosition()
}
/**
- * Returns imported namespaces and aliases from the declaring namespace.
- *
- * @return array
- */
- abstract public function getNamespaceAliases();
-
- /**
* Returns the stack of docblock templates.
*
* @return array
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFile.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFileNamespace.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFunction.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionFunctionBase.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionMethod.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionNamespace.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionParameter.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/ReflectionProperty.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Resolver.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/FileStream.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/StreamBase.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/libs/TokenReflection/TokenReflection/Stream/StringStream.php
@@ -2,7 +2,7 @@
/**
* PHP Token Reflection
*
- * Version 1.2
+ * Version 1.2.2
*
* LICENSE
*
View
2 tools/ApiGen/templates/@elementlist.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/@layout.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/class.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/combined.js.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/constant.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/deprecated.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/elementlist.js.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/function.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/js/main.js
@@ -1,5 +1,5 @@
/*!
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/namespace.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
3 tools/ApiGen/templates/opensearch.xml.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -8,6 +8,7 @@ Copyright (c) 2011-2012 Ondřej Nešpor (https://github.com/Andrewsville)
For the full copyright and license information, please view
the file LICENSE.md that was distributed with this source code.
*}
+{contentType xml}
<?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>{$config->title}</ShortName>
View
2 tools/ApiGen/templates/overview.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/package.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
4 tools/ApiGen/templates/resources/style.css
@@ -1,5 +1,5 @@
/*!
- * ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.6.1 - API documentation generator for PHP 5.3+
*
* Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
* Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -18,7 +18,7 @@ body {
}
h1, h2, h3, h4, caption {
- font-family: Trebuchet MS, 'Geneva CE', lucida, sans-serif;
+ font-family: 'Trebuchet MS', 'Geneva CE', lucida, sans-serif;
color: #333;
}
View
3 tools/ApiGen/templates/robots.txt.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -8,6 +8,7 @@ Copyright (c) 2011-2012 Ondřej Nešpor (https://github.com/Andrewsville)
For the full copyright and license information, please view
the file LICENSE.md that was distributed with this source code.
*}
+{contentType text}
User-agent: *
Disallow:
Sitemap: {$config->baseUrl}/sitemap.xml
View
3 tools/ApiGen/templates/sitemap.xml.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
@@ -8,6 +8,7 @@ Copyright (c) 2011-2012 Ondřej Nešpor (https://github.com/Andrewsville)
For the full copyright and license information, please view
the file LICENSE.md that was distributed with this source code.
*}
+{contentType xml}
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
View
2 tools/ApiGen/templates/source.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/todo.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)
View
2 tools/ApiGen/templates/tree.latte
@@ -1,5 +1,5 @@
{*
-ApiGen 2.6.0 - API documentation generator for PHP 5.3+
+ApiGen 2.6.1 - API documentation generator for PHP 5.3+
Copyright (c) 2010-2011 David Grudl (http://davidgrudl.com)
Copyright (c) 2011-2012 Jaroslav Hanslík (https://github.com/kukulich)

0 comments on commit 8537107

Please sign in to comment.
Something went wrong with that request. Please try again.