diff --git a/src/Composer/DependencyResolver/Pool.php b/src/Composer/DependencyResolver/Pool.php
index c4173a00a..d407f0a3e 100644
--- a/src/Composer/DependencyResolver/Pool.php
+++ b/src/Composer/DependencyResolver/Pool.php
@@ -147,11 +147,7 @@ class Pool implements \Countable
         $candidateVersion = $candidate->getVersion();
 
         if ($candidateName === $name) {
-            if ($constraint === null || CompilingMatcher::match($constraint, Constraint::OP_EQ, $candidateVersion)) {
-                return true;
-            }
-
-            return false;
+            return $constraint === null || CompilingMatcher::match($constraint, Constraint::OP_EQ, $candidateVersion);
         }
 
         $provides = $candidate->getProvides();
diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php
index 99e15758d..eb1cc97d6 100644
--- a/src/Composer/Installer.php
+++ b/src/Composer/Installer.php
@@ -996,7 +996,7 @@ class Installer
         if (!$this->optimizeAutoloader) {
             // Force classMapAuthoritative off when not optimizing the
             // autoloader
-            $this->setClassMapAuthoritative();
+            $this->setClassMapAuthoritative(false);
         }
 
         return $this;
diff --git a/src/Composer/Platform/HhvmDetector.php b/src/Composer/Platform/HhvmDetector.php
index b05fa6a8a..ac63d047b 100644
--- a/src/Composer/Platform/HhvmDetector.php
+++ b/src/Composer/Platform/HhvmDetector.php
@@ -35,7 +35,7 @@ class HhvmDetector
     public function getVersion()
     {
         if (null !== self::$hhvmVersion) {
-            return self::$hhvmVersion;
+            return self::$hhvmVersion ?: null;
         }
 
         self::$hhvmVersion = defined('HHVM_VERSION') ? HHVM_VERSION : null;
diff --git a/src/Composer/Repository/Vcs/BitbucketDriver.php b/src/Composer/Repository/Vcs/BitbucketDriver.php
index 869eeb47f..61dc37f8e 100644
--- a/src/Composer/Repository/Vcs/BitbucketDriver.php
+++ b/src/Composer/Repository/Vcs/BitbucketDriver.php
@@ -20,8 +20,6 @@ use Composer\Util\Http\Response;
 
 abstract class BitbucketDriver extends VcsDriver
 {
-    /** @var Cache */
-    protected $cache;
     protected $owner;
     protected $repository;
     protected $hasIssues;
diff --git a/src/Composer/Repository/Vcs/GitDriver.php b/src/Composer/Repository/Vcs/GitDriver.php
index f6eda648e..3c3817c7a 100644
--- a/src/Composer/Repository/Vcs/GitDriver.php
+++ b/src/Composer/Repository/Vcs/GitDriver.php
@@ -25,7 +25,6 @@ use Composer\Config;
  */
 class GitDriver extends VcsDriver
 {
-    protected $cache;
     protected $tags;
     protected $branches;
     protected $rootIdentifier;
diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php
index e9f80460f..47e3da9b0 100644
--- a/src/Composer/Repository/Vcs/GitHubDriver.php
+++ b/src/Composer/Repository/Vcs/GitHubDriver.php
@@ -25,7 +25,6 @@ use Composer\Util\Http\Response;
  */
 class GitHubDriver extends VcsDriver
 {
-    protected $cache;
     protected $owner;
     protected $repository;
     protected $tags;
diff --git a/src/Composer/Repository/Vcs/SvnDriver.php b/src/Composer/Repository/Vcs/SvnDriver.php
index 779b460df..8e2c5e792 100644
--- a/src/Composer/Repository/Vcs/SvnDriver.php
+++ b/src/Composer/Repository/Vcs/SvnDriver.php
@@ -28,10 +28,6 @@ use Composer\Downloader\TransportException;
  */
 class SvnDriver extends VcsDriver
 {
-    /**
-     * @var Cache
-     */
-    protected $cache;
     protected $baseUrl;
     protected $tags;
     protected $branches;
diff --git a/src/Composer/Util/Git.php b/src/Composer/Util/Git.php
index 69ab25599..aa1f8dcb1 100644
--- a/src/Composer/Util/Git.php
+++ b/src/Composer/Util/Git.php
@@ -79,6 +79,7 @@ class Git
                     return;
                 }
                 $messages[] = '- ' . $protoUrl . "\n" . preg_replace('#^#m', '  ', $this->process->getErrorOutput());
+
                 if ($initialClone && isset($origCwd)) {
                     $this->filesystem->removeDirectory($origCwd);
                 }
diff --git a/src/Composer/Util/Http/CurlDownloader.php b/src/Composer/Util/Http/CurlDownloader.php
index 94b8038e5..fe2f32af9 100644
--- a/src/Composer/Util/Http/CurlDownloader.php
+++ b/src/Composer/Util/Http/CurlDownloader.php
@@ -207,7 +207,7 @@ class CurlDownloader
         );
 
         $usingProxy = !empty($options['http']['proxy']) ? ' using proxy ' . $options['http']['proxy'] : '';
-        $ifModified = false !== strpos(strtolower(implode(',', $options['http']['header'])), 'if-modified-since:') ? ' if modified' : '';
+        $ifModified = false !== stripos(implode(',', $options['http']['header']), 'if-modified-since:') ? ' if modified' : '';
         if ($attributes['redirects'] === 0) {
             $this->io->writeError('Downloading ' . Url::sanitize($url) . $usingProxy . $ifModified, true, IOInterface::DEBUG);
         }
diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php
index 96472452f..712e2b818 100644
--- a/src/Composer/Util/Perforce.php
+++ b/src/Composer/Util/Perforce.php
@@ -273,7 +273,7 @@ class Perforce
         if ($useClient) {
             $p4Command .= '-c ' . $this->getClient() . ' ';
         }
-        $p4Command = $p4Command . '-p ' . $this->getPort() . ' ' . $command;
+        $p4Command .= '-p ' . $this->getPort() . ' ' . $command;
 
         return $p4Command;
     }