From 3212e2f9e307579881dd499bf0c4a8d918bffe3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 12 Sep 2016 06:49:22 +0200
Subject: [PATCH 1/2] Clean up code coverage

- owncloud/core#26091
---
 tests/phpunit.xml.dist | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 tests/phpunit.xml.dist

diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
deleted file mode 100644
index d3a5897dfaf..00000000000
--- a/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="bootstrap.php">
-	<testsuite name='ownCloud'>
-		<directory suffix='.php'>lib/</directory>
-		<directory suffix='.php'>Settings/</directory>
-		<directory suffix='.php'>Core/</directory>
-		<file>apps.php</file>
-	</testsuite>
-	<!-- filters for code coverage -->
-	<filter>
-		<!-- whitelist processUncoveredFilesFromWhitelist="true" -->
-		<whitelist>
-			<directory suffix=".php">..</directory>
-			<exclude>
-				<directory suffix=".php">../3rdparty</directory>
-				<directory suffix=".php">../apps/files/l10n</directory>
-				<directory suffix=".php">../apps/files_external/l10n</directory>
-				<directory suffix=".php">../apps/files_external/3rdparty</directory>
-				<directory suffix=".php">../apps/files_versions/l10n</directory>
-				<directory suffix=".php">../apps/encryption/l10n</directory>
-				<directory suffix=".php">../apps/files_sharing/l10n</directory>
-				<directory suffix=".php">../apps/files_trashbin/l10n</directory>
-				<directory suffix=".php">../apps/user_ldap/l10n</directory>
-				<directory suffix=".php">../apps/user_webdavauth/l10n</directory>
-				<directory suffix=".php">../apps/provisioning_api/tests</directory>
-				<directory suffix=".php">../lib/l10n</directory>
-				<directory suffix=".php">../core/l10n</directory>
-				<directory suffix=".php">../settings/l10n</directory>
-				<directory suffix=".php">../tests</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-	<listeners>
-		<listener class="StartSessionListener" file="startsessionlistener.php" />
-	</listeners>
-</phpunit>

From cbcb53119a034d149b1ae5e1bbdb8666e9c5f35a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 12 Sep 2016 15:32:22 +0200
Subject: [PATCH 2/2] add updated composer autoloader code

---
 lib/composer/composer/ClassLoader.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/composer/composer/ClassLoader.php b/lib/composer/composer/ClassLoader.php
index ff6ecfb822f..ac67d302a18 100644
--- a/lib/composer/composer/ClassLoader.php
+++ b/lib/composer/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 @@ class ClassLoader
         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 @@ class ClassLoader
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }