Merge pull request #51 from mtrop-godaddy/mt-support_php_81

Support for PHP 8.1+
godaddy-wordpress · Sep 4, 2024 · c4d90f4 · c4d90f4
2 parents f118a0f + 8e71de9
commit c4d90f4
Show file tree

Hide file tree

Showing 39 changed files with 805 additions and 684 deletions.
diff --git a/composer.json b/composer.json
@@ -12,13 +12,14 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^8.1",
         "rdlowrey/auryn": "^1.4",
-        "duncan3dc/console": "^2.0",
-        "guzzlehttp/guzzle": "^6.3",
-        "vlucas/phpdotenv": "^2.4",
+        "duncan3dc/console": "^2.3",
+        "symfony/console": "^5.3.16 || ^6.0.19",
+        "guzzlehttp/guzzle": "^7.8",
+        "vlucas/phpdotenv": "^5.0",
         "monolog/monolog": "^1.21",
-        "namshi/cuzzle": "^2.0",
+        "octoper/cuzzle": "^3.0",
         "ramsey/uuid": "^3.5"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/API/BaseApiClient.php b/src/API/BaseApiClient.php
@@ -12,7 +12,7 @@ class BaseApiClient
 
     protected $apiName;
 
-    public function __construct(RequestChain $requestChain, $baseUrl = 'https://mgmt.pagely.com/api/', LoggerInterface $logger)
+    public function __construct(RequestChain $requestChain, LoggerInterface $logger, string $baseUrl = 'https://mgmt.pagely.com/api/')
     {
         $this->requestChain = $requestChain;
         $this->baseUrl = $baseUrl;

diff --git a/src/Client/GuzzleTrait.php b/src/Client/GuzzleTrait.php
@@ -133,7 +133,7 @@ function(callable $handler) use ($logger)
                         $msg = 'API Request: ' .$request->getMethod(). ' ' .$request->getUri();
                         $logger->debug($msg, [
                             'api' => $this->apiName,
-                            'request' => \GuzzleHttp\Psr7\str($request),
+                            'request' => \GuzzleHttp\Psr7\Message::toString($request),
                             'uri' => $request->getUri(),
                             'method' => $request->getMethod()
                         ]);
@@ -154,8 +154,8 @@ function (ResponseInterface $response) use ($logger, $request)
                                 if ($response->getStatusCode() >= 400) {
                                     $context = [
                                         'api' => $this->apiName,
-                                        'response' => \GuzzleHttp\Psr7\str($response),
-                                        'request' => \GuzzleHttp\Psr7\str($request),
+                                        'response' => \GuzzleHttp\Psr7\Message::toString($response),
+                                        'request' => \GuzzleHttp\Psr7\Message::toString($request),
                                         'code' => $response->getStatusCode(),
                                         'uri' => $request->getUri(),
                                         'method' => $request->getMethod()

diff --git a/src/Command/Accounts/AddSshKeyCommand.php b/src/Command/Accounts/AddSshKeyCommand.php
@@ -38,7 +38,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $accountId = (int) $input->getArgument('accountId');
         $token = $this->token->token;

diff --git a/src/Command/Apps/AliasSearchCommand.php b/src/Command/Apps/AliasSearchCommand.php
@@ -41,7 +41,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $accountId = $input->getArgument('accountId');
         $search = $input->getOption('search');

diff --git a/src/Command/Apps/AppWebserverCommand.php b/src/Command/Apps/AppWebserverCommand.php
@@ -38,7 +38,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $serverType = $input->getArgument('type');

diff --git a/src/Command/Apps/CreateAppCommand.php b/src/Command/Apps/CreateAppCommand.php
@@ -42,7 +42,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $multi = $input->getOption('multisite');
 

diff --git a/src/Command/Apps/DisableAppCommand.php b/src/Command/Apps/DisableAppCommand.php
@@ -36,7 +36,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = $this->token->token;
 

diff --git a/src/Command/Apps/DomainAddCommand.php b/src/Command/Apps/DomainAddCommand.php
@@ -37,7 +37,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $domain = $input->getArgument('domain');

diff --git a/src/Command/Apps/DomainMakePrimaryCommand.php b/src/Command/Apps/DomainMakePrimaryCommand.php
@@ -37,7 +37,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $domainId = $input->getArgument('domainId');

diff --git a/src/Command/Apps/DomainRemoveCommand.php b/src/Command/Apps/DomainRemoveCommand.php
@@ -37,7 +37,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $domain = $input->getArgument('domainId');

diff --git a/src/Command/Apps/GetAppBackupCommand.php b/src/Command/Apps/GetAppBackupCommand.php
@@ -40,7 +40,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $backupId = $input->getOption('backupId');

diff --git a/src/Command/Apps/GetAppCommand.php b/src/Command/Apps/GetAppCommand.php
@@ -38,7 +38,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $token = $this->token->token;

diff --git a/src/Command/Apps/GitIntegration/CreateGitIntegrationCommand.php b/src/Command/Apps/GitIntegration/CreateGitIntegrationCommand.php
@@ -40,7 +40,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = $this->token->token;
         $output->writeln('Create integration initiated.');

diff --git a/src/Command/Apps/GitIntegration/DeleteGitIntegrationCommand.php b/src/Command/Apps/GitIntegration/DeleteGitIntegrationCommand.php
@@ -38,7 +38,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = $this->token->token;
 

diff --git a/src/Command/Apps/GitIntegration/GetGitIntegrationCommand.php b/src/Command/Apps/GitIntegration/GetGitIntegrationCommand.php
@@ -39,7 +39,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = $this->token->token;
 

diff --git a/src/Command/Apps/ListAppsCommand.php b/src/Command/Apps/ListAppsCommand.php
@@ -39,7 +39,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $accountId = $input->getArgument('account');
         $token = $this->token->token;

diff --git a/src/Command/Apps/RemoveAppCommand.php b/src/Command/Apps/RemoveAppCommand.php
@@ -36,7 +36,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = $this->token->token;
 

diff --git a/src/Command/Ares/RedirectsGetCsvCommand.php b/src/Command/Ares/RedirectsGetCsvCommand.php
@@ -39,7 +39,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = (int) $input->getArgument('appId');
         $filename = $input->getArgument('filename');

diff --git a/src/Command/Ares/RedirectsUploadCommand.php b/src/Command/Ares/RedirectsUploadCommand.php
@@ -42,7 +42,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = (int) $input->getArgument('appId');
         $file = $input->getArgument('file');

diff --git a/src/Command/Auth/ClientLoginCommand.php b/src/Command/Auth/ClientLoginCommand.php
@@ -31,7 +31,7 @@ public function configure()
         ;
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug())
         {

diff --git a/src/Command/Auth/LoginCommand.php b/src/Command/Auth/LoginCommand.php
@@ -33,7 +33,7 @@ public function configure()
         ;
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug())
         {

diff --git a/src/Command/Auth/LogoutCommand.php b/src/Command/Auth/LogoutCommand.php
@@ -13,7 +13,7 @@ public function __construct($name = 'auth:logout')
         parent::__construct($name);
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $token = new OauthToken();
         $token->deleteSaved();

diff --git a/src/Command/SSL/AppCertUpdateCommand.php b/src/Command/SSL/AppCertUpdateCommand.php
@@ -22,7 +22,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $certId = $input->getArgument('certID');
         $aliasId = $input->getArgument('aliasID');

diff --git a/src/Command/SSL/CSRCreateCommand.php b/src/Command/SSL/CSRCreateCommand.php
@@ -22,7 +22,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug()) {
             $this->api->setDebug();

diff --git a/src/Command/SSL/CSRListCommand.php b/src/Command/SSL/CSRListCommand.php
@@ -22,7 +22,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug()) {
             $this->api->setDebug();

diff --git a/src/Command/SSL/CertActivateCommand.php b/src/Command/SSL/CertActivateCommand.php
@@ -20,7 +20,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $r = $this->api->activateCertForApp(
             $this->token->token,

diff --git a/src/Command/SSL/CertAddCommand.php b/src/Command/SSL/CertAddCommand.php
@@ -23,7 +23,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug()) {
             $this->api->setDebug();

diff --git a/src/Command/SSL/CertGetCommand.php b/src/Command/SSL/CertGetCommand.php
@@ -22,7 +22,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug()) {
             $this->api->setDebug();

diff --git a/src/Command/SSL/CertImportCommand.php b/src/Command/SSL/CertImportCommand.php
@@ -29,7 +29,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($output->isDebug()) {
             $this->api->setDebug();

diff --git a/src/Command/SSL/CertLinkCommand.php b/src/Command/SSL/CertLinkCommand.php
@@ -22,7 +22,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $certId = $input->getArgument('certID');
         $aliasId = $input->getArgument('aliasID');

diff --git a/src/Command/SSL/CertListCommand.php b/src/Command/SSL/CertListCommand.php
@@ -21,7 +21,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $accountId = $input->getOption('accountID');
         $appId = $input->getOption('appId');

diff --git a/src/Command/SSL/LetsencryptCertCommand.php b/src/Command/SSL/LetsencryptCertCommand.php
@@ -20,7 +20,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $r = $this->api->letsencryptGetCertificate(
             $this->token->token,

diff --git a/src/Command/SSL/LetsencryptJobStatusCommand.php b/src/Command/SSL/LetsencryptJobStatusCommand.php
@@ -19,7 +19,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $r = $this->api->getLetsencryptStatus(
             $this->token->token,

diff --git a/src/Command/SSL/LetsencryptRegisterCommand.php b/src/Command/SSL/LetsencryptRegisterCommand.php
@@ -21,7 +21,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $r = $this->api->letsencryptRegister(
             $this->token->token,

diff --git a/src/Command/SSL/LetsencryptRenewCommand.php b/src/Command/SSL/LetsencryptRenewCommand.php
@@ -22,7 +22,7 @@ public function configure()
         ;
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
             $r = $this->api->letsencryptRenew(

diff --git a/src/Command/SSL/SearchLinkedCommand.php b/src/Command/SSL/SearchLinkedCommand.php
@@ -19,7 +19,7 @@ public function configure()
         $this->addOauthOptions();
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $appId = $input->getArgument('appId');
         $r = $this->api->searchLinkedCerts($this->token->token, $appId);

diff --git a/src/Helper.php b/src/Helper.php
@@ -2,7 +2,6 @@
 namespace Pagely\AtomicClient;
 
 use Auryn\Injector;
-use Dotenv\Dotenv;
 use Dotenv\Exception\InvalidPathException;
 use Monolog\Logger;
 use Monolog\Handler\NullHandler;
@@ -43,7 +42,7 @@ public function cachedClientAuth(
 
         if (file_exists($config))
         {
-            $dotenv = new Dotenv(dirname($config), basename($config));
+            $dotenv = \Dotenv\Dotenv::createImmutable(dirname($config), basename($config));
             $dotenv->load();
         }
 
@@ -86,7 +85,7 @@ public function loadConfig($baseDir)
         try
         {
             $home = getenv('HOME');
-            $dotenv = new Dotenv($home, $staging ? '/.atomic-staging' : '/.atomic');
+            $dotenv = \Dotenv\Dotenv::createImmutable($home, $staging ? '/.atomic-staging' : '/.atomic');
             $dotenv->load();
         }
         catch (InvalidPathException $e)
@@ -96,7 +95,7 @@ public function loadConfig($baseDir)
 
         try
         {
-            $dotenv = new Dotenv($baseDir, $staging ? '/.env-staging' : '/.env');
+            $dotenv = \Dotenv\Dotenv::createImmutable($baseDir, $staging ? '/.env-staging' : '/.env');
             $dotenv->load();
         }
         catch (InvalidPathException $e)
@@ -105,7 +104,7 @@ public function loadConfig($baseDir)
         }
 
         // doesn't overwrite so defaults get loaded last
-        $dotenv = new Dotenv($baseDir, $staging ? '/.env.staging' : '/.env.defaults');
+        $dotenv = \Dotenv\Dotenv::createImmutable($baseDir, $staging ? '/.env-staging' : '/.env.defaults');
         $dotenv->load();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ public function configure() @@
             ;
         }
-        public function execute(InputInterface $input, OutputInterface $output)
+        public function execute(InputInterface $input, OutputInterface $output): int
         {
             if ($output->isDebug())
             {
@@ Expand Down @@