Ruleset: update wiring in after class rename

Author: jrfnl

src/Ruleset.php

@@ -14,7 +14,7 @@
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Sniffs\DeprecatedSniff;
 use PHP_CodeSniffer\Util\Common;
-use PHP_CodeSniffer\Util\MsgCollector;
+use PHP_CodeSniffer\Util\MessageCollector;
 use PHP_CodeSniffer\Util\Standards;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -142,7 +142,7 @@ class Ruleset
      * - Errors which are directly aimed at and only intended for sniff developers or integrators
      *   (in contrast to ruleset maintainers or end-users).
      *
-     * @var \PHP_CodeSniffer\Util\MsgCollector
+     * @var \PHP_CodeSniffer\Util\MessageCollector
      */
     private $msgCache;
 
@@ -161,7 +161,7 @@ public function __construct(Config $config)
         $restrictions   = $config->sniffs;
         $exclusions     = $config->exclude;
         $sniffs         = [];
-        $this->msgCache = new MsgCollector();
+        $this->msgCache = new MessageCollector();
 
         $standardPaths = [];
         foreach ($config->standards as $standard) {

tests/Core/Ruleset/DisplayCachedMessagesTest.php

@@ -12,7 +12,7 @@
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Tests\ConfigDouble;
 use PHP_CodeSniffer\Tests\Core\Ruleset\AbstractRulesetTestCase;
-use PHP_CodeSniffer\Util\MsgCollector;
+use PHP_CodeSniffer\Util\MessageCollector;
 use ReflectionMethod;
 use ReflectionProperty;
 
@@ -77,14 +77,14 @@ public static function dataBlockingErrorsAreDisplayedViaAnException()
     {
         return [
             'One error'                               => [
-                'messages' => ['This is a serious blocking issue' => MsgCollector::ERROR],
+                'messages' => ['This is a serious blocking issue' => MessageCollector::ERROR],
                 'expected' => 'ERROR: This is a serious blocking issue'.PHP_EOL.PHP_EOL,
             ],
             'Multiple blocking errors'                => [
                 'messages' => [
-                    'This is a serious blocking issue'        => MsgCollector::ERROR,
-                    'And here is another one'                 => MsgCollector::ERROR,
-                    'OMG, why do you think that would work ?' => MsgCollector::ERROR,
+                    'This is a serious blocking issue'        => MessageCollector::ERROR,
+                    'And here is another one'                 => MessageCollector::ERROR,
+                    'OMG, why do you think that would work ?' => MessageCollector::ERROR,
                 ],
                 // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- Test readability is more important.
                 'expected' => 'ERROR: This is a serious blocking issue'.PHP_EOL
@@ -94,9 +94,9 @@ public static function dataBlockingErrorsAreDisplayedViaAnException()
             ],
             'Mix of blocking and non-blocking errors' => [
                 'messages' => [
-                    'This is a serious blocking issue'                              => MsgCollector::ERROR,
-                    'Something something deprecated and will be removed in v x.x.x' => MsgCollector::DEPRECATED,
-                    'Careful, this may not be correct'                              => MsgCollector::NOTICE,
+                    'This is a serious blocking issue'                              => MessageCollector::ERROR,
+                    'Something something deprecated and will be removed in v x.x.x' => MessageCollector::DEPRECATED,
+                    'Careful, this may not be correct'                              => MessageCollector::NOTICE,
                 ],
                 // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- Test readability is more important.
                 'expected' => 'ERROR: This is a serious blocking issue'.PHP_EOL
@@ -142,23 +142,23 @@ public static function dataNonBlockingErrorsGenerateOutput()
     {
         return [
             'One deprecation'              => [
-                'messages' => ['My deprecation message' => MsgCollector::DEPRECATED],
+                'messages' => ['My deprecation message' => MessageCollector::DEPRECATED],
                 'expected' => 'DEPRECATED: My deprecation message'.PHP_EOL.PHP_EOL,
             ],
             'One notice'                   => [
-                'messages' => ['My notice message' => MsgCollector::NOTICE],
+                'messages' => ['My notice message' => MessageCollector::NOTICE],
                 'expected' => 'NOTICE: My notice message'.PHP_EOL.PHP_EOL,
             ],
             'One warning'                  => [
-                'messages' => ['My warning message' => MsgCollector::WARNING],
+                'messages' => ['My warning message' => MessageCollector::WARNING],
                 'expected' => 'WARNING: My warning message'.PHP_EOL.PHP_EOL,
             ],
             'Multiple non-blocking errors' => [
                 'messages' => [
-                    'Something something deprecated and will be removed in v x.x.x' => MsgCollector::DEPRECATED,
-                    'Something is not supported and support may be removed'         => MsgCollector::WARNING,
-                    'Some other deprecation notice'                                 => MsgCollector::DEPRECATED,
-                    'Careful, this may not be correct'                              => MsgCollector::NOTICE,
+                    'Something something deprecated and will be removed in v x.x.x' => MessageCollector::DEPRECATED,
+                    'Something is not supported and support may be removed'         => MessageCollector::WARNING,
+                    'Some other deprecation notice'                                 => MessageCollector::DEPRECATED,
+                    'Careful, this may not be correct'                              => MessageCollector::NOTICE,
                 ],
                 // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- Test readability is more important.
                 'expected' => 'WARNING: Something is not supported and support may be removed'.PHP_EOL
@@ -187,7 +187,7 @@ public function testBlockingErrorsAlwaysShow($configArgs)
         $ruleset = new Ruleset($config);
 
         $message = 'Some serious error';
-        $errors  = [$message => MsgCollector::ERROR];
+        $errors  = [$message => MessageCollector::ERROR];
         $this->mockCachedMessages($ruleset, $errors);
 
         $this->expectRuntimeExceptionMessage('ERROR: '.$message.PHP_EOL);
@@ -210,7 +210,7 @@ public function testNonBlockingErrorsDoNotShowUnderSpecificCircumstances($config
     {
         $config  = new ConfigDouble($configArgs);
         $ruleset = new Ruleset($config);
-        $this->mockCachedMessages($ruleset, ['Deprecation notice' => MsgCollector::DEPRECATED]);
+        $this->mockCachedMessages($ruleset, ['Deprecation notice' => MessageCollector::DEPRECATED]);
 
         $this->expectOutputString('');