Commit aec9ebc2 authored by catch's avatar catch
Browse files

Revert "Issue #3254986 by Matroskeen, paulocs, mikelutz, benjifisher,... 

Revert "Issue #3254986 by Matroskeen, paulocs, mikelutz, benjifisher, danflanagan8, quietone: Remove requirements array from RequirementsException message"

This reverts commit 0f10593e.
parent 751983cb

core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['node'],

        'Expected messages' => [

          'error' => [

            'Migration d6_comment_type did not meet the requirements. The node module is not enabled in the source site.',

            'Migration d6_comment_type did not meet the requirements. The node module is not enabled in the source site. source_module_additional: node.',

          ],

        ],

      ],
@@ -127,7 +127,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['comment'],

        'Expected messages' => [

          'error' => [

            'Migration d6_comment_type did not meet the requirements. The module comment is not enabled in the source site.',

            'Migration d6_comment_type did not meet the requirements. The module comment is not enabled in the source site. source_module: comment.',

          ],

        ],

      ],
@@ -135,7 +135,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['comment', 'node'],

        'Expected messages' => [

          'error' => [

            'Migration d6_comment_type did not meet the requirements. The module comment is not enabled in the source site.',

            'Migration d6_comment_type did not meet the requirements. The module comment is not enabled in the source site. source_module: comment.',

          ],

        ],

      ],

core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['node'],

        'Expected messages' => [

          'error' => [

            'Migration d7_comment_type did not meet the requirements. The node module is not enabled in the source site.',

            'Migration d7_comment_type did not meet the requirements. The node module is not enabled in the source site. source_module_additional: node.',

          ],

        ],

      ],
@@ -133,7 +133,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['comment'],

        'Expected messages' => [

          'error' => [

            'Migration d7_comment_type did not meet the requirements. The module comment is not enabled in the source site.',

            'Migration d7_comment_type did not meet the requirements. The module comment is not enabled in the source site. source_module: comment.',

          ],

        ],

      ],
@@ -141,7 +141,7 @@ public function providerTestNoCommentTypeMigration() { 
        'Disabled source modules' => ['comment', 'node'],

        'Expected messages' => [

          'error' => [

            'Migration d7_comment_type did not meet the requirements. The module comment is not enabled in the source site.',

            'Migration d7_comment_type did not meet the requirements. The module comment is not enabled in the source site. source_module: comment.',

          ],

        ],

      ],

core/modules/migrate/src/MigrateExecutable.php

+2 −1
Original line number Diff line number Diff line
@@ -164,10 +164,11 @@ public function import() { 
    catch (RequirementsException $e) {

      $this->message->display(

        $this->t(

          'Migration @id did not meet the requirements. @message',

          'Migration @id did not meet the requirements. @message @requirements',

          [

            '@id' => $this->migration->id(),

            '@message' => $e->getMessage(),

            '@requirements' => $e->getRequirementsString(),

          ]

        ),

        'error'