From 7b55dd65358ddd82ee37fbd2d3bb646cdb4e96ae Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 6 Mar 2013 06:25:32 -0600
Subject: [PATCH 1/2] Revert changes to ClassFileLocator

- No longer necessary to do the halt_compiler hack
---
 src/ClassFileLocator.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/ClassFileLocator.php b/src/ClassFileLocator.php
index 840d60d..666b4bf 100644
--- a/src/ClassFileLocator.php
+++ b/src/ClassFileLocator.php
@@ -144,24 +144,6 @@ public function accept()
                         }
                     }
                     break;
-                case T_HALT_COMPILER:
-                    for ($i++; $i < $count; $i++) {
-                        $token = $tokens[$i];
-                        if (is_string($token)) {
-                            continue;
-                        }
-                        list($type, $content, $line) = $token;
-                        if (T_INLINE_HTML == $type) {
-                            $matches = array();
-                            if (!preg_match('/^class (?P<class>[a-z][a-z0-9_]*)(?>(?> extends \\?[a-zA-Z][a-zA-Z0-9\_]*)?(?: implements (\\?[a-zA-Z][a-zA-Z0-9\_]*(,\s*)?)?)?)\s*{?/mi', $content, $matches)) {;
-                                break;
-                            }
-                            $class = (null === $namespace) ? $matches['class'] : $namespace . '\\' . $matches['class'];
-                            $file->addClass($class);
-                            $namespace = null;
-                        }
-                    }
-                    break;
                 default:
                     break;
             }

From 37a2e781230e704a64176d8f57ce3459f4eb9d92 Mon Sep 17 00:00:00 2001
From: sasezaki <sasezaki@gmail.com>
Date: Mon, 25 Mar 2013 05:16:17 +0900
Subject: [PATCH 2/2] fixed missing const argument, when passed magic_file
 argument fails.

---
 src/Transfer/Adapter/AbstractAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Transfer/Adapter/AbstractAdapter.php b/src/Transfer/Adapter/AbstractAdapter.php
index f3b6d0c..53bfa0d 100644
--- a/src/Transfer/Adapter/AbstractAdapter.php
+++ b/src/Transfer/Adapter/AbstractAdapter.php
@@ -1232,7 +1232,7 @@ protected function detectMimeType($value)
 
             if (empty($mime)) {
                 ErrorHandler::start();
-                $mime = finfo_open($const);
+                $mime = finfo_open(FILEINFO_MIME_TYPE);
                 ErrorHandler::stop();
             }