Skip to content
Snippets Groups Projects
Verified Commit 2dad4744 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3433093 by mondrake: Method getObjectForTrait() of class...

Issue #3433093 by mondrake: Method getObjectForTrait() of class PHPUnit\Framework\TestCase is deprecated in PHPUnit 10
parent 695c6a53
No related branches found
No related tags found
28 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #128542 canceled
Pipeline: drupal

#128543

    ......@@ -5,6 +5,7 @@
    namespace Drupal\Tests\Core\StringTranslation;
    use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
    use Drupal\Core\StringTranslation\StringTranslationTrait;
    use Drupal\Core\StringTranslation\TranslatableMarkup;
    use Drupal\Core\StringTranslation\TranslationInterface;
    use Drupal\Tests\UnitTestCase;
    ......@@ -17,19 +18,9 @@
    class StringTranslationTraitTest extends UnitTestCase {
    /**
    * A reflection of self::$translation.
    *
    * @var \ReflectionClass
    * The object under test that uses StringTranslationTrait.
    */
    protected $reflection;
    /**
    * The mock under test that uses StringTranslationTrait.
    *
    * @var object
    * @see \PHPUnit\Framework\MockObject\Generator::getObjectForTrait()
    */
    protected $translation;
    protected object $testObject;
    /**
    * {@inheritdoc}
    ......@@ -37,24 +28,29 @@ class StringTranslationTraitTest extends UnitTestCase {
    protected function setUp(): void {
    parent::setUp();
    $this->translation = $this->getObjectForTrait('\Drupal\Core\StringTranslation\StringTranslationTrait');
    $mock = $this->prophesize(TranslationInterface::class);
    $mock->translate(Argument::cetera())->shouldNotBeCalled();
    $mock->formatPlural(Argument::cetera())->shouldNotBeCalled();
    $mock->translateString(Argument::cetera())->will(function ($args) {
    // Prepare a mock translation service to pass to the trait.
    $translation = $this->prophesize(TranslationInterface::class);
    $translation->translate(Argument::cetera())->shouldNotBeCalled();
    $translation->formatPlural(Argument::cetera())->shouldNotBeCalled();
    $translation->translateString(Argument::cetera())->will(function ($args) {
    return $args[0]->getUntranslatedString();
    });
    $this->translation->setStringTranslation($mock->reveal());
    $this->reflection = new \ReflectionClass(get_class($this->translation));
    // Set up the object under test.
    $this->testObject = new class() {
    use StringTranslationTrait;
    };
    $this->testObject->setStringTranslation($translation->reveal());
    }
    /**
    * @covers ::t
    */
    public function testT() {
    $method = $this->reflection->getMethod('t');
    $result = $method->invoke($this->translation, 'something');
    public function testT(): void {
    $invokableT = new \ReflectionMethod($this->testObject, 't');
    $result = $invokableT->invoke($this->testObject, 'something');
    $this->assertInstanceOf(TranslatableMarkup::class, $result);
    $this->assertEquals('something', $result);
    }
    ......@@ -62,10 +58,12 @@ public function testT() {
    /**
    * @covers ::formatPlural
    */
    public function testFormatPlural() {
    $method = $this->reflection->getMethod('formatPlural');
    $result = $method->invoke($this->translation, 2, 'apple', 'apples');
    public function testFormatPlural(): void {
    $invokableFormatPlural = new \ReflectionMethod($this->testObject, 'formatPlural');
    $result = $invokableFormatPlural->invoke($this->testObject, 1, 'apple', 'apples');
    $this->assertInstanceOf(PluralTranslatableMarkup::class, $result);
    $this->assertEquals('apple', $result);
    $result = $invokableFormatPlural->invoke($this->testObject, 2, 'apple', 'apples');
    $this->assertInstanceOf(PluralTranslatableMarkup::class, $result);
    $this->assertEquals('apples', $result);
    }
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment