From 734e5e2f2bc6ab31532e56cec622ce0201a02089 Mon Sep 17 00:00:00 2001
From: Fred Emmott <fredemmott@fb.com>
Date: Tue, 18 Mar 2014 14:37:37 -0700
Subject: [PATCH 1/2] Add autoload support for .hh files (HHVM)

HHVM is adding support for an alternative extension for files using
HHVM-specific features. Support them in the Class Map and PSR4
autoloaders.

Trivial example: https://github.com/fredemmott/hh_extension_toolset
---
 src/Composer/Autoload/ClassLoader.php       | 21 +++++++++++++++++----
 src/Composer/Autoload/ClassMapGenerator.php |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php
index 47ae2ee92..150cfc881 100644
--- a/src/Composer/Autoload/ClassLoader.php
+++ b/src/Composer/Autoload/ClassLoader.php
@@ -291,8 +291,22 @@ class ClassLoader
             return $this->classMap[$class];
         }
 
+        $file = $this->findFileWithExtension($class, '.php');
+        if ($file === null) {
+          // Indicates a Hack file (hacklang.org)
+          $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if ($file === null) {
+            // Remember that this class does not exist.
+            return $this->classMap[$class] = false;
+        }
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext) {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
@@ -321,7 +335,7 @@ class ClassLoader
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
@@ -348,8 +362,7 @@ class ClassLoader
             return $file;
         }
 
-        // Remember that this class does not exist.
-        return $this->classMap[$class] = false;
+        return null;
     }
 }
 
diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
index 73c036a37..1f20274e2 100644
--- a/src/Composer/Autoload/ClassMapGenerator.php
+++ b/src/Composer/Autoload/ClassMapGenerator.php
@@ -54,7 +54,7 @@ class ClassMapGenerator
             if (is_file($path)) {
                 $path = array(new \SplFileInfo($path));
             } elseif (is_dir($path)) {
-                $path = Finder::create()->files()->followLinks()->name('/\.(php|inc)$/')->in($path);
+                $path = Finder::create()->files()->followLinks()->name('/\.(php|inc|hh)$/')->in($path);
             } else {
                 throw new \RuntimeException(
                     'Could not scan for classes inside "'.$path.
@@ -68,7 +68,7 @@ class ClassMapGenerator
         foreach ($path as $file) {
             $filePath = $file->getRealPath();
 
-            if (!in_array(pathinfo($filePath, PATHINFO_EXTENSION), array('php', 'inc'))) {
+            if (!in_array(pathinfo($filePath, PATHINFO_EXTENSION), array('php', 'inc', 'hh'))) {
                 continue;
             }
 

From 7d3274224aa5e4b1b7efb27a3fb02291546b9590 Mon Sep 17 00:00:00 2001
From: Fred Emmott <fredemmott@fb.com>
Date: Tue, 18 Mar 2014 16:21:41 -0700
Subject: [PATCH 2/2] Only look for .hh files at runtime if using HHVM

The ClassMap generator will look regardless, but that's not a runtime
cost, so seems desirable (in case composer install/update needs to be
called with php5 for some resaon)
---
 src/Composer/Autoload/ClassLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php
index 150cfc881..e27edeb1d 100644
--- a/src/Composer/Autoload/ClassLoader.php
+++ b/src/Composer/Autoload/ClassLoader.php
@@ -292,7 +292,7 @@ class ClassLoader
         }
 
         $file = $this->findFileWithExtension($class, '.php');
-        if ($file === null) {
+        if ($file === null && defined('HHVM_VERSION')) {
           // Indicates a Hack file (hacklang.org)
           $file = $this->findFileWithExtension($class, '.hh');
         }