Issue #3476717 by chrisfromredfin, guptahemant: Tests failing PHP CS

tests/src/Functional/InstallerControllerTest.php

@@ -4,6 +4,9 @@ namespace Drupal\Tests\project_browser\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Url;
+use Drupal\Tests\ApiRequestTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\project_browser\Traits\PackageManagerFixtureUtilityTrait;
 use Drupal\package_manager\Event\PostApplyEvent;
 use Drupal\package_manager\Event\PostCreateEvent;
 use Drupal\package_manager\Event\PostRequireEvent;
@@ -15,9 +18,6 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
 use Drupal\project_browser\ComposerInstaller\Installer;
 use Drupal\project_browser\EnabledSourceHandler;
 use Drupal\project_browser_test\Datetime\TestTime;
-use Drupal\Tests\ApiRequestTrait;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\project_browser\Traits\PackageManagerFixtureUtilityTrait;
 use GuzzleHttp\RequestOptions;
 use Psr\Http\Message\ResponseInterface;
 

tests/src/FunctionalJavascript/ProjectBrowserInstallerUiTest.php

@@ -8,9 +8,9 @@ use Behat\Mink\Element\NodeElement;
 use Drupal\Core\Recipe\Recipe;
 use Drupal\Core\State\StateInterface;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\Tests\project_browser\Traits\PackageManagerFixtureUtilityTrait;
 use Drupal\project_browser\EnabledSourceHandler;
 use Drupal\system\SystemManager;
-use Drupal\Tests\project_browser\Traits\PackageManagerFixtureUtilityTrait;
 
 /**
  * Provides tests for the Project Browser Installer UI.

tests/src/Kernel/CoreNotUpdatedValidatorTest.php

@@ -2,11 +2,11 @@
 
 namespace Drupal\Tests\project_browser\Kernel;
 
+use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
 use Drupal\fixture_manipulator\ActiveFixtureManipulator;
 use Drupal\package_manager\Exception\StageEventException;
 use Drupal\package_manager\ValidationResult;
 use Drupal\project_browser\ComposerInstaller\Installer;
-use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
 
 /**
  * @covers \Drupal\project_browser\ComposerInstaller\Validator\CoreNotUpdatedValidator

tests/src/Kernel/InstallerTest.php

@@ -2,6 +2,9 @@
 
 namespace Drupal\Tests\project_browser\Kernel;
 
+use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
+use Drupal\Tests\package_manager\Traits\ComposerStagerTestTrait;
+use Drupal\Tests\user\Traits\UserCreationTrait;
 use Drupal\fixture_manipulator\ActiveFixtureManipulator;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Exception\ApplyFailedException;
@@ -11,9 +14,6 @@ use Drupal\package_manager\ValidationResult;
 use Drupal\package_manager_bypass\LoggingCommitter;
 use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
 use Drupal\project_browser\ComposerInstaller\Installer;
-use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
-use Drupal\Tests\package_manager\Traits\ComposerStagerTestTrait;
-use Drupal\Tests\user\Traits\UserCreationTrait;
 use PhpTuf\ComposerStager\API\Exception\ExceptionInterface;
 use PhpTuf\ComposerStager\API\Exception\InvalidArgumentException;
 
@@ -84,7 +84,7 @@ class InstallerTest extends PackageManagerKernelTestBase {
    *
    * @dataProvider providerCommitException
    */
-  public function testCommitException(string $thrown_class, string $expected_class = NULL): void {
+  public function testCommitException(string $thrown_class, ?string $expected_class = NULL): void {
     $installer = $this->container->get(Installer::class);
     $installer->create();
     $installer->require(['org/package-name']);

tests/src/Kernel/PackageNotInstalledValidatorTest.php

@@ -2,11 +2,11 @@
 
 namespace Drupal\Tests\project_browser\Kernel;
 
+use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
 use Drupal\fixture_manipulator\ActiveFixtureManipulator;
 use Drupal\package_manager\Exception\StageEventException;
 use Drupal\package_manager\ValidationResult;
 use Drupal\project_browser\ComposerInstaller\Installer;
-use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
 
 /**
  * @covers \Drupal\project_browser\ComposerInstaller\Validator\PackageNotInstalledValidator

tests/src/Unit/ProjectBrowserTestMockTest.php

@@ -5,8 +5,8 @@ namespace Drupal\Tests\project_browser\Unit;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\project_browser_test\Plugin\ProjectBrowserSource\ProjectBrowserTestMock;
 use Drupal\Tests\UnitTestCase;
+use Drupal\project_browser_test\Plugin\ProjectBrowserSource\ProjectBrowserTestMock;
 use Psr\Log\LoggerInterface;
 
 /**