fix: switch from tightenco/collect to illuminate/collections

carlalexander · carlalexander · commit 8aeb05c4854c · 2022-03-14T12:16:03.000-04:00
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
         "ext-json": "*",
         "ext-zip": "*",
         "guzzlehttp/guzzle": "^7.0",
+        "illuminate/collections": "^8.0|^9.0",
         "league/flysystem": "^2.0|^3.0",
         "league/flysystem-ftp": "^2.0|^3.0",
         "league/flysystem-sftp": "^2.0|^3.0",
@@ -31,8 +32,7 @@
         "symfony/finder": "^5.4.3|^6.0.3",
         "symfony/polyfill-php80": "^1.24",
         "symfony/process": "^5.4|^6.0",
-        "symfony/yaml": "^5.4|^6.0",
-        "tightenco/collect": "^8.0"
+        "symfony/yaml": "^5.4|^6.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.17",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,8 +1,10 @@
 parameters:
     level: max
+    checkGenericClassInNonGenericObjectType: false
     checkMissingIterableValueType: false
     ignoreErrors:
         - '#Access to an undefined property Tightenco\\Collect\\Support\\HigherOrder#'
         - '#Method [^\s]* has no return typehint specified.#'
         - '#Method [^\s]* has parameter \$[^\s]* with no typehint specified.#'
         - '#.*undefined.*ZipArchive.*#'
+        - '#Unable to resolve the template type (TValue|TKey) in call to function collect#'
diff --git a/src/ApiClient.php b/src/ApiClient.php
@@ -17,9 +17,9 @@
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Pool;
 use GuzzleHttp\Psr7\Request;
+use Illuminate\Support\Collection;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Console\Exception\RuntimeException;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Exception\ApiClientException;
 use Ymir\Cli\ProjectConfiguration\ProjectConfiguration;
 
diff --git a/src/CliConfiguration.php b/src/CliConfiguration.php
@@ -13,9 +13,9 @@
 
 namespace Ymir\Cli;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Filesystem\Filesystem;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\Team\SelectTeamCommand;
 
 class CliConfiguration
diff --git a/src/Command/Cache/CreateCacheCommand.php b/src/Command/Cache/CreateCacheCommand.php
@@ -13,12 +13,12 @@
 
 namespace Ymir\Cli\Command\Cache;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\AbstractCommand;
 use Ymir\Cli\Console\OutputInterface;
 use Ymir\Cli\ProjectConfiguration\CacheConfigurationChange;
diff --git a/src/Command/Database/CreateDatabaseServerCommand.php b/src/Command/Database/CreateDatabaseServerCommand.php
@@ -13,13 +13,13 @@
 
 namespace Ymir\Cli\Command\Database;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\AbstractCommand;
 use Ymir\Cli\Console\OutputInterface;
 
