zendframework · Ocramius · Feb 28, 2013 · Mar 1, 2013 · Mar 1, 2013 · Mar 1, 2013
diff --git a/README-GIT.md b/README-GIT.md
@@ -73,7 +73,7 @@ repository.
 
 ### Pre-Commit Hook (Optional)
 
-The ZF2 Travis-CI will confirm that code style standards are met 
+The ZF2 Travis-CI will confirm that code style standards are met
 by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during it's build runs.
 
 To reduce the number of red Travis-CI builds, the following Git pre-commit hook
@@ -85,13 +85,13 @@ can help catch code style issues before committing. Save it as
 <?php
 /**
  * .git/hooks/pre-commit
- * 
- * This pre-commit hooks will check for PHP errors (lint), and make sure the 
+ *
+ * This pre-commit hooks will check for PHP errors (lint), and make sure the
  * code is PSR-2 compliant.
- * 
+ *
  * Dependecy: PHP-CS-Fixer (https://github.com/fabpot/PHP-CS-Fixer)
- * 
- * @author  Mardix  http://github.com/mardix 
+ *
+ * @author  Mardix  http://github.com/mardix
  * @author  Matthew Weier O'Phinney http://mwop.net/
  * @since   4 Sept 2012
  */
@@ -194,12 +194,12 @@ create a branch for fixing an issue in the tracker.
 Switched to a new branch 'zf9295'
 ```
 ... do some work ...
-  
+
 ```sh
 % git commit
 ```
 ... write your log message ...
-  
+
 ```sh
 % git push origin HEAD:zf9295
 Counting objects: 38, done.
@@ -249,7 +249,7 @@ Once you know that your changes have been accepted to the master
 repository, we suggest doing some cleanup of these branches.
 
  -  Local branch cleanup
-    
+
     ```sh
     % git branch -d <branchname>
     ```
@@ -275,4 +275,4 @@ on GitHub.
 ## CONTRIBUTORS AND COMMITTERS
 
 Both Zend's internal Zend Framework team and the members of the Community Review
-team have push privileges to the ZF2 repository. 
+team have push privileges to the ZF2 repository.
diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
-### Welcome to the *Zend Framework 2.1* Release!
+### Welcome to the *Zend Framework 2.2* Release!
 
 Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
 Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.1.5dev*
+*Zend Framework 2.2.0dev*
 
-This is the fifth maintenance release for the version 2.1 series.
+This is the second minor (feature) release for the version 2 series.
 
 DD MMM YYYY
 
-### UPDATES IN 2.1.5
+### UPDATES IN 2.2.0
 
 Please see [CHANGELOG.md](CHANGELOG.md).
 

diff --git a/bin/classmap_generator.php b/bin/classmap_generator.php
@@ -24,6 +24,7 @@
  * --append|-a                  Append to autoload file if it exists
  * --overwrite|-w               Whether or not to overwrite existing autoload
  *                              file
+ * --ignore|-i [ <string> ]     Comma-separated namespaces to ignore
  */
 
 $zfLibraryPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
@@ -53,6 +54,7 @@
     'output|o-s'  => 'Where to write autoload file; if not provided, assumes "autoload_classmap.php" in library directory',
     'append|a'    => 'Append to autoload file if it exists',
     'overwrite|w' => 'Whether or not to overwrite existing autoload file',
+    'ignore|i-s'  => 'Comma-separated namespaces to ignore',
 );
 
 try {
@@ -68,6 +70,11 @@
     exit(0);
 }
 
+$ignoreNamespaces = array();
+if (isset($opts->i)) {
+    $ignoreNamespaces = explode(',', $opts->i);
+}
+
 $relativePathForClassmap = '';
 if (isset($opts->l)) {
     if (!is_dir($opts->l)) {
@@ -157,6 +164,12 @@
     $filename  = $relativePathForClassmap . $filename;
 
     foreach ($file->getClasses() as $class) {
+        foreach ($ignoreNamespaces as $ignoreNs) {
+            if ($ignoreNs == substr($class, 0, strlen($ignoreNs))) {
+                continue 2;
+            }
+        }
+
         $map->{$class} = $filename;
     }
 }