From 51eca2cdfccec6e7f194316e78493f22c27e0a92 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 13 Dec 2012 17:39:17 +0100
Subject: [PATCH] Fix matching of classes in trailing non-php text, fixes #1409

---
 src/Composer/Autoload/ClassMapGenerator.php            |  7 ++++++-
 .../Test/Autoload/Fixtures/template/template_3.php     | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/Composer/Test/Autoload/Fixtures/template/template_3.php

diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
index 5a74728f2..0a4db9bdc 100644
--- a/src/Composer/Autoload/ClassMapGenerator.php
+++ b/src/Composer/Autoload/ClassMapGenerator.php
@@ -121,7 +121,12 @@ class ClassMapGenerator
             $contents = preg_replace('{^.+?<\?}s', '<?', $contents);
         }
         // strip non-php blocks in the file
-        $contents = preg_replace('{\?>.*<\?}s', '', $contents);
+        $contents = preg_replace('{\?>.+<\?}s', '?><?', $contents);
+        // strip trailing non-php code if needed
+        $pos = strrpos($contents, '?>');
+        if (false !== $pos && false === strpos(substr($contents, $pos), '<?')) {
+            $contents = substr($contents, 0, $pos);
+        }
 
         preg_match_all('{
             (?:
diff --git a/tests/Composer/Test/Autoload/Fixtures/template/template_3.php b/tests/Composer/Test/Autoload/Fixtures/template/template_3.php
new file mode 100644
index 000000000..5a0d0e38b
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/template/template_3.php
@@ -0,0 +1,10 @@
+
+class leading { }
+
+<?php echo $queryClass ?>
+
+class inner { }
+
+<?php echo $defaultLocale ?>
+
+class trailing { }
\ No newline at end of file