Merge branch 'ericpoe-composerImprovements'

CONTRIBUTING.md

@@ -49,3 +49,7 @@ An example would be:
 ```
 JOINDIN-445 #close Fixed.
 ```
+
+## PHP Version
+
+The current PHP version for joind.in is PHP 5.6.

composer.json

@@ -13,7 +13,12 @@
             "User":        ["app/src/", "tests/"]
         }
     },
-    "preferred-install": "dist",
+    "config": {
+        "platform": {
+            "php": "5.6.26"
+        },
+        "preferred-install": "dist"
+    },
     "minimum-stability": "stable",
     "require": {
         "predis/predis":         "~0.8",
@@ -24,8 +29,8 @@
         "symfony/validator":     "~2.5",
         "symfony/security-csrf": "~2.5",
         "symfony/twig-bridge":   "~2.5",
-        "org_heigl/daterange": "~1.1",
-        "guzzlehttp/guzzle": "^6.2.1",
-        "monolog/monolog": "^1.21"
+        "org_heigl/daterange":   "~1.1",
+        "guzzlehttp/guzzle":     "^6.2.1",
+        "monolog/monolog":       "^1.21"
     }
 }

vendor/composer/ClassLoader.php

@@ -53,8 +53,8 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
 
     public function getPrefixes()
     {
@@ -322,20 +322,20 @@ public function findFile($class)
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -399,6 +399,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }