Merge branch 'master' into 4.x

Author: jrfnl

tests/Core/Filters/GitModifiedTest.php

@@ -9,6 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Filters;
 
+use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Filters\GitModified;
 use PHP_CodeSniffer\Tests\Core\Filters\AbstractFilterTestCase;
 use RecursiveArrayIterator;
@@ -216,6 +217,10 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
             $this->markTestSkipped('Not a git repository');
         }
 
+        if (Config::getExecutablePath('git') === null) {
+            $this->markTestSkipped('git command not available');
+        }
+
         $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
         $filter = new GitModified($fakeDI, '/', self::$config, self::$ruleset);
 

tests/Core/Filters/GitStagedTest.php

@@ -9,6 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Filters;
 
+use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Filters\GitStaged;
 use PHP_CodeSniffer\Tests\Core\Filters\AbstractFilterTestCase;
 use RecursiveArrayIterator;
@@ -216,6 +217,10 @@ public function testExecAlwaysReturnsArray($cmd, $expected)
             $this->markTestSkipped('Not a git repository');
         }
 
+        if (Config::getExecutablePath('git') === null) {
+            $this->markTestSkipped('git command not available');
+        }
+
         $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
         $filter = new GitStaged($fakeDI, '/', self::$config, self::$ruleset);