Merge branch '1.4'

src/Composer/Autoload/AutoloadGenerator.php

@@ -534,10 +534,6 @@ EOF;
             }
         }
 
-        if (preg_match('/\.phar$/', $path)) {
-            $baseDir = "'phar://' . " . $baseDir;
-        }
-
         return $baseDir . (($path !== false) ? var_export($path, true) : "");
     }
 

tests/Composer/Test/IO/ConsoleIOTest.php

@@ -218,8 +218,11 @@ class ConsoleIOTest extends TestCase
             ->will($this->returnValue($helperMock))
         ;
 
+        $validator = function ($value) {
+             return true;
+        };
         $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
-        $consoleIO->askAndValidate('Why?', 'validator', 10, 'default');
+        $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
     }
 
     public function testSelect()

tests/Composer/Test/Json/ComposerSchemaTest.php

@@ -101,9 +101,10 @@ class ComposerSchemaTest extends \PHPUnit_Framework_TestCase
         if (!$validator->isValid()) {
             $errors = $validator->getErrors();
 
-            // remove justinrainbow/json-schema 3.0 props so it works with all versions
+            // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
             foreach ($errors as &$err) {
                 unset($err['pointer']);
+                unset($err['context']);
             }
 
             return $errors;