From b746998fd995cc2e64e7a389fd5aa390ae11774c Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Thu, 23 Jan 2025 10:29:01 -0500
Subject: [PATCH] Initial PHPCBF fixes
---
.../project_browser_test/project_browser_test.install | 2 ++
.../project_browser_test/project_browser_test.module | 2 ++
.../src/Controller/TestPageController.php | 2 ++
.../project_browser_test/src/Datetime/TestTime.php | 2 ++
.../src/DrupalOrgClientMiddleware.php | 8 +++++---
.../src/Extension/TestModuleInstaller.php | 2 ++
.../ProjectBrowserSource/ProjectBrowserTestMock.php | 4 +++-
.../src/ProjectBrowserTestServiceProvider.php | 2 ++
.../project_browser_test/src/TestInstallReadiness.php | 2 ++
tests/src/Functional/ClearStorageTest.php | 2 ++
tests/src/Functional/InstallTest.php | 2 ++
tests/src/Functional/InstallerControllerTest.php | 2 ++
tests/src/Functional/ProjectBrowserMenuTabsTest.php | 2 ++
tests/src/Functional/RoutingTest.php | 2 ++
.../FunctionalJavascript/ProjectBrowserUiTestTrait.php | 2 +-
tests/src/Kernel/CoreExperimentalLabelTest.php | 2 ++
tests/src/Kernel/CoreNotUpdatedValidatorTest.php | 2 ++
tests/src/Kernel/DatabaseTablesTest.php | 2 ++
tests/src/Kernel/InstallerTest.php | 2 ++
tests/src/Kernel/PackageNotInstalledValidatorTest.php | 2 ++
tests/src/Unit/ProjectBrowserTestMockTest.php | 2 ++
21 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/tests/modules/project_browser_test/project_browser_test.install b/tests/modules/project_browser_test/project_browser_test.install
index ee0e5c071..d0bd7beae 100644
--- a/tests/modules/project_browser_test/project_browser_test.install
+++ b/tests/modules/project_browser_test/project_browser_test.install
@@ -5,6 +5,8 @@
* Contains install and update functions for testing Project Browser.
*/
+declare(strict_types=1);
+
use Drupal\Component\Serialization\Json;
use Drupal\Core\Database\Database;
diff --git a/tests/modules/project_browser_test/project_browser_test.module b/tests/modules/project_browser_test/project_browser_test.module
index faaa7233c..c08e3b37d 100644
--- a/tests/modules/project_browser_test/project_browser_test.module
+++ b/tests/modules/project_browser_test/project_browser_test.module
@@ -5,6 +5,8 @@
* For use in Project Browser tests.
*/
+declare(strict_types=1);
+
use Drupal\Core\Asset\AttachedAssetsInterface;
/**
diff --git a/tests/modules/project_browser_test/src/Controller/TestPageController.php b/tests/modules/project_browser_test/src/Controller/TestPageController.php
index 225cc4dc1..99372e6b1 100644
--- a/tests/modules/project_browser_test/src/Controller/TestPageController.php
+++ b/tests/modules/project_browser_test/src/Controller/TestPageController.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test\Controller;
use Drupal\Core\Controller\ControllerBase;
diff --git a/tests/modules/project_browser_test/src/Datetime/TestTime.php b/tests/modules/project_browser_test/src/Datetime/TestTime.php
index 041bf174b..42223fe49 100644
--- a/tests/modules/project_browser_test/src/Datetime/TestTime.php
+++ b/tests/modules/project_browser_test/src/Datetime/TestTime.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test\Datetime;
use Drupal\Component\Datetime\TimeInterface;
diff --git a/tests/modules/project_browser_test/src/DrupalOrgClientMiddleware.php b/tests/modules/project_browser_test/src/DrupalOrgClientMiddleware.php
index b6beb005a..6cf3b07df 100644
--- a/tests/modules/project_browser_test/src/DrupalOrgClientMiddleware.php
+++ b/tests/modules/project_browser_test/src/DrupalOrgClientMiddleware.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test;
use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -116,7 +118,7 @@ class DrupalOrgClientMiddleware {
// This endpoint, when accessed in a browser, returns the JSON data
// which is used to generate the fixtures used in
// ProjectBrowserUiTestJsonApi test.
- $actual_api_endpoint = $request->getUri();
+ $actual_api_endpoint = (string) $request->getUri();
if (strpos($actual_api_endpoint, DrupalDotOrgJsonApi::JSONAPI_ENDPOINT) !== FALSE) {
$relevant_path = str_replace(DrupalDotOrgJsonApi::JSONAPI_ENDPOINT, '', $actual_api_endpoint);
// Remove semver query as it is core version dependent.
@@ -134,8 +136,8 @@ class DrupalOrgClientMiddleware {
throw new \Exception('Attempted call to the Drupal.org jsonapi endpoint that is not mocked in middleware: ' . $relevant_path);
}
// Other queries to the non-jsonapi endpoints.
- elseif (strpos($request->getUri(), DrupalDotOrgJsonApi::DRUPAL_ORG_ENDPOINT) !== FALSE) {
- $relevant_path = str_replace(DrupalDotOrgJsonApi::DRUPAL_ORG_ENDPOINT, '', $request->getUri());
+ elseif (strpos($actual_api_endpoint, DrupalDotOrgJsonApi::DRUPAL_ORG_ENDPOINT) !== FALSE) {
+ $relevant_path = str_replace(DrupalDotOrgJsonApi::DRUPAL_ORG_ENDPOINT, '', $actual_api_endpoint);
$path_to_fixture = self::DRUPALORG_ENDPOINT_TO_FIXTURE_MAP;
$is_outdated = $this->state->get('project_browser:test_deprecated_api');
diff --git a/tests/modules/project_browser_test/src/Extension/TestModuleInstaller.php b/tests/modules/project_browser_test/src/Extension/TestModuleInstaller.php
index 3043447d6..5d94e446a 100644
--- a/tests/modules/project_browser_test/src/Extension/TestModuleInstaller.php
+++ b/tests/modules/project_browser_test/src/Extension/TestModuleInstaller.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test\Extension;
use Drupal\Core\Extension\ModuleInstallerInterface;
diff --git a/tests/modules/project_browser_test/src/Plugin/ProjectBrowserSource/ProjectBrowserTestMock.php b/tests/modules/project_browser_test/src/Plugin/ProjectBrowserSource/ProjectBrowserTestMock.php
index c74a5a299..8302e0288 100644
--- a/tests/modules/project_browser_test/src/Plugin/ProjectBrowserSource/ProjectBrowserTestMock.php
+++ b/tests/modules/project_browser_test/src/Plugin/ProjectBrowserSource/ProjectBrowserTestMock.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test\Plugin\ProjectBrowserSource;
use Drupal\Component\Serialization\Json;
@@ -400,7 +402,7 @@ class ProjectBrowserTestMock extends ProjectBrowserSourceBase {
}
}
- return $this->createResultsPage($returned_list, $api_response['total_results'] ?? 0, static::$resultsError);
+ return $this->createResultsPage($returned_list, (int) ($api_response['total_results'] ?? 0), static::$resultsError);
}
/**
diff --git a/tests/modules/project_browser_test/src/ProjectBrowserTestServiceProvider.php b/tests/modules/project_browser_test/src/ProjectBrowserTestServiceProvider.php
index da31f551e..b6484ecd2 100644
--- a/tests/modules/project_browser_test/src/ProjectBrowserTestServiceProvider.php
+++ b/tests/modules/project_browser_test/src/ProjectBrowserTestServiceProvider.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test;
use Drupal\Core\DependencyInjection\ContainerBuilder;
diff --git a/tests/modules/project_browser_test/src/TestInstallReadiness.php b/tests/modules/project_browser_test/src/TestInstallReadiness.php
index 8dcacb2da..bc17893ae 100644
--- a/tests/modules/project_browser_test/src/TestInstallReadiness.php
+++ b/tests/modules/project_browser_test/src/TestInstallReadiness.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\project_browser_test;
use Drupal\Core\State\StateInterface;
diff --git a/tests/src/Functional/ClearStorageTest.php b/tests/src/Functional/ClearStorageTest.php
index 47c893922..d0be6f3f6 100644
--- a/tests/src/Functional/ClearStorageTest.php
+++ b/tests/src/Functional/ClearStorageTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Functional;
use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
diff --git a/tests/src/Functional/InstallTest.php b/tests/src/Functional/InstallTest.php
index ff9b82719..eff3539e1 100644
--- a/tests/src/Functional/InstallTest.php
+++ b/tests/src/Functional/InstallTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Functional;
use Drupal\Tests\BrowserTestBase;
diff --git a/tests/src/Functional/InstallerControllerTest.php b/tests/src/Functional/InstallerControllerTest.php
index bd43f760c..c4fa1677e 100644
--- a/tests/src/Functional/InstallerControllerTest.php
+++ b/tests/src/Functional/InstallerControllerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Functional;
use Drupal\Component\Serialization\Json;
diff --git a/tests/src/Functional/ProjectBrowserMenuTabsTest.php b/tests/src/Functional/ProjectBrowserMenuTabsTest.php
index 58336cea9..01b68e4e7 100644
--- a/tests/src/Functional/ProjectBrowserMenuTabsTest.php
+++ b/tests/src/Functional/ProjectBrowserMenuTabsTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Functional;
use Drupal\Tests\BrowserTestBase;
diff --git a/tests/src/Functional/RoutingTest.php b/tests/src/Functional/RoutingTest.php
index b70a55fad..d7ac5dc20 100644
--- a/tests/src/Functional/RoutingTest.php
+++ b/tests/src/Functional/RoutingTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Functional;
use Drupal\Core\Url;
diff --git a/tests/src/FunctionalJavascript/ProjectBrowserUiTestTrait.php b/tests/src/FunctionalJavascript/ProjectBrowserUiTestTrait.php
index 12440efeb..e290c4e75 100644
--- a/tests/src/FunctionalJavascript/ProjectBrowserUiTestTrait.php
+++ b/tests/src/FunctionalJavascript/ProjectBrowserUiTestTrait.php
@@ -55,7 +55,7 @@ trait ProjectBrowserUiTestTrait {
try {
$this->assertTrue($this->getSession()->evaluateScript($script), 'Ran:' . $script . 'Svelte did not initialize. Markup: ' . $this->getSession()->evaluateScript('document.querySelector("#project-browser").innerHTML'));
}
- catch (\Exception $e) {
+ catch (\Exception) {
$this->getSession()->reload();
$this->getSession()->wait(10000, $script);
}
diff --git a/tests/src/Kernel/CoreExperimentalLabelTest.php b/tests/src/Kernel/CoreExperimentalLabelTest.php
index 61976f331..36a2249a1 100644
--- a/tests/src/Kernel/CoreExperimentalLabelTest.php
+++ b/tests/src/Kernel/CoreExperimentalLabelTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Kernel;
use Drupal\KernelTests\KernelTestBase;
diff --git a/tests/src/Kernel/CoreNotUpdatedValidatorTest.php b/tests/src/Kernel/CoreNotUpdatedValidatorTest.php
index d2ef82e5c..f0251b69d 100644
--- a/tests/src/Kernel/CoreNotUpdatedValidatorTest.php
+++ b/tests/src/Kernel/CoreNotUpdatedValidatorTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Kernel;
use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
diff --git a/tests/src/Kernel/DatabaseTablesTest.php b/tests/src/Kernel/DatabaseTablesTest.php
index 6f6ef2a3d..5b5af2500 100644
--- a/tests/src/Kernel/DatabaseTablesTest.php
+++ b/tests/src/Kernel/DatabaseTablesTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Kernel;
use Drupal\KernelTests\KernelTestBase;
diff --git a/tests/src/Kernel/InstallerTest.php b/tests/src/Kernel/InstallerTest.php
index 9a2595720..0575a7922 100644
--- a/tests/src/Kernel/InstallerTest.php
+++ b/tests/src/Kernel/InstallerTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Kernel;
use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
diff --git a/tests/src/Kernel/PackageNotInstalledValidatorTest.php b/tests/src/Kernel/PackageNotInstalledValidatorTest.php
index 61000e4eb..75f5fbcee 100644
--- a/tests/src/Kernel/PackageNotInstalledValidatorTest.php
+++ b/tests/src/Kernel/PackageNotInstalledValidatorTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Kernel;
use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
diff --git a/tests/src/Unit/ProjectBrowserTestMockTest.php b/tests/src/Unit/ProjectBrowserTestMockTest.php
index a8076ab1c..4408de7d1 100644
--- a/tests/src/Unit/ProjectBrowserTestMockTest.php
+++ b/tests/src/Unit/ProjectBrowserTestMockTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\project_browser\Unit;
use Drupal\Core\Cache\CacheBackendInterface;
--
GitLab