PHPCS issues for 3.x

Example of failing test run: https://www.drupal.org/pift-ci-job/2856321 →

Hi

I applied the MR !11, the patch didnt apply properly and there are many PHPCS issues.

➜  sparkpost git:(8.x-2.x) curl https://git.drupalcode.org/project/sparkpost/-/merge_requests/11.diff | patch -p1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  2859    0  2859    0     0   5337      0 --:--:-- --:--:-- --:--:--  5487
patching file 'src/ClientService.php'
1 out of 1 hunks failed--saving rejects to 'src/ClientService.php.rej'
patching file 'src/Form/TestMailForm.php'
patching file 'src/Plugin/Mail/SparkpostMail.php'
➜  sparkpost git:(8.x-2.x) ✗ ..
➜  drupal_local git:(main) ✗ phpcs --standard=Drupal,DrupalPractice --extensions=php,module,inc,install,test,profile,theme,css,info,txt,md,yml sparkpost 

FILE: /Users/clarksubing-subing/Projects/d10/drupal_local/sparkpost/src/Form/SettingsForm.php
---------------------------------------------------------------------------------------------
FOUND 0 ERRORS AND 3 WARNINGS AFFECTING 3 LINES
---------------------------------------------------------------------------------------------
 54 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
 83 | WARNING | #options values usually have to run through t() for translation
 84 | WARNING | #options values usually have to run through t() for translation
---------------------------------------------------------------------------------------------


FILE: /Users/clarksubing-subing/Projects/d10/drupal_local/sparkpost/src/Form/TestMailForm.php
----------------------------------------------------------------------------------------------
FOUND 0 ERRORS AND 1 WARNING AFFECTING 1 LINE
----------------------------------------------------------------------------------------------
 129 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
----------------------------------------------------------------------------------------------


FILE: /Users/clarksubing-subing/Projects/d10/drupal_local/sparkpost/src/ClientService.php
------------------------------------------------------------------------------------------------------------------------
FOUND 1 ERROR AND 1 WARNING AFFECTING 2 LINES
------------------------------------------------------------------------------------------------------------------------
  8 | ERROR   | [x] Use statements should be sorted alphabetically. The first wrong one is Http\Adapter\Guzzle6\Client.
 70 | WARNING | [ ] \Drupal calls should be avoided in classes, use dependency injection instead
------------------------------------------------------------------------------------------------------------------------
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
------------------------------------------------------------------------------------------------------------------------


FILE: /Users/clarksubing-subing/Projects/d10/drupal_local/sparkpost/src/MessageWrapper.php
----------------------------------------------------------------------------------------------
FOUND 0 ERRORS AND 2 WARNINGS AFFECTING 2 LINES
----------------------------------------------------------------------------------------------
 126 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
 135 | WARNING | \Drupal calls should be avoided in classes, use dependency injection instead
----------------------------------------------------------------------------------------------

Time: 555ms; Memory: 12MB

➜  drupal_local git:(main) ✗