More phpcbs code cleanups

install/langs.php

@@ -48,4 +48,4 @@
   'tr_TR' => 'Turkish',
   'uk_UA' => 'Ukrainian',
   'vi_VN' => 'Vietnamese',
-);
+);

tests/phpunit/CRM/Campaign/BAO/CampaignTest.php

@@ -15,7 +15,6 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-
 class CRM_Campaign_BAO_CampaignTest extends CiviUnitTestCase {
 
   public function testCampaignSummary() {
@@ -39,4 +38,4 @@ public function testCampaignSummary() {
     $this->assertEquals(1, CRM_Campaign_BAO_Campaign::getCampaignSummary(['status_id' => [2, 3]], TRUE));
   }
 
-} 
+}

tests/phpunit/CRM/Case/XMLProcessor/ProcessTest.php

@@ -407,8 +407,8 @@ protected function assertActivityAssignedToContactExists($assigneeContactId) {
    *   unique for each entry in the dataprovider since want to test a given
    *   relationship type against multiple xml strings. It's not a test
    *   identifier, it's an array key to use to look up something.
-   * @param $xmlString string
-   * @param $expected array
+   * @param string $xmlString
+   * @param array $expected
    * @param $dontcare array We're re-using the data provider for two tests and
    *   we don't care about those expected values.
    *
@@ -431,10 +431,10 @@ public function testCaseRoles($key, $xmlString, $expected, $dontcare) {
    *   unique for each entry in the dataprovider since want to test a given
    *   relationship type against multiple xml strings. It's not a test
    *   identifier, it's an array key to use to look up something.
-   * @param $xmlString string
+   * @param string $xmlString
    * @param $dontcare array We're re-using the data provider for two tests and
    *   we don't care about those expected values.
-   * @param $expected array
+   * @param array $expected
    *
    * @dataProvider xmlCaseRoleDataProvider
    */

tests/phpunit/CRM/Case/XMLProcessor/ReportTest.php

@@ -23,7 +23,7 @@ public function tearDown(): void {
    * Test that getCaseReport has the right output.
    *
    * @param $activitySetName string Also acts as data provider test identifier.
-   * @param $expected array
+   * @param array $expected
    *
    * @dataProvider caseReportDataProvider
    */

tests/phpunit/CRM/Mailing/BAO/MailingTest.php

@@ -29,7 +29,7 @@ public function tearDown(): void {
    * match the expected list
    *
    * @param $mailingID
-   * @param $expectedRecipients array
+   * @param array $expectedRecipients
    *   Array of contact ID that should be in the recipient list.
    */
   private function assertRecipientsCorrect($mailingID, $expectedRecipients) {

tests/phpunit/CRM/Upgrade/Incremental/php/FiveTwentyTest.php

@@ -919,8 +919,8 @@ private function getExpectedUpgradeMessages() {
   /**
    * Helper to add a case type to the database.
    *
-   * @param $name string
-   * @param $xml string
+   * @param string $name
+   * @param string $xml
    *
    * @return int
    */

tests/phpunit/CiviTest/ReleaseTestSettings.php.txt

@@ -2,34 +2,32 @@
 
 class ReleaseTestSettings {
 
-  var $publicSandbox  = false;
-  var $browser = '*firefox';
-  var $sandboxURL = 'http://url.url';
-  var $sandboxPATH = '';
-  var $installPATH = '/sites/trunk.drupal/modules/civicrm/install/';
-  var $upgradePATH = '/civicrm/upgrade?reset=1';
-  var $username = '';
-  var $password = '';
-  var $adminUsername = '';
-  var $adminPassword = '';
-        var $UFemail = 'noreply@civicrm.org';
+  public $publicSandbox  = FALSE;
+  public $browser = '*firefox';
+  public $sandboxURL = 'http://url.url';
+  public $sandboxPATH = '';
+  public $installPATH = '/sites/trunk.drupal/modules/civicrm/install/';
+  public $upgradePATH = '/civicrm/upgrade?reset=1';
+  public $username = '';
+  public $password = '';
+  public $adminUsername = '';
+  public $adminPassword = '';
+  public $UFemail = 'noreply@civicrm.org';
 
-        var $civiDBServer = 'localhost';
-        var $civiDBUser = '';
-        var $civiDBPass = '';
-        var $civiDBName = '';
+  public $civiDBServer = 'localhost';
+  public $civiDBUser = '';
+  public $civiDBPass = '';
+  public $civiDBName = '';
 
-        var $drupalDBServer = 'localhost';
-        var $drupalDBUser = '';
-        var $drupalDBPass = '';
-        var $drupalDBName = '';
+  public $drupalDBServer = 'localhost';
+  public $drupalDBUser = '';
+  public $drupalDBPass = '';
+  public $drupalDBName = '';
 
-
-  function __construct() {
+  public function __construct() {
     $this->fullSandboxPath = $this->sandboxURL . $this->sandboxPATH;
     $this->installURL = $this->fullSandboxPath . $this->installPATH;
     $this->upgradeURL = $this->fullSandboxPath . $this->upgradePATH;
   }
 
 }
-?>

tools/bin/scripts/set-version.php

@@ -25,9 +25,12 @@
   fatal("failed to read old version from \"xml/version.xml\"\n");
 }
 
-/** @var string $newVersion */
-/** @var bool $doCommit */
-/** @var bool $doSql */
+/**
+ * @var string $newVersion */
+/**
+ * @var bool $doCommit */
+/**
+ * @var bool $doSql */
 extract(parseArgs($argv));
 
 if (!isVersionValid($newVersion)) {
@@ -80,7 +83,7 @@
 foreach ($infoXmls as $infoXml) {
   updateXmlFile($infoXml, function (DOMDocument $dom) use ($newVersion) {
     foreach ($dom->getElementsByTagName('version') as $tag) {
-      /** @var \DOMNode $tag */
+      /* @var \DOMNode $tag */
       $tag->textContent = $newVersion;
     }
   });
@@ -188,10 +191,10 @@ function fatal($error) {
 }
 
 /**
-* @param array $argv
+ * @param array $argv
  *  Ex: ['myscript.php', '--no-commit', '5.6.7']
  * @return array
- *  Ex: ['scriptFile' => 'myscript.php', 'doCommit' => FALSE, 'newVersion' => '5.6.7']
+ *   Ex: ['scriptFile' => 'myscript.php', 'doCommit' => FALSE, 'newVersion' => '5.6.7']
  */
 function parseArgs($argv) {
   $parsed = [];