diff -u b/core/modules/book/src/Form/BookOutlineForm.php b/core/modules/book/src/Form/BookOutlineForm.php --- b/core/modules/book/src/Form/BookOutlineForm.php +++ b/core/modules/book/src/Form/BookOutlineForm.php @@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityRepositoryInterface; use Drupal\Core\Entity\EntityTypeBundleInfoInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Url; use Drupal\node\Entity\Node; use Symfony\Component\DependencyInjection\ContainerInterface; diff -u b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php --- b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php +++ b/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php @@ -42,7 +42,7 @@ 'taxonomy_term' => $parent->id(), ], [ - 'language' => $parent->language() + 'language' => $parent->language(), ] )); } diff -u b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php --- b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php @@ -7,7 +7,6 @@ use Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder; use Drupal\taxonomy\TermStorageInterface; use Drupal\Tests\UnitTestCase; -use Prophecy\Argument; use Symfony\Component\DependencyInjection\Container; /** diff -u b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php --- b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php @@ -3,7 +3,6 @@ namespace Drupal\menu_link_content\Form; use Drupal\Core\Entity\ContentEntityDeleteForm; -use Drupal\Core\Url; use Drupal\system\Entity\Menu; /** only in patch2: unchanged: --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php @@ -44,6 +44,7 @@ public function testConstructor() { ); $forum_manager = $this->createMock('Drupal\forum\ForumManagerInterface'); $translation_manager = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface'); + $entity_repository = $this->createMock('Drupal\Core\Entity\EntityRepositoryInterface'); // Make an object to test. $builder = $this->getMockForAbstractClass( @@ -54,6 +55,7 @@ public function testConstructor() { $config_factory, $forum_manager, $translation_manager, + $entity_repository, ] ); @@ -115,6 +117,8 @@ public function testBuild() { ['taxonomy_vocabulary', $vocab_storage], ])); + $entity_repository = $this->createMock('Drupal\Core\Entity\EntityRepositoryInterface'); + $config_factory = $this->getConfigFactoryStub( [ 'forum.settings' => [ @@ -132,6 +136,7 @@ public function testBuild() { $config_factory, $forum_manager, $translation_manager, + $entity_repository, ] ); only in patch2: unchanged: --- a/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php +++ b/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php @@ -121,7 +121,10 @@ public function testInfoAlterations() { } // Check language negotiation results. - $this->drupalGet(''); + // We won't call here for '' root, because this would redirect to user page, + // and the language of the link (that means interface as well) will be set + // to LanguageInterface::TYPE_CONTENT. Instead, any 404 page will work. + $this->drupalGet('page_not_found'); $last = $this->container->get('state')->get('language_test.language_negotiation_last'); foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) { $langcode = $last[$type]; only in patch2: unchanged: --- a/core/modules/user/tests/src/Kernel/Controller/UserControllerTest.php +++ b/core/modules/user/tests/src/Kernel/Controller/UserControllerTest.php @@ -3,6 +3,8 @@ namespace Drupal\Tests\user\Kernel\Controller; use Drupal\Core\Datetime\DateFormatterInterface; +use Drupal\Core\Flood\FloodInterface; +use Drupal\Core\Language\LanguageManagerInterface; use Drupal\KernelTests\KernelTestBase; use Drupal\user\Controller\UserController; use Drupal\user\UserDataInterface; @@ -24,11 +26,16 @@ public function testConstructorDeprecations() { $user_storage = $this->prophesize(UserStorageInterface::class); $user_data = $this->prophesize(UserDataInterface::class); $logger = $this->prophesize(LoggerInterface::class); + $flood = $this->prophesize(FloodInterface::class); + $language_manager = $this->prophesize(LanguageManagerInterface::class); + $controller = new UserController( $date_formatter->reveal(), $user_storage->reveal(), $user_data->reveal(), - $logger->reveal() + $logger->reveal(), + NULL, + $language_manager->reveal() ); $this->assertNotNull($controller); }