Corrects implode() usage and uses wraps ints in '' to satisfy PHP 7.4.

typhonius · Apr 11, 2020 · 2ef0296 · 2ef0296
1 parent 1768181
commit 2ef0296
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 sudo: false
 language: php
 php:
-- 7.1
-- 7.2
 - 7.3
+- 7.4
 cache:
   directories:
     - $HOME/.composer/cache

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
     ],
     "license": "MIT",
     "require": {
+        "php": ">=7.1",
         "typhonius/acquia-php-sdk-v2": "^2.0.0",
         "typhonius/acquia-logstream": "^0.5",
         "consolidation/robo": "^2",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Commands/DomainCommand.php b/src/Commands/DomainCommand.php
@@ -79,8 +79,8 @@ public function domainInfo(OutputInterface $output, Domains $domainAdapter, $uui
                     $domain->hostname,
                     $domain->flags->active ? '✓' : '',
                     $domain->flags->dns_resolves ? '✓' : '',
-                    implode($domain->ip_addresses, "\n"),
-                    implode($domain->cnames, "\n"),
+                    implode("\n", $domain->ip_addresses),
+                    implode("\n", $domain->cnames),
                 ],
                 ]
             );

diff --git a/src/Commands/EnvironmentsCommand.php b/src/Commands/EnvironmentsCommand.php
@@ -50,7 +50,7 @@ public function environmentList(Environments $environmentsAdapter, OutputInterfa
                         $environment->uuid,
                         $environment->name,
                         $environment->label,
-                        implode($environment->domains, "\n"),
+                        implode("\n", $environment->domains),
                     ],
                 ]
             );

diff --git a/src/Commands/LogForwardCommand.php b/src/Commands/LogForwardCommand.php
@@ -86,7 +86,7 @@ public function logforwardInfo(
         $this->say(sprintf('Expires at: %s', $logForward->credentials->certificate->expires_at));
         $this->say(sprintf('Token: %s', $logForward->credentials->token));
         $this->say(sprintf('Key: %s', $logForward->credentials->key));
-        $this->say(sprintf('Sources: %s%s', "\n", implode($logForward->sources, "\n")));
+        $this->say(sprintf('Sources: %s%s', "\n", implode("\n", $logForward->sources)));
         $this->say(sprintf('Health: %s', $logForward->health->summary));
     }
 }
diff --git a/src/Commands/SslCertificateCommand.php b/src/Commands/SslCertificateCommand.php
@@ -49,7 +49,7 @@ public function sslCertificateList(
                     [
                         $certificate->id,
                         $certificate->label,
-                        implode($certificate->domains, "\n"),
+                        implode("\n", $certificate->domains),
                         $certificate->expires_at,
                         $certificate->flags->active ? '✓' : '',
                     ],

diff --git a/tests/Commands/DbBackupCommandTest.php b/tests/Commands/DbBackupCommandTest.php
@@ -97,7 +97,7 @@ public function dbBackupProvider()
 
         return [
             [
-                ['database:backup:restore', 'devcloud:devcloud2', 'dev', 'dbName', 1234],
+                ['database:backup:restore', 'devcloud:devcloud2', 'dev', 'dbName', '1234'],
                 '>  Restoring backup 1234 to dbName on Dev' . PHP_EOL
             ],
             [
@@ -117,7 +117,7 @@ public function dbBackupProvider()
                 $dbBackupList . PHP_EOL
             ],
             [
-                ['database:backup:link', 'devcloud:devcloud2', 'dev', 'dbName', 1234],
+                ['database:backup:link', 'devcloud:devcloud2', 'dev', 'dbName', '1234'],
                 $dbLink . PHP_EOL
             ],
         ];

diff --git a/tests/Commands/LogForwardCommandTest.php b/tests/Commands/LogForwardCommandTest.php
@@ -48,7 +48,7 @@ public function logForwardProvider()
                 $listResponse . PHP_EOL
             ],
             [
-                ['lf:info', 'devcloud:devcloud2', 'dev', 1234],
+                ['lf:info', 'devcloud:devcloud2', 'dev', '1234'],
                 $infoResponse . PHP_EOL,
             ]
         ];

diff --git a/tests/Commands/SslCertificateCommandTest.php b/tests/Commands/SslCertificateCommandTest.php
@@ -53,7 +53,7 @@ public function sslCertificateProvider()
                 $listResponse . PHP_EOL
             ],
             [
-                ['ssl:info', 'devcloud:devcloud2', 'dev', 1234],
+                ['ssl:info', 'devcloud:devcloud2', 'dev', '1234'],
                 $infoResponse . PHP_EOL,
             ]
         ];