Issue #3458426 by mstrelan, catch, smustgrave: Add int return typehints to...

Issue #3458426 by mstrelan, catch, smustgrave: Add int return typehints to protected test helper methods

core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaTestBase.php

@@ -255,7 +255,7 @@ protected function assertSourceAttributeSame(string $attribute, ?string $value):
    * @return int
    *   The size of the bytes transferred.
    */
-  protected function getLastPreviewRequestTransferSize() {
+  protected function getLastPreviewRequestTransferSize(): int {
     $javascript = <<<JS
 (function(){
   return window.performance

core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php

@@ -159,7 +159,7 @@ protected function assertAnnounceLeaveEditMode(): void {
    * @return int
    *   The number of tabbable elements.
    */
-  protected function getTabbableElementsCount() {
+  protected function getTabbableElementsCount(): int {
     // Mark all tabbable elements.
     $this->getSession()->executeScript("jQuery(window.tabbable.tabbable(document.body)).attr('data-marked', '');");
     // Count all marked elements.

core/modules/datetime/tests/src/Kernel/Views/DateTimeHandlerTestBase.php

@@ -119,7 +119,7 @@ protected function setSiteTimezone($timezone) {
    * @return int
    *   Unix timestamp.
    */
-  protected function getUTCEquivalentOfUserNowAsTimestamp() {
+  protected function getUTCEquivalentOfUserNowAsTimestamp(): int {
     $user_now = new DateTimePlus('now', new \DateTimeZone(date_default_timezone_get()));
     $utc_equivalent = new DateTimePlus($user_now->format('Y-m-d H:i:s'), new \DateTimeZone(DateTimeItemInterface::STORAGE_TIMEZONE));
 

core/modules/dblog/tests/src/Kernel/DbLogTest.php

@@ -83,7 +83,7 @@ public function testInvalidPlaceholders(): void {
    * @return int
    *   Number of new watchdog entries.
    */
-  private function runCron() {
+  private function runCron(): int {
     $connection = Database::getConnection();
     // Get last ID to compare against; log entries get deleted, so we can't
     // reliably add the number of newly created log entries to the current count

core/modules/file/tests/src/Functional/FileListingTest.php

@@ -62,7 +62,7 @@ protected function setUp(): void {
    * @return int
    *   Total usage count.
    */
-  protected function sumUsages($usage) {
+  protected function sumUsages($usage): int {
     $count = 0;
     foreach ($usage as $module) {
       foreach ($module as $entity_type) {

core/modules/language/tests/src/Functional/LanguageConfigurationTest.php

@@ -214,7 +214,7 @@ protected function checkConfigurableLanguageWeight($state = 'by default') {
    * @return int
    *   Maximum weight of configurable languages.
    */
-  protected function getHighestConfigurableLanguageWeight() {
+  protected function getHighestConfigurableLanguageWeight(): int {
     $max_weight = 0;
 
     $storage = $this->container->get('entity_type.manager')

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php

@@ -315,7 +315,7 @@ protected function assertContextualLinkRetainsMouseup(): void {
    * @return int
    *   The element position.
    */
-  protected function getElementVerticalPosition($css_selector, $position_type) {
+  protected function getElementVerticalPosition($css_selector, $position_type): int {
     $this->assertContains($position_type, ['top', 'bottom'], 'Expected position type.');
     return (int) $this->getSession()->evaluateScript("document.querySelector('$css_selector').getBoundingClientRect().$position_type + window.pageYOffset");
   }

core/modules/migrate_drupal/src/Tests/StubTestTrait.php

@@ -33,7 +33,7 @@ protected function performStubTest($entity_type_id) {
    * @return int
    *   ID of the created entity.
    */
-  protected function createEntityStub($entity_type_id) {
+  protected function createEntityStub($entity_type_id): int {
     // Create a dummy migration to pass to the destination plugin.
     $definition = [
       'migration_tags' => ['Stub test'],

core/tests/Drupal/BuildTests/Framework/BuildTestBase.php

@@ -466,7 +466,7 @@ protected function stopServer() {
    * @throws \RuntimeException
    *   Thrown when there are no available ports within the range.
    */
-  protected function findAvailablePort() {
+  protected function findAvailablePort(): int {
     $store = new FlockStore(DrupalFilesystem::getOsTemporaryDirectory());
     $lock_factory = new LockFactory($store);
 
@@ -524,7 +524,7 @@ protected function checkPortIsAvailable($port): bool {
    *
    * @return int
    */
-  protected function getPortNumber() {
+  protected function getPortNumber(): int {
     if (empty($this->hostPort)) {
       $this->hostPort = $this->findAvailablePort();
     }

core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php

@@ -112,7 +112,7 @@ public function testGarbageCollection(): void {
    * @return int
    *   The number of rows in the test cache bin database table.
    */
-  protected function getNumRows() {
+  protected function getNumRows(): int {
     $table = 'cache_' . $this->testBin;
     $connection = $this->container->get('database');
     $query = $connection->select($table);

core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php

@@ -288,7 +288,7 @@ public function testUntranslatableFields($sequence, $default_translation_affecte
    * @return int
    *   The latest saved revision id.
    */
-  protected function doTestEditSequence($sequence) {
+  protected function doTestEditSequence($sequence): int {
     $revision_id = NULL;
     foreach ($sequence as $index => $step) {
       $this->stepIndex = $index;

core/tests/Drupal/Tests/Core/Template/AttributeTest.php

@@ -452,7 +452,7 @@ protected function assertNoID(string $id, string $html): void {
    * @return int
    *   The number of results that are found.
    */
-  protected function getXPathResultCount($query, $html) {
+  protected function getXPathResultCount($query, $html): int {
     $document = Html::load($html);
     $xpath = new \DOMXPath($document);
 

core/tests/Drupal/Tests/TestFileCreationTrait.php

@@ -113,7 +113,7 @@ protected function getTestFiles($type, $size = NULL) {
    *
    * @return int
    */
-  protected function compareFiles($file1, $file2) {
+  protected function compareFiles($file1, $file2): int {
     $compare_size = filesize($file1->uri) - filesize($file2->uri);
     if ($compare_size) {
       // Sort by file size.