Merge branch 'master' into 4.x

Author: jrfnl

src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -97,10 +97,6 @@ class ScopeIndentSniff implements Sniff
      */
     public function register()
     {
-        if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
-            $this->debug = false;
-        }
-
         return [T_OPEN_TAG];
 
     }//end register()

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -30,6 +30,8 @@ final class ScopeIndentUnitTest extends AbstractSniffTestCase
      */
     public function setCliValues($testFile, $config)
     {
+        $config->setConfigData('scope_indent_debug', false, true);
+
         // Tab width setting is only needed for the tabbed file.
         if ($testFile === 'ScopeIndentUnitTest.2.inc') {
             $config->tabWidth = 4;

src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -20,6 +20,21 @@ final class ScopeIndentUnitTest extends AbstractSniffTestCase
 {
 
 
+    /**
+     * Get a list of CLI values to set before the file is tested.
+     *
+     * @param string                  $testFile The name of the file being tested.
+     * @param \PHP_CodeSniffer\Config $config   The config data for the test run.
+     *
+     * @return void
+     */
+    public function setCliValues($testFile, $config)
+    {
+        $config->setConfigData('scope_indent_debug', false, true);
+
+    }//end setCliValues()
+
+
     /**
      * Returns the lines where errors should occur.
      *