@@ -127,7 +127,7 @@ private function determineType(Collection $network, InputInterface $input, Outpu
         $types = $this->apiClient->getDatabaseServerTypes((int) $network['provider']['id']);
 
         if ($this->getBooleanOption($input, 'dev')) {
-            return $types->keys()->first();
+            return (string) $types->keys()->first();
         }
 
         $type = $this->getStringOption($input, 'type');
diff --git a/src/Command/Project/AbstractProjectDeploymentCommand.php b/src/Command/Project/AbstractProjectDeploymentCommand.php
@@ -13,8 +13,8 @@
 
 namespace Ymir\Cli\Command\Project;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Input\InputInterface;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
 use Ymir\Cli\Command\AbstractProjectCommand;
@@ -80,7 +80,7 @@ protected function perform(InputInterface $input, OutputInterface $output)
 
         $unmanagedDomains = $unmanagedDomains->filter(function (string $unmanagedDomain) use ($vanityDomainName) {
             try {
-                return !collect(dns_get_record($unmanagedDomain, DNS_CNAME))->contains('target', $vanityDomainName);
+                return !collect((array) dns_get_record($unmanagedDomain, DNS_CNAME))->contains('target', $vanityDomainName);
             } catch (\Throwable $exception) {
                 return true;
             }
diff --git a/src/Command/Project/ConfigureProjectCommand.php b/src/Command/Project/ConfigureProjectCommand.php
@@ -13,11 +13,11 @@
 
 namespace Ymir\Cli\Command\Project;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
 use Ymir\Cli\Command\AbstractProjectCommand;
diff --git a/src/Command/Project/DeployProjectCommand.php b/src/Command/Project/DeployProjectCommand.php
@@ -13,11 +13,11 @@
 
 namespace Ymir\Cli\Command\Project;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
 use Ymir\Cli\Command\Uploads\ImportUploadsCommand;
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -13,10 +13,10 @@
 
 namespace Ymir\Cli\Command\Project;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Filesystem\Filesystem;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
 use Ymir\Cli\Command\AbstractCommand;
diff --git a/src/Command/Project/RedeployProjectCommand.php b/src/Command/Project/RedeployProjectCommand.php
@@ -13,10 +13,10 @@
 
 namespace Ymir\Cli\Command\Project;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Console\OutputInterface;
 
 class RedeployProjectCommand extends AbstractProjectDeploymentCommand
diff --git a/src/Command/Project/RollbackProjectCommand.php b/src/Command/Project/RollbackProjectCommand.php
@@ -14,11 +14,11 @@
 namespace Ymir\Cli\Command\Project;
 
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Console\OutputInterface;
 use Ymir\Cli\Support\Arr;
 
diff --git a/src/Command/Uploads/ImportUploadsCommand.php b/src/Command/Uploads/ImportUploadsCommand.php
@@ -13,6 +13,8 @@
 
 namespace Ymir\Cli\Command\Uploads;
 
+use Illuminate\Support\Enumerable;
+use Illuminate\Support\LazyCollection;
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\Ftp\FtpAdapter;
@@ -27,8 +29,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Tightenco\Collect\Support\Enumerable;
-use Tightenco\Collect\Support\LazyCollection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
 use Ymir\Cli\Command\AbstractProjectCommand;
diff --git a/src/Console/Output.php b/src/Console/Output.php
@@ -13,6 +13,8 @@
 
 namespace Ymir\Cli\Console;
 
+use Illuminate\Support\Collection;
+use Illuminate\Support\Enumerable;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
@@ -26,8 +28,6 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Terminal;
-use Tightenco\Collect\Support\Collection;
-use Tightenco\Collect\Support\Enumerable;
 use Ymir\Cli\Command\Project\DeployProjectCommand;
 use Ymir\Cli\Command\Project\RedeployProjectCommand;
 
diff --git a/src/Console/OutputInterface.php b/src/Console/OutputInterface.php
@@ -13,8 +13,8 @@
 
 namespace Ymir\Cli\Console;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Output\OutputInterface as SymfonyOutputInterface;
-use Tightenco\Collect\Support\Collection;
 
 interface OutputInterface extends SymfonyOutputInterface
 {
diff --git a/src/Deployment/DeploymentStepInterface.php b/src/Deployment/DeploymentStepInterface.php
@@ -13,7 +13,7 @@
 
 namespace Ymir\Cli\Deployment;
 
-use Tightenco\Collect\Support\Collection;
+use Illuminate\Support\Collection;
 use Ymir\Cli\Console\OutputInterface;
 
 interface DeploymentStepInterface
diff --git a/src/Deployment/ProcessAssetsStep.php b/src/Deployment/ProcessAssetsStep.php
@@ -13,9 +13,9 @@
 
 namespace Ymir\Cli\Deployment;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Finder\Finder;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\Console\OutputInterface;
 use Ymir\Cli\FileUploader;
diff --git a/src/Deployment/StartAndMonitorDeploymentStep.php b/src/Deployment/StartAndMonitorDeploymentStep.php
@@ -13,8 +13,8 @@
 
 namespace Ymir\Cli\Deployment;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\Console\OutputInterface;
 
diff --git a/src/Deployment/UploadFunctionCodeStep.php b/src/Deployment/UploadFunctionCodeStep.php
@@ -13,8 +13,8 @@
 
 namespace Ymir\Cli\Deployment;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Helper\ProgressBar;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\Console\OutputInterface;
 use Ymir\Cli\FileUploader;
diff --git a/src/Exception/ApiClientException.php b/src/Exception/ApiClientException.php
@@ -14,9 +14,9 @@
 namespace Ymir\Cli\Exception;
 
 use GuzzleHttp\Exception\ClientException;
+use Illuminate\Support\Collection;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Console\Exception\RuntimeException;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\LoginCommand;
 
 class ApiClientException extends RuntimeException
@@ -52,7 +52,7 @@ public function __construct(ClientException $exception)
     public function getValidationErrors(): Collection
     {
         $body = collect(json_decode((string) $this->response->getBody(), true));
-        $errors = $body->only('errors')->collapse();
+        $errors = $body->only(['errors'])->collapse();
 
         if ($errors->isEmpty() && $body->has('message')) {
             $errors->add($body->get('message'));
diff --git a/src/GitHubClient.php b/src/GitHubClient.php
@@ -14,8 +14,8 @@
 namespace Ymir\Cli;
 
 use GuzzleHttp\ClientInterface;
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
-use Tightenco\Collect\Support\Collection;
 
 class GitHubClient
 {
diff --git a/src/ProjectConfiguration/ProjectConfiguration.php b/src/ProjectConfiguration/ProjectConfiguration.php
@@ -13,12 +13,12 @@
 
 namespace Ymir\Cli\ProjectConfiguration;
 
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Yaml;
-use Tightenco\Collect\Contracts\Support\Arrayable;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\Project\InitializeProjectCommand;
 
 class ProjectConfiguration implements Arrayable
diff --git a/src/Support/Arr.php b/src/Support/Arr.php
@@ -13,7 +13,7 @@
 
 namespace Ymir\Cli\Support;
 
-use Tightenco\Collect\Support\Arr as LaravelArrHelper;
+use Illuminate\Support\Arr as LaravelArrHelper;
 
 class Arr extends LaravelArrHelper
 {
diff --git a/src/Tool/WpCli.php b/src/Tool/WpCli.php
@@ -13,8 +13,8 @@
 
 namespace Ymir\Cli\Tool;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Exception\RuntimeException;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Exception\WpCliException;
 use Ymir\Cli\Process\Process;
 
diff --git a/tests/Unit/Command/LoginCommandTest.php b/tests/Unit/Command/LoginCommandTest.php
@@ -14,8 +14,8 @@
 namespace Ymir\Cli\Tests\Unit\Command;
 
 use GuzzleHttp\Exception\ClientException;
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tightenco\Collect\Support\Collection;
 use Ymir\Cli\Command\LoginCommand;
 use Ymir\Cli\Exception\ApiClientException;
 use Ymir\Cli\Tests\Mock\ApiClientMockTrait;
