Sfoglia il codice sorgente

Fix php_strip_whitespace bugginess, fixes #3030

Jordi Boggiano 10 anni fa
parent
commit
a227523c4f
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      src/Composer/Autoload/ClassMapGenerator.php

+ 3 - 3
src/Composer/Autoload/ClassMapGenerator.php

@@ -115,7 +115,7 @@ class ClassMapGenerator
         $traits = version_compare(PHP_VERSION, '5.4', '<') ? '' : '|trait';
 
         try {
-            $contents = php_strip_whitespace($path);
+            $contents = @php_strip_whitespace($path);
         } catch (\Exception $e) {
             throw new \RuntimeException('Could not scan for classes inside '.$path.": \n".$e->getMessage(), 0, $e);
         }
@@ -160,8 +160,8 @@ class ClassMapGenerator
             } else {
                 $name = $matches['name'][$i];
                 if ($name[0] === ':') {
-                  // This is an XHP class, https://github.com/facebook/xhp
-                  $name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1);
+                    // This is an XHP class, https://github.com/facebook/xhp
+                    $name = 'xhp'.substr(str_replace(array('-', ':'), array('_', '__'), $name), 1);
                 }
                 $classes[] = ltrim($namespace . $name, '\\');
             }