From 65b9cca7b56b65185deac82bd64711753a3eece9 Mon Sep 17 00:00:00 2001
From: Denis Sokolov <denis@slik.eu>
Date: Thu, 10 Apr 2014 13:11:48 +0200
Subject: [PATCH 1/2] Fix ClassMapGenerator unambiguousReference test coverage

Without this fix the test only covers having files in "test", the "fixture"
portion it is not covered at all, because all fixtures in phpunit tests
are already in "test" directory
---
 .../Test/Autoload/ClassMapGeneratorTest.php   | 31 ++++++++++++++++---
 .../Test/Autoload/Fixtures/Unambiguous/A.php  |  6 ----
 .../Fixtures/Unambiguous/tests/FixtureA.php   |  3 --
 .../Fixtures/Unambiguous/tests/FixtureA2.php  |  3 --
 4 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 tests/Composer/Test/Autoload/Fixtures/Unambiguous/A.php
 delete mode 100644 tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA.php
 delete mode 100644 tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA2.php

diff --git a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
index 570eeab10..5ca42880e 100644
--- a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
@@ -152,10 +152,30 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testUnambiguousReference()
     {
-        $this->checkIfFinderIsAvailable();
+        $tempDir = sys_get_temp_dir().'/ComposerTestUnambiguousRefs';
+        if (!is_dir($tempDir)) {
+            mkdir($tempDir, 0777, true);
+        }
 
-        $finder = new Finder();
-        $finder->files()->in(__DIR__ . '/Fixtures/Unambiguous');
+        file_put_contents($tempDir.'/A.php', "<?php\nclass A {}");
+
+        file_put_contents(
+            $tempDir.'/B.php',
+            "<?php
+                if (true) {
+                    interface B {}
+                } else {
+                    interface B extends Iterator {}
+                }
+            "
+        );
+
+        foreach (array('test', 'fixture') as $keyword) {
+            if (!is_dir($tempDir.'/'.$keyword)) {
+                mkdir($tempDir.'/'.$keyword, 0777, true);
+            }
+            file_put_contents($tempDir.'/'.$keyword.'/A.php', "<?php\nclass A {}");
+        }
 
         $io = $this->getMockBuilder('Composer\IO\ConsoleIO')
             ->disableOriginalConstructor()
@@ -164,7 +184,10 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
         $io->expects($this->never())
             ->method('write');
 
-        ClassMapGenerator::createMap($finder, null, $io);
+        ClassMapGenerator::createMap($tempDir, null, $io);
+
+        $fs = new Filesystem();
+        $fs->removeDirectory($tempDir);
     }
 
     /**
diff --git a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/A.php b/tests/Composer/Test/Autoload/Fixtures/Unambiguous/A.php
deleted file mode 100644
index d88eba6e8..000000000
--- a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/A.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if (PHP_VERSION_ID < 50400) {
-    interface A extends Iterator, ArrayAccess { }
-} else {
-    interface A extends Iterator, ArrayAccess, JsonSerializable { }
-}
diff --git a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA.php b/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA.php
deleted file mode 100644
index a54ba6e4c..000000000
--- a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class FixtureA {}
\ No newline at end of file
diff --git a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA2.php b/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA2.php
deleted file mode 100644
index a54ba6e4c..000000000
--- a/tests/Composer/Test/Autoload/Fixtures/Unambiguous/tests/FixtureA2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class FixtureA {}
\ No newline at end of file

From 836534067bc4841e2ae715355e95caa496e55de6 Mon Sep 17 00:00:00 2001
From: Denis Sokolov <denis@slik.eu>
Date: Thu, 10 Apr 2014 13:15:35 +0200
Subject: [PATCH 2/2] Avoid ambiguity warning for example directories as well

In particular, PEAR repositories use a classmap and example directories trigger
multiple false positive warnings.
---
 src/Composer/Autoload/ClassMapGenerator.php            | 2 +-
 tests/Composer/Test/Autoload/ClassMapGeneratorTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
index 2cdb920a8..e7547cb04 100644
--- a/src/Composer/Autoload/ClassMapGenerator.php
+++ b/src/Composer/Autoload/ClassMapGenerator.php
@@ -84,7 +84,7 @@ class ClassMapGenerator
             foreach ($classes as $class) {
                 if (!isset($map[$class])) {
                     $map[$class] = $filePath;
-                } elseif ($io && $map[$class] !== $filePath && !preg_match('{/(test|fixture)s?/}i', strtr($map[$class].' '.$filePath, '\\', '/'))) {
+                } elseif ($io && $map[$class] !== $filePath && !preg_match('{/(test|fixture|example)s?/}i', strtr($map[$class].' '.$filePath, '\\', '/'))) {
                     $io->write(
                         '<warning>Warning: Ambiguous class resolution, "'.$class.'"'.
                         ' was found in both "'.$map[$class].'" and "'.$filePath.'", the first will be used.</warning>'
diff --git a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
index 5ca42880e..1ef68d459 100644
--- a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
@@ -170,7 +170,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
             "
         );
 
-        foreach (array('test', 'fixture') as $keyword) {
+        foreach (array('test', 'fixture', 'example') as $keyword) {
             if (!is_dir($tempDir.'/'.$keyword)) {
                 mkdir($tempDir.'/'.$keyword, 0777, true);
             }