Merge branch 'hotfix/2.2.1'

ApiGen · Oct 26, 2011 · 19d1593 · 19d1593
2 parents f8a00fb + 1889edc
commit 19d1593
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 24 deletions.
diff --git a/ApiGen/Backend.php b/ApiGen/Backend.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/Config.php b/ApiGen/Config.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/Exception.php b/ApiGen/Exception.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/Generator.php b/ApiGen/Generator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)
@@ -37,7 +37,7 @@ class Generator extends Nette\Object
 	 *
 	 * @var string
 	 */
-	const VERSION = '2.2.0';
+	const VERSION = '2.2.1';
 
 	/**
 	 * Configuration.

diff --git a/ApiGen/ReflectionBase.php b/ApiGen/ReflectionBase.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionClass.php b/ApiGen/ReflectionClass.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionConstant.php b/ApiGen/ReflectionConstant.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionElement.php b/ApiGen/ReflectionElement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionExtension.php b/ApiGen/ReflectionExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionFunction.php b/ApiGen/ReflectionFunction.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionFunctionBase.php b/ApiGen/ReflectionFunctionBase.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionMethod.php b/ApiGen/ReflectionMethod.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionParameter.php b/ApiGen/ReflectionParameter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/ReflectionProperty.php b/ApiGen/ReflectionProperty.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/Template.php b/ApiGen/Template.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/ApiGen/Tree.php b/ApiGen/Tree.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## ApiGen 2.2.1 ##
+
+* Fixed processing of magic constants
+* Fixed resize.png
+* TokenReflection library updated to version 1.0.0RC2
+
 ## ApiGen 2.2.0 ##
 
 * Added an option to check for updates

diff --git a/README.md b/README.md
@@ -203,7 +203,7 @@ Check for a new version of ApiGen, default is "Yes".
 
 Display additional information (exception trace) in case of an error, default is "No".
 
-```--help|-h```
+```--help|-h ```
 
 Display the list of possible options.
 
@@ -224,6 +224,7 @@ Even when using a config file, you can still provide additional parameters via t
 Keep in mind, that any values in the config file will be **overwritten** by values from the command line. That means that providing the ```--source``` parameter values both in the config file and via the command line will not result in using all the provided values but only those from the command line.
 
 ### Example ###
+
 We are generating documentation for the Nella Framework. We want Nette and Doctrine to be parsed as well because we want their classes to appear in class trees, lists of parent classes and their members in lists of inherited properties, methods and constants. However we do not want to generate their full documentation along with highlighted source codes. And we do not want to process any "test" directories, because there might be classes that do not belong to the project actually.
 
 ```

diff --git a/apigen.bat b/apigen.bat
@@ -1,5 +1,5 @@
 @echo off
-REM ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+REM ApiGen 2.2.1 - API documentation generator for PHP 5.3+
 REM
 REM Copyright (c) 2010 David Grudl (http://davidgrudl.com)
 REM Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/apigen.php b/apigen.php
@@ -2,7 +2,7 @@
 <?php
 
 /**
- * ApiGen 2.2.0 - API documentation generator for PHP 5.3+
+ * ApiGen 2.2.1 - API documentation generator for PHP 5.3+
  *
  * Copyright (c) 2010 David Grudl (http://davidgrudl.com)
  * Copyright (c) 2011 Jaroslav Hanslík (https://github.com/kukulich)

diff --git a/libs/TokenReflection b/libs/TokenReflection
diff --git a/package.xml b/package.xml
@@ -23,9 +23,9 @@
 	<email>andrew@apigen.org</email>
 	<active>yes</active>
 </lead>
-<date>2011-10-16</date>
+<date>2011-10-26</date>
 <version>
-	<release>2.2.0</release>
+	<release>2.2.1</release>
 	<api>2.2.0</api>
 </version>
 <stability>
@@ -177,7 +177,7 @@
 		<package>
 			<name>TokenReflection</name>
 			<channel>pear.andrewsville.cz</channel>
-			<min>1.0.0RC1</min>
+			<min>1.0.0RC2</min>
 		</package>
 	</required>
 </dependencies>

diff --git a/templates/default/resources/resize.png b/templates/default/resources/resize.png
diff --git a/templates/frames/resources/resize.png b/templates/frames/resources/resize.png