diff --git a/README.md b/README.md index ff6c4f9aa..936467376 100644 --- a/README.md +++ b/README.md @@ -56,14 +56,23 @@ These packages will install when you install Terminus. ### Mac OS: -`> brew tap *** TBD ***` +`> brew install pantheon-systems/external/terminus` for stable version (currently 2.x) -`> brew install *** TBD ***` +`> brew install pantheon-systems/external/t3` for 3.x (currently alpha status) ### Ubuntu / WinWSL+Ubuntu: `*** TBD ***` +## Testing + +To run the functional tests: + +1. If you need the basics (php, git, direnv, etc): `brew bundle install` +2. For code coverage: `pecl install pcov` +3. Prepare a new test site, e.g. make a new multidev in ci-terminus-composer +4. Copy .env.dist to .env and make an .envrc to include it with `dotenv`, or copy .env.dist to .envrc and add `export` at the head of each line. Customize values as needed. Use `direnv allow` to enable automatic loading of environment variables needed for tests. +5. Run `composer test:short` to run the short-running functional tests, `composer test:long` to run the ones that take a long time, or `coposer test:functional` to run all of them. | Command | Description | ⚖️ | diff --git a/composer.json b/composer.json index c0cd8e6e8..27bcf507c 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "minimum-stability": "stable", "prefer-stable": true, "require": { - "php": ">=7.4", + "php": ">=7.3", "ext-json": "*", "composer/composer": "^2", "composer/semver": "^3", @@ -62,6 +62,7 @@ "autoload-dev": { "psr-4": { "Pantheon\\Terminus\\Tests\\Functional\\": "tests/Functional/", + "Pantheon\\Terminus\\UnitTests\\": "tests/unit_tests/", "Pantheon\\Terminus\\FeatureTests\\": "tests/features/bootstrap/" }, "classmap": [ @@ -74,6 +75,12 @@ "scripts": { "build": "@phar:build", "test": "@test:functional", + "phar:install-tools": [ + "gem install mime-types -v 2.6.2", + "curl -LSs https://box-project.github.io/box2/installer.php | php", + "mkdir -p tools", + "mv -f box.phar tools/box" + ], "phar:build": [ "rm -Rf ./t3", "vendor/bin/phar-composer.phar build .", @@ -135,6 +142,9 @@ "cs": [ "vendor/bin/phpcs --standard=tests/config/linting_ruleset.xml bin/t3 src tests/Functional" ], + "phpunit": [ + "SHELL_INTERACTIVE=true phpunit --colors=always -c tests/config/phpunit.xml.dist --debug" + ], "docs": [ "vendor/bin/robo doc ./README.md", "git add README.md" diff --git a/composer.lock b/composer.lock index 22af0b124..e6e0dcc46 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ceb7436d8a1dfcc22736dc77fe80faed", + "content-hash": "ee9733f1f7086fb7a5c8d9b267ee7cd4", "packages": [ { "name": "composer/ca-bundle", @@ -7004,7 +7004,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.4", + "php": ">=7.3", "ext-json": "*" }, "platform-dev": { @@ -7013,5 +7013,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/src/Collections/PaymentMethods.php b/src/Collections/PaymentMethods.php index 4d2f5bb1e..85b5557c2 100644 --- a/src/Collections/PaymentMethods.php +++ b/src/Collections/PaymentMethods.php @@ -2,6 +2,7 @@ namespace Pantheon\Terminus\Collections; +use Pantheon\Terminus\Models\TerminusModel; use Pantheon\Terminus\Exceptions\TerminusException; use Pantheon\Terminus\Exceptions\TerminusNotFoundException; use Pantheon\Terminus\Models\PaymentMethod; @@ -30,7 +31,7 @@ class PaymentMethods extends UserOwnedCollection * @throws TerminusException When there is more than one matching payment method * @throws TerminusNotFoundException When there are no matching payment methods */ - public function get($id) + public function get($id): TerminusModel { $payment_methods = $this->all(); if (isset($payment_methods[$id])) { diff --git a/src/Collections/SavedTokens.php b/src/Collections/SavedTokens.php index 258d658b4..8254256fc 100755 --- a/src/Collections/SavedTokens.php +++ b/src/Collections/SavedTokens.php @@ -44,13 +44,11 @@ public function add($model_data, array $options = []) */ public function create($token_string) { - $token_nickname = "token-" . \uniqid(); - $this->getContainer()->add($token_nickname, SavedToken::class) - ->addArguments([ - (object)['token' => $token_string], - ['collection' => $this] - ]); - $token = $this->getContainer()->get($token_nickname); + $token = new SavedToken( + (object)['token' => $token_string], + ['collection' => $this] + ); + $this->getContainer()->inflect($token); $token->setDataStore($this->getDataStore()); $user = $token->logIn(); $user->fetch(); diff --git a/src/Collections/Sites.php b/src/Collections/Sites.php index f5aec310b..8115f422f 100644 --- a/src/Collections/Sites.php +++ b/src/Collections/Sites.php @@ -187,15 +187,11 @@ public function get($id): ?TerminusModel $uuid = $this->findUUIDByNameOrUUID($id); $site = $this->models[$uuid] ?? null; if (!$site instanceof Site) { - $nickname = 'site-' . $uuid; - $this->getContainer()->add($nickname, $this->collected_class) - ->addArguments( - [ - (object)['id' => $uuid], - ['id' => $uuid, 'collection' => $this] - ] - ); - $site = $this->getContainer()->get($nickname); + $site = new $this->collected_class( + (object)['id' => $uuid], + ['id' => $uuid, 'collection' => $this] + ); + $this->getContainer()->inflect($site); $site->fetch(); if (!$site->valid()) { throw new TerminusException("Site is not valid!"); diff --git a/src/Collections/Tags.php b/src/Collections/Tags.php index daac81046..4db5c37fc 100644 --- a/src/Collections/Tags.php +++ b/src/Collections/Tags.php @@ -46,12 +46,11 @@ public function create($tag) "organizations/{$this->org_site_membership->getOrganization()->id}/tags", ['method' => 'put', 'form_params' => $params,] ); - $this->getContainer()->add($this->collected_class) - ->addArguments([ - (object)['id' => $tag], - ['collection' => $this], - ]); - $this->models[$tag] = $this->getContainer()->get($this->collected_class); + $this->models[$tag] = new $this->collected_class( + (object)['id' => $tag], + ['collection' => $this] + ); + $this->getContainer()->inflect($this->models[$tag]); return $this->models[$tag]; } diff --git a/src/Collections/TerminusCollection.php b/src/Collections/TerminusCollection.php index cdaf84052..0e00ab870 100644 --- a/src/Collections/TerminusCollection.php +++ b/src/Collections/TerminusCollection.php @@ -60,11 +60,8 @@ public function add($model_data, array $options = []) ['id' => $model_data->id, 'collection' => $this], $options ); - $nickname = \uniqid($model_data->id); - - $this->getContainer()->add($nickname, $this->collected_class) - ->addArguments([$model_data, $options]); - $model = $this->getContainer()->get($nickname); + $model = new $this->collected_class($model_data, $options); + $this->getContainer()->inflect($model); $this->models[$model_data->id] = $model; return $model; } diff --git a/src/Collections/Workflows.php b/src/Collections/Workflows.php index d829d1b02..9d6e25683 100644 --- a/src/Collections/Workflows.php +++ b/src/Collections/Workflows.php @@ -91,7 +91,6 @@ function ($workflow) { */ public function create($type, array $options = []) { - $params = $options['params'] ?? []; $results = $this->request()->request( $this->getUrl(), @@ -109,17 +108,15 @@ public function create($type, array $options = []) ['error' => $results->getStatusCodeReason()] ); } - $nickname = \uniqid(__CLASS__ . "-"); - $this->getContainer()->add($nickname, $this->collected_class) - ->addArguments([ - $results->getData(), - [ - 'id' => $results->getData()->id, - 'collection' => $this, - 'owner' => $this->owner - ] - ]); - $model = $this->getContainer()->get($nickname); + $model = new $this->collected_class( + $results->getData(), + [ + 'id' => $results->getData()->id, + 'collection' => $this, + 'owner' => $this->owner + ] + ); + $this->getContainer()->inflect($model); $this->add($model); return $model; } diff --git a/src/Commands/AliasesCommand.php b/src/Commands/AliasesCommand.php index cdbf12143..4311ab6af 100644 --- a/src/Commands/AliasesCommand.php +++ b/src/Commands/AliasesCommand.php @@ -93,22 +93,19 @@ protected function getAliasEmitters($options) $emitters = []; if ($this->emitterTypeMatches($emitterType, 'print', false)) { - $print_nickname = \uniqid(__METHOD__); - $this->getContainer()->add($print_nickname, PrintingEmitter::class) - ->addArguments([$this->output()]); - $emitters[] = $this->getContainer()->get($print_nickname); + $printingEmitter = new PrintingEmitter($this->output()); + $this->getContainer()->inflect($printingEmitter); + $emitters[] = $printingEmitter; } if ($this->emitterTypeMatches($emitterType, 'php')) { - $php_nickname = \uniqid(__METHOD__); - $this->getContainer()->add($php_nickname, AliasesDrushRcEmitter::class) - ->addArguments([$location, $base_dir]); - $emitters[] = $this->getContainer()->get($php_nickname); + $drushRcEmitter = new AliasesDrushRcEmitter($location, $base_dir); + $this->getContainer()->inflect($drushRcEmitter); + $emitters[] = $drushRcEmitter; } if ($this->emitterTypeMatches($emitterType, 'yml')) { - $yml_nickname = \uniqid(__METHOD__); - $this->getContainer()->add($yml_nickname, DrushSitesYmlEmitter::class) - ->addArguments([$base_dir, $home, $target_name]); - $emitters[] = $this->getContainer()->get($yml_nickname); + $sitesYmlEmitter = new DrushSitesYmlEmitter($base_dir, $home, $target_name); + $this->getContainer()->inflect($sitesYmlEmitter); + $emitters[] = $sitesYmlEmitter; } return $emitters; diff --git a/src/Commands/D9ify/ProcessCommand.php b/src/Commands/D9ify/ProcessCommand.php index 3cb25c7c9..666256c9b 100644 --- a/src/Commands/D9ify/ProcessCommand.php +++ b/src/Commands/D9ify/ProcessCommand.php @@ -85,9 +85,8 @@ public function process($sourceSite, $destinationSite = null, $options = []) $sourceSiteObject = $this->getSite($sourceSite); } if (isset($sourceSiteObject) && $sourceSiteObject instanceof Site) { - $this->getContainer()->add("sourceDir", Directory::class) - ->addArgument(['site' => $sourceSiteObject]); - $this->sourceDirectory = $this->getContainer()->get("sourceDir"); + $this->sourceDirectory = new Directory(['site' => $sourceSiteObject]); + $this->getContainer()->inflect($this->sourceDirectory); } // Create destination Site if not exists or value is null. @@ -115,8 +114,8 @@ public function process($sourceSite, $destinationSite = null, $options = []) } if (!isset($destinationSiteObject) || !$destinationSiteObject instanceof Site) { - $this->getContainer()->add(CreateCommand::class); - $createCommand = $this->getContainer()->get(CreateCommand::class); + $createCommand = new CreateCommand(); + $this->getContainer()->inflect($createCommand); $createCommand->create( $destinationSite, $destinationSite, @@ -125,14 +124,12 @@ public function process($sourceSite, $destinationSite = null, $options = []) ); $destinationSiteInfoCommand = $this->getContainer()->get(InfoCommand::class); $destinationSiteInfo = $destinationSiteInfoCommand->info($destinationSite)->getArrayCopy(); - $this->getContainer()->add('destinationSiteModel', Site::class) - ->addArgument($destinationSiteInfo); - $destinationSiteObject = $this->getContainer()->get('destinationSiteModel'); + $destinationSiteObject = new Site($destinationSiteInfo); + $this->getContainer()->inflect($destinationSiteObject); } - if (isset($destinationSiteObject) || $destinationSiteObject instanceof Site) { - $this->getContainer()->add('destinationDir', Directory::class) - ->addArgument(['site' => $destinationSiteObject ]); - $this->destinationDirectory = $this->getContainer()->get('destinationDir'); + if (isset($destinationSiteObject) && $destinationSiteObject instanceof Site) { + $this->destinationDirectory = new Directory(['site' => $destinationSiteObject ]); + $this->getContainer()->inflect($this->destinationDirectory); } if (!isset($this->sourceDirectory) || !isset($this->destinationDirectory)) { @@ -643,8 +640,8 @@ protected function copyConfigFiles() */ protected function downloadDatabase() { - $this->getContainer()->add(GetLiveDBCommand::class); - $downloadDbCommand = $this->getContainer()->get(GetLiveDBCommand::class); + $downloadDbCommand = new GetLiveDBCommand(); + $this->getContainer()->inflect($downloadDbCommand); $downloadDbCommand->downloadLiveDbBackup($this->getSourceDirectory()->getSource()); } @@ -661,8 +658,8 @@ protected function downloadDatabase() */ protected function downloadSourceSiteFilesDirectory() { - $this->getContainer()->add(GetLiveFilesCommand::class); - $downloadFilesCommand = $this->getContainer()->get(GetLiveFilesCommand::class); + $downloadFilesCommand = new GetLiveFilesCommand(); + $this->getContainer()->inflect($downloadFilesCommand); $downloadFilesCommand->downloadLiveFilesBackup($this->getSourceDirectory()->getSource()); } } diff --git a/src/Commands/WorkflowProcessingTrait.php b/src/Commands/WorkflowProcessingTrait.php index fe0cbaa58..51d22f1d9 100644 --- a/src/Commands/WorkflowProcessingTrait.php +++ b/src/Commands/WorkflowProcessingTrait.php @@ -18,10 +18,8 @@ trait WorkflowProcessingTrait public function processWorkflow(Workflow $workflow): ?Workflow { if ($this->input()->isInteractive()) { - $nickname = \uniqid(__METHOD__ . "-"); - $this->getContainer()->add($nickname, WorkflowProgressBar::class) - ->addArguments([$this->output(), $workflow]); - $progressBar = $this->getContainer()->get($nickname); + $progressBar = new WorkflowProgressBar($this->output(), $workflow); + $this->getContainer()->inflect($progressBar); return $progressBar->cycle(); } $retry_interval = $this->getConfig()->get('http_retry_delay_ms', 100); diff --git a/src/Friends/OrganizationJoinTrait.php b/src/Friends/OrganizationJoinTrait.php index 93ec91378..b4de0fb5b 100644 --- a/src/Friends/OrganizationJoinTrait.php +++ b/src/Friends/OrganizationJoinTrait.php @@ -29,11 +29,8 @@ public function getReferences() public function getOrganization() { if (empty($this->organization)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer() - ->add($nickname, Organization::class) - ->addArgument($this->get('organization')); - $organization = $this->getContainer()->get($nickname); + $organization = new Organization($this->get('organization')); + $this->getContainer()->inflect($organization); $organization->memberships = [$this]; $this->setOrganization($organization); } diff --git a/src/Friends/ProfileTrait.php b/src/Friends/ProfileTrait.php index aef8b6726..741f30fa5 100644 --- a/src/Friends/ProfileTrait.php +++ b/src/Friends/ProfileTrait.php @@ -21,10 +21,8 @@ trait ProfileTrait public function getProfile() { if (empty($this->profile)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Profile::class) - ->addArgument([$this->get('profile')]); - $profile = $this->getContainer()->get($nickname); + $profile = new Profile([$this->get('profile')]); + $this->getContainer()->inflect($profile); $this->setProfile($profile); } return $this->profile; diff --git a/src/Friends/SiteJoinTrait.php b/src/Friends/SiteJoinTrait.php index f23cafafc..5086a3ede 100644 --- a/src/Friends/SiteJoinTrait.php +++ b/src/Friends/SiteJoinTrait.php @@ -29,12 +29,7 @@ public function getReferences() public function getSite() { if (empty($this->site)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer() - ->add($nickname, Site::class) - ->addArgument($this->get('site')); - $site = $this->getContainer() - ->get($nickname); + $site = new Site($this->get('site')); $site->memberships = [$this]; $this->setSite($site); } diff --git a/src/Friends/UserJoinTrait.php b/src/Friends/UserJoinTrait.php index 726a9dd6a..efa89e49f 100644 --- a/src/Friends/UserJoinTrait.php +++ b/src/Friends/UserJoinTrait.php @@ -29,11 +29,8 @@ public function getReferences() public function getUser() { if (empty($this->user)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer() - ->add($nickname, User::class) - ->addArgument($this->get('user')); - $user = $this->getContainer()->get($nickname); + $user = new User($this->get('user')); + $this->getContainer()->inflect($user); $user->memberships = [$this]; $this->setUser($user); } diff --git a/src/Helpers/LocalMachineHelper.php b/src/Helpers/LocalMachineHelper.php index b7844df84..39b8f32ce 100644 --- a/src/Helpers/LocalMachineHelper.php +++ b/src/Helpers/LocalMachineHelper.php @@ -111,9 +111,8 @@ public function getFinder() public function getProgressBar(Process $process) { $process->start(); - $nickname = \uniqid(__METHOD__ . "-"); - $this->getContainer()->add($nickname, ProcessProgressBar::class) - ->addArguments([$this->output(), $process]); + $progressBar = new ProcessProgressBar($this->output(), $process); + $this->getContainer()->inflect($progressBar); return $this->getContainer()->get($nickname); } diff --git a/src/Helpers/Site/Directory.php b/src/Helpers/Site/Directory.php index f2c8d0cd3..d56332f9b 100644 --- a/src/Helpers/Site/Directory.php +++ b/src/Helpers/Site/Directory.php @@ -93,8 +93,8 @@ public function ensureLocalCopyOfRepo(bool $create = false) throw new \Exception("Site does not exist and cannot be created."); } } - $this->getContainer()->add(CloneCommand::class); - $cloneCommand = $this->getContainer()->get(CloneCommand::class); + $cloneCommand = new CloneCommand(); + $this->getContainer()->inflect($cloneCommand); $clonePath = $cloneCommand->clone($this->getSource()); $this->logger->info("Clone Path:" . $clonePath); $this->setClonePath($clonePath); diff --git a/src/InflectionContainer.php b/src/InflectionContainer.php new file mode 100644 index 000000000..f20054fe3 --- /dev/null +++ b/src/InflectionContainer.php @@ -0,0 +1,16 @@ +inflectors->inflect($obj); + } +} diff --git a/src/Models/Domain.php b/src/Models/Domain.php index 75ca260ca..31c9d3992 100755 --- a/src/Models/Domain.php +++ b/src/Models/Domain.php @@ -65,13 +65,11 @@ public function delete(): RequestOperationResult public function getDNSRecords() { if (empty($this->dns_records)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, DNSRecords::class) - ->addArgument([ - 'data' => $this->get('dns_status_details')->dns_records, - 'domain' => $this - ]); - $this->dns_records = $this->getContainer()->get($nickname); + $this->dns_records = new DNSRecords([ + 'data' => $this->get('dns_status_details')->dns_records, + 'domain' => $this + ]); + $this->getContainer()->inflect($this->dns_records); } return $this->dns_records; } diff --git a/src/Models/Environment.php b/src/Models/Environment.php index 8c5096958..683ac349a 100755 --- a/src/Models/Environment.php +++ b/src/Models/Environment.php @@ -394,11 +394,8 @@ public function domain() public function getBackups() : Backups { if (empty($this->backups)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, Backups::class) - ->addArguments([['environment' => $this]]); - $this->backups = $this->getContainer()->get($nickname); + $this->backups = new Backups(['environment' => $this]); + $this->getContainer()->inflect($this->backups); } return $this->backups; } @@ -409,11 +406,8 @@ public function getBackups() : Backups public function getBindings() { if (empty($this->bindings)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, Bindings::class) - ->addArguments([['environment' => $this]]); - $this->bindings = $this->getContainer()->get($nickname); + $this->bindings = new Bindings(['environment' => $this]); + $this->getContainer()->inflect($this->bindings); } return $this->bindings; } @@ -432,11 +426,8 @@ public function getBranchName() public function getCommits() { if (empty($this->commits)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, Commits::class) - ->addArguments([['environment' => $this]]); - $this->commits = $this->getContainer()->get($nickname); + $this->commits = new Commits(['environment' => $this]); + $this->getContainer()->inflect($this->commits); } return $this->commits; } @@ -447,13 +438,8 @@ public function getCommits() public function getEnvironmentMetrics() { if (empty($this->environment_metrics)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, EnvironmentMetrics::class) - ->addArguments([['environment' => $this,],]); - $this->environment_metrics = $this->getContainer()->get( - $nickname - ); + $this->environment_metrics = new EnvironmentMetrics(['environment' => $this,]); + $this->getContainer()->inflect($this->environment_metrics); } return $this->environment_metrics; } @@ -464,11 +450,8 @@ public function getEnvironmentMetrics() public function getDomains() { if (empty($this->domains)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, Domains::class) - ->addArguments([['environment' => $this]]); - $this->domains = $this->getContainer()->get($nickname); + $this->domains = new Domains(['environment' => $this]); + $this->getContainer()->inflect($this->domains); } return $this->domains; } @@ -478,11 +461,9 @@ public function getDomains() */ public function getPrimaryDomainModel() { - $nickname = \uniqid(__FUNCTION__ . "-"); - - $this->getContainer()->add($nickname, PrimaryDomain::class) - ->addArguments([$this]); - return $this->getContainer()->get($nickname); + $primaryDomain = new PrimaryDomain($this); + $this->getContainer()->inflect($primaryDomain); + return $primaryDomain; } /** @@ -503,10 +484,8 @@ public function getDrushVersion() public function getLock() { if (empty($this->lock)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Lock::class) - ->addArguments([$this->get('lock'), ['environment' => $this]]); - $this->lock = $this->getContainer()->get($nickname); + $this->lock = new Lock($this->get('lock'), ['environment' => $this]); + $this->getContainer()->inflect($this->lock); } return $this->lock; } @@ -560,10 +539,8 @@ public function getPHPVersion() public function getUpstreamStatus() { if (empty($this->upstream_status)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, UpstreamStatus::class) - ->addArguments([[], ['environment' => $this,],]); - $this->upstream_status = $this->getContainer()->get($nickname); + $this->upstream_status = new UpstreamStatus([], ['environment' => $this,]); + $this->getContainer()->inflect($this->upstream_status); } return $this->upstream_status; } @@ -574,10 +551,8 @@ public function getUpstreamStatus() public function getWorkflows() { if (empty($this->workflows)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Workflows::class) - ->addArguments([['environment' => $this]]); - $this->workflows = $this->getContainer()->get($nickname); + $this->workflows = new Workflows(['environment' => $this]); + $this->getContainer()->inflect($this->workflows); } return $this->workflows; } @@ -821,11 +796,9 @@ public function setHttpsCertificate($certificate = []) "sites/{$this->getSite()->id}/environments/{$this->id}/add-ssl-cert", ['method' => 'POST', 'form_params' => array_filter($certificate),] ); - $nickname = \uniqid(__FUNCTION__ . "-"); - // The response is actually a workflow - $this->getContainer()->add($nickname, Workflow::class) - ->addArguments([$response['data'], ['environment' => $this]]); - return $this->getContainer()->get($nickname); + $workflow = new Workflow($response['data'], ['environment' => $this]); + $this->getContainer()->inflect($workflow); + return $workflow; } /** diff --git a/src/Models/Organization.php b/src/Models/Organization.php index cdf4ca6ce..2181ceea2 100644 --- a/src/Models/Organization.php +++ b/src/Models/Organization.php @@ -112,11 +112,8 @@ public function getReferences() public function getSiteMemberships() { if (empty($this->site_memberships)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, OrganizationSiteMemberships::class) - ->addArgument(['organization' => $this]); - $this->site_memberships = $this->getContainer() - ->get($nickname); + $this->site_memberships = new OrganizationSiteMemberships(['organization' => $this]); + $this->getContainer()->inflect($this->site_memberships); } return $this->site_memberships; } @@ -127,10 +124,8 @@ public function getSiteMemberships() public function getUpstreams() { if (empty($this->upstreams)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, OrganizationUpstreams::class) - ->addArgument(['organization' => $this]); - $this->upstreams = $this->getContainer()->get($nickname); + $this->upstreams = new OrganizationUpstreams(['organization' => $this]); + $this->getContainer()->inflect($this->upstreams); } return $this->upstreams; } @@ -141,11 +136,8 @@ public function getUpstreams() public function getUserMemberships() { if (empty($this->user_memberships)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, OrganizationUserMemberships::class) - ->addArgument(['organization' => $this]); - $this->user_memberships = $this->getContainer() - ->get($nickname); + $this->user_memberships = new OrganizationUserMemberships(['organization' => $this]); + $this->getContainer()->inflect($this->user_memberships); } return $this->user_memberships; } @@ -156,10 +148,8 @@ public function getUserMemberships() public function getWorkflows() { if (empty($this->workflows)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, Workflows::class) - ->addArgument(['organization' => $this]); - $this->workflows = $this->getContainer()->get($nickname); + $this->workflows = new Workflows(['organization' => $this]); + $this->getContainer()->inflect($this->workflows); } return $this->workflows; } diff --git a/src/Models/OrganizationSiteMembership.php b/src/Models/OrganizationSiteMembership.php index 815d73d66..c5577797a 100644 --- a/src/Models/OrganizationSiteMembership.php +++ b/src/Models/OrganizationSiteMembership.php @@ -57,10 +57,8 @@ public function delete() public function getSite() { if (empty($this->site)) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, Site::class) - ->addArgument($this->get('site')); - $site = $this->getContainer()->get($nickname); + $site = new Site($this->get('site')); + $this->getContainer()->inflect($site); $site->memberships = [$this]; $site->tags = $this->getTags(); $this->setSite($site); @@ -74,10 +72,8 @@ public function getSite() public function getTags() { if (!$this->tags) { - $nickname = \uniqid(__FUNCTION__ . '-'); - $this->getContainer()->add($nickname, Tags::class) - ->addArgument(['org_site_membership' => $this]); - $this->tags = $this->getContainer()->get($nickname); + $this->tags = new Tags(['org_site_membership' => $this]); + $this->getContainer()->inflect($this->tags); $this->tags->fetch((array)$this->get('tags')); } return $this->tags; diff --git a/src/Models/Site.php b/src/Models/Site.php index 3be57671d..6d498d00c 100755 --- a/src/Models/Site.php +++ b/src/Models/Site.php @@ -150,10 +150,8 @@ public function deployProduct($upstream_id) public function getAuthorizations() { if (empty($this->authorizations)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SiteAuthorizations::class) - ->addArgument(['site' => $this]); - $this->authorizations = $this->getContainer()->get($nickname); + $this->authorizations = new SiteAuthorizations(['site' => $this]); + $this->getContainer()->inflect($this->authorizations); } return $this->authorizations; } @@ -164,10 +162,8 @@ public function getAuthorizations() public function getBranches() { if (empty($this->branches)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Branches::class) - ->addArgument(['site' => $this]); - $this->branches = $this->getContainer()->get($nickname); + $this->branches = new Branches(['site' => $this]); + $this->getContainer()->inflect($this->branches); } return $this->branches; } @@ -188,10 +184,8 @@ public function unsetEnvironments() public function getEnvironments(): Environments { if (empty($this->environments)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Environments::class) - ->addArgument(['site' => $this]); - $this->environments = $this->getContainer()->get($nickname); + $this->environments = new Environments(['site' => $this]); + $this->getContainer()->inflect($this->environments); } return $this->environments; } @@ -240,10 +234,8 @@ public function getName() public function getNewRelic() { if (empty($this->new_relic)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, NewRelic::class) - ->addArguments([null, ['site' => $this]]); - $this->new_relic = $this->getContainer()->get($nickname); + $this->new_relic = new NewRelic(null, ['site' => $this]); + $this->getContainer()->inflect($this->new_relic); } return $this->new_relic; } @@ -254,10 +246,8 @@ public function getNewRelic() public function getOrganizationMemberships() { if (empty($this->user_memberships)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SiteOrganizationMemberships::class) - ->addArgument(['site' => $this]); - $this->org_memberships = $this->getContainer()->get($nickname); + $this->org_memberships = new SiteOrganizationMemberships(['site' => $this]); + $this->getContainer()->inflect($this->org_memberships); } return $this->org_memberships; } @@ -268,10 +258,8 @@ public function getOrganizationMemberships() public function getPlan() { if (empty($this->plan)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Plan::class) - ->addArgument(['site' => $this]); - $this->plan = $this->getContainer()->get($nickname); + $this->plan = new Plan(['site' => $this]); + $this->getContainer()->inflect($this->plan); } return $this->plan; } @@ -282,10 +270,8 @@ public function getPlan() public function getPlans() { if (empty($this->plans)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Plans::class) - ->addArguments([null, ['site' => $this]]); - $this->plans = $this->getContainer()->get($nickname); + $this->plans = new plans(null, ['site' => $this]); + $this->getContainer()->inflect($this->plans); } return $this->plans; } @@ -296,10 +282,8 @@ public function getPlans() public function getRedis() { if (empty($this->redis)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Redis::class) - ->addArguments([null, ['site' => $this]]); - $this->redis = $this->getContainer()->get($nickname); + $this->redis = new Redis(null, ['site' => $this]); + $this->getContainer()->inflect($this->redis); } return $this->redis; } @@ -318,10 +302,8 @@ public function getReferences() public function getSiteMetrics() { if (empty($this->site_metrics)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SiteMetrics::class) - ->addArguemnt(['site' => $this]); - $this->site_metrics = $this->getContainer()->get($nickname); + $this->site_metrics = new SiteMetrics(['site' => $this]); + $this->getContainer()->inflect($this->site_metrics); } return $this->site_metrics; } @@ -332,10 +314,8 @@ public function getSiteMetrics() public function getSolr() { if (empty($this->solr)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Solr::class) - ->addArguments([null, ['site' => $this]]); - $this->solr = $this->getContainer()->get($nickname); + $this->solr = new Solr(null, ['site' => $this]); + $this->getContainer()->inflect($this->solr); } return $this->solr; } @@ -352,10 +332,9 @@ public function getUpstream() ) { $upstream_data = $settings->upstream; } - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SiteUpstream::class) - ->addArguments([$upstream_data, ['site' => $this]]); - return $this->getContainer()->get($nickname); + $siteUpstream = new SiteUpstream($upstream_data, ['site' => $this]); + $this->getContainer()->inflect($siteUpstream); + return $siteUpstream; } /** @@ -364,10 +343,8 @@ public function getUpstream() public function getUserMemberships() { if (empty($this->user_memberships)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SiteUserMemberships::class) - ->addArgument(['site' => $this]); - $this->user_memberships = $this->getContainer()->get($nickname); + $this->user_memberships = new SiteUserMemberships(['site' => $this]); + $this->getContainer()->inflect($this->user_memberships); } return $this->user_memberships; } @@ -378,10 +355,8 @@ public function getUserMemberships() public function getWorkflows() { if (empty($this->workflows)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Workflows::class) - ->addArgument(['site' => $this]); - $this->workflows = $this->getContainer()->get($nickname); + $this->workflows = new Workflows(['site' => $this]); + $this->getContainer()->inflect($this->workflows); } return $this->workflows; } diff --git a/src/Models/User.php b/src/Models/User.php index 48b4b29a8..2fc6b332d 100644 --- a/src/Models/User.php +++ b/src/Models/User.php @@ -110,11 +110,8 @@ private function fetchAliases() public function getMachineTokens() { if (empty($this->machine_tokens)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, MachineTokens::class) - ->addArgument(['user' => $this]); - $this->machine_tokens = $this->getContainer() - ->get($nickname); + $this->machine_tokens = new MachineTokens(['user' => $this]); + $this->getContainer()->inflect($this->machine_tokens); } return $this->machine_tokens; } @@ -135,11 +132,8 @@ public function getName() public function getOrganizationMemberships() { if (empty($this->org_memberships)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, UserOrganizationMemberships::class) - ->addArgument(['user' => $this]); - $this->org_memberships = $this->getContainer() - ->get($nickname); + $this->org_memberships = new UserOrganizationMemberships(['user' => $this]); + $this->getContainer()->inflect($this->org_memberships); } return $this->org_memberships; } @@ -150,10 +144,8 @@ public function getOrganizationMemberships() public function getPaymentMethods() { if (empty($this->payment_methods)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, PaymentMethods::class) - ->addArgument(['user' => $this]); - $this->payment_methods = $this->getContainer()->get($nickname); + $this->payment_methods = new PaymentMethods(['user' => $this]); + $this->getContainer()->inflect($this->payment_methods); } return $this->payment_methods; } @@ -172,10 +164,8 @@ public function getReferences() public function getSiteMemberships() { if (empty($this->site_memberships)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, UserSiteMemberships::class) - ->addArgument(['user' => $this]); - $this->site_memberships = $this->getContainer()->get($nickname); + $this->site_memberships = new UserSiteMemberships(['user' => $this]); + $this->getContainer()->inflect($this->site_memberships); } return $this->site_memberships; } @@ -186,10 +176,8 @@ public function getSiteMemberships() public function getSSHKeys() { if (empty($this->ssh_keys)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, SSHKeys::class) - ->addArgument(['user' => $this]); - $this->ssh_keys = $this->getContainer()->get($nickname); + $this->ssh_keys = new SSHKeys(['user' => $this]); + $this->getContainer()->inflect($this->ssh_keys); } return $this->ssh_keys; } @@ -200,10 +188,8 @@ public function getSSHKeys() public function getUpstreams() { if (empty($this->upstreams)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Upstreams::class) - ->addArgument(['user' => $this]); - $this->upstreams = $this->getContainer()->get($nickname); + $this->upstreams = new Upstreams(['user' => $this]); + $this->getContainer()->inflect($this->upstreams); } return $this->upstreams; } @@ -214,10 +200,8 @@ public function getUpstreams() public function getWorkflows() { if (empty($this->workflows)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, Workflows::class) - ->addArgument(['user' => $this]); - $this->workflows = $this->getContainer()->get($nickname); + $this->workflows = new Workflows(['user' => $this]); + $this->getContainer()->inflect($this->workflows); } return $this->workflows; } diff --git a/src/Models/Workflow.php b/src/Models/Workflow.php index ce86450a1..b662361d8 100644 --- a/src/Models/Workflow.php +++ b/src/Models/Workflow.php @@ -86,10 +86,8 @@ public function checkProgress() public function getOperations() { if (empty($this->workflow_operations)) { - $nickname = \uniqid(__FUNCTION__ . "-"); - $this->getContainer()->add($nickname, WorkflowOperations::class) - ->addArgument(['data' => $this->get('operations')]); - $this->workflow_operations = $this->getContainer()->get($nickname); + $this->workflow_operations = new WorkflowOperations(['data' => $this->get('operations')]); + $this->getContainer()->inflect($this->workflow_operations); } return $this->workflow_operations; } diff --git a/src/Request/RequestOperationResult.php b/src/Request/RequestOperationResult.php index 2ec2bc23f..b514b3f7f 100644 --- a/src/Request/RequestOperationResult.php +++ b/src/Request/RequestOperationResult.php @@ -7,7 +7,7 @@ * Class RequestOperationResult * @package Pantheon\Terminus\Request */ -final class RequestOperationResult implements \ArrayAccess +class RequestOperationResult implements \ArrayAccess { /** * @var diff --git a/src/Session/Session.php b/src/Session/Session.php index 0b96f3001..34eb06855 100644 --- a/src/Session/Session.php +++ b/src/Session/Session.php @@ -74,16 +74,8 @@ public function getUser() "No user ID. Please login via t3 auth:login" ); } - $nickname = \uniqid(__METHOD__ . "-"); - $this->getContainer() - ->add($nickname, User::class) - ->addArgument((object)['id' => $user_id]); - $user = $this->getContainer()->get($nickname); - if (!$user instanceof User) { - throw new TerminusException( - "No User ID. Please ling via t3 auth:login" - ); - } + $user = new User((object)['id' => $user_id]); + $this->getContainer()->inflect($user); return $user; } @@ -133,10 +125,9 @@ public function setData($data) public function getTokens() { if (empty($this->tokens)) { - $nickname = \uniqid(__METHOD__ . "-"); - $this->getContainer()->add($nickname, SavedTokens::class) - ->addMethodCall('setDataStore', [$this->data_store]); - $this->tokens = $this->getContainer()->get($nickname); + $this->tokens = new SavedTokens(); + $this->tokens->setDataStore($this->data_store); + $this->getContainer()->inflect($this->tokens); } return $this->tokens; } diff --git a/src/Terminus.php b/src/Terminus.php index 3f3be9a6a..599a66ce3 100644 --- a/src/Terminus.php +++ b/src/Terminus.php @@ -83,7 +83,7 @@ public function __construct(Config $config, InputInterface $input, OutputInterfa $this->setInput($input); $this->setOutput($output); $application = new Application('Terminus', $config->get('version')); - $container = new Container(); + $container = new InflectionContainer(); Robo::configureContainer( $container, $application, diff --git a/tests/config/phpunit.xml.dist b/tests/config/phpunit.xml.dist index 2d6b9790c..d610bc1bf 100755 --- a/tests/config/phpunit.xml.dist +++ b/tests/config/phpunit.xml.dist @@ -3,17 +3,17 @@ colors="true" > - + ../unit_tests/ - - - ../../src/ - ../../utils/ - - ../../vendor/ - - - + + + ../../src/ + ../../utils/ + + + ../../vendor/ + + diff --git a/tests/unit_tests/Collections/APICollectionTest.php b/tests/unit_tests/Collections/APICollectionTest.php index 857af1f35..dfd8f5bc5 100644 --- a/tests/unit_tests/Collections/APICollectionTest.php +++ b/tests/unit_tests/Collections/APICollectionTest.php @@ -4,6 +4,7 @@ use Pantheon\Terminus\Collections\APICollection; use Pantheon\Terminus\Models\TerminusModel; +use Pantheon\Terminus\Request\RequestOperationResult; /** * Class APICollectionTest diff --git a/tests/unit_tests/Collections/BackupsTest.php b/tests/unit_tests/Collections/BackupsTest.php index 9b52144b2..0922f7dfe 100644 --- a/tests/unit_tests/Collections/BackupsTest.php +++ b/tests/unit_tests/Collections/BackupsTest.php @@ -30,7 +30,7 @@ class BackupsTest extends CollectionTestCase */ protected $environment; - public function setUp() + public function setUp(): void { parent::setUp(); @@ -273,7 +273,8 @@ public function testGetBackupByFileName() $this->assertEquals($out->get('task_id'), $data->task_id); $this->assertEquals($out->get('filename'), $data->filename); - $this->setExpectedException(TerminusException::class, "Could not find a backup identified by not-there."); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("Could not find a backup identified by not-there."); $out = $backups->getBackupByFileName('not-there'); $this->assertNull($out); } diff --git a/tests/unit_tests/Collections/BindingsTest.php b/tests/unit_tests/Collections/BindingsTest.php index f0a119cb5..9570ebf1d 100644 --- a/tests/unit_tests/Collections/BindingsTest.php +++ b/tests/unit_tests/Collections/BindingsTest.php @@ -19,7 +19,7 @@ class BindingsTest extends CollectionTestCase */ protected $bindings_data; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/BranchesTest.php b/tests/unit_tests/Collections/BranchesTest.php index 7140da8b3..62cea63bc 100644 --- a/tests/unit_tests/Collections/BranchesTest.php +++ b/tests/unit_tests/Collections/BranchesTest.php @@ -24,7 +24,7 @@ class BranchesTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/CollectionTestCase.php b/tests/unit_tests/Collections/CollectionTestCase.php index 4deab5cf5..904f2f27e 100644 --- a/tests/unit_tests/Collections/CollectionTestCase.php +++ b/tests/unit_tests/Collections/CollectionTestCase.php @@ -41,7 +41,7 @@ public function getConfig() /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { $this->config = $this->getMockBuilder(Config::class) ->disableOriginalConstructor() diff --git a/tests/unit_tests/Collections/DomainsTest.php b/tests/unit_tests/Collections/DomainsTest.php index 121945c9a..3de552c80 100644 --- a/tests/unit_tests/Collections/DomainsTest.php +++ b/tests/unit_tests/Collections/DomainsTest.php @@ -39,7 +39,7 @@ class DomainsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/EnvironmentsTest.php b/tests/unit_tests/Collections/EnvironmentsTest.php index b2a4825b6..0d9682928 100644 --- a/tests/unit_tests/Collections/EnvironmentsTest.php +++ b/tests/unit_tests/Collections/EnvironmentsTest.php @@ -41,7 +41,7 @@ class EnvironmentsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/OrganizationUpstreamsTest.php b/tests/unit_tests/Collections/OrganizationUpstreamsTest.php index ad5e29f72..b6ef68ec1 100644 --- a/tests/unit_tests/Collections/OrganizationUpstreamsTest.php +++ b/tests/unit_tests/Collections/OrganizationUpstreamsTest.php @@ -21,7 +21,7 @@ class OrganizationUpstreamsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->organization = $this->getMockBuilder(Organization::class) diff --git a/tests/unit_tests/Collections/OrganizationUserMembershipsTest.php b/tests/unit_tests/Collections/OrganizationUserMembershipsTest.php index 53ab80fad..ee3c19e42 100644 --- a/tests/unit_tests/Collections/OrganizationUserMembershipsTest.php +++ b/tests/unit_tests/Collections/OrganizationUserMembershipsTest.php @@ -26,7 +26,7 @@ class OrganizationUserMembershipsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/PaymentMethodsTest.php b/tests/unit_tests/Collections/PaymentMethodsTest.php index 32462f885..aa1748a22 100644 --- a/tests/unit_tests/Collections/PaymentMethodsTest.php +++ b/tests/unit_tests/Collections/PaymentMethodsTest.php @@ -27,7 +27,7 @@ class PaymentMethodsTest extends UserOwnedCollectionTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -51,10 +51,8 @@ public function testGetByLabel() public function testGetWhenNotFound() { $bad_id = 'invalid'; - $this->setExpectedException( - TerminusNotFoundException::class, - "Could not locate a payment method identified by $bad_id on this account." - ); + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage("Could not locate a payment method identified by $bad_id on this account."); $not_model = $this->collection->get($bad_id); $this->assertNull($not_model); } @@ -62,10 +60,8 @@ public function testGetWhenNotFound() public function testGetWhenMultipleMatches() { $shared_label = 'Visa - 1111'; - $this->setExpectedException( - TerminusException::class, - "More than one payment method matched $shared_label." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("More than one payment method matched $shared_label."); $not_model = $this->collection->get($shared_label); $this->assertNull($not_model); } diff --git a/tests/unit_tests/Collections/PlansTest.php b/tests/unit_tests/Collections/PlansTest.php index 4a8dbe323..b59c198a5 100644 --- a/tests/unit_tests/Collections/PlansTest.php +++ b/tests/unit_tests/Collections/PlansTest.php @@ -35,7 +35,7 @@ class PlansTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/SSHKeysTest.php b/tests/unit_tests/Collections/SSHKeysTest.php index 52ae79d23..afa5c9437 100644 --- a/tests/unit_tests/Collections/SSHKeysTest.php +++ b/tests/unit_tests/Collections/SSHKeysTest.php @@ -40,7 +40,7 @@ public function testAddKey() $this->collection->addKey($file); unlink($file); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $this->collection->addKey($file); } diff --git a/tests/unit_tests/Collections/SavedTokensTest.php b/tests/unit_tests/Collections/SavedTokensTest.php index 3afad6d2c..761e8c323 100644 --- a/tests/unit_tests/Collections/SavedTokensTest.php +++ b/tests/unit_tests/Collections/SavedTokensTest.php @@ -31,7 +31,7 @@ class SavedTokensTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/SiteAuthorizationsTest.php b/tests/unit_tests/Collections/SiteAuthorizationsTest.php index d29c0257b..f3139ac2a 100644 --- a/tests/unit_tests/Collections/SiteAuthorizationsTest.php +++ b/tests/unit_tests/Collections/SiteAuthorizationsTest.php @@ -25,7 +25,7 @@ class SiteAuthorizationsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/SiteOrganizationMembershipsTest.php b/tests/unit_tests/Collections/SiteOrganizationMembershipsTest.php index 5b61901ff..6a1306d18 100644 --- a/tests/unit_tests/Collections/SiteOrganizationMembershipsTest.php +++ b/tests/unit_tests/Collections/SiteOrganizationMembershipsTest.php @@ -32,7 +32,7 @@ class SiteOrganizationMembershipsTest extends TerminusTestCase /** * @var inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Collections/SitesTest.php b/tests/unit_tests/Collections/SitesTest.php index c49cfa7e9..f86fdb1ae 100644 --- a/tests/unit_tests/Collections/SitesTest.php +++ b/tests/unit_tests/Collections/SitesTest.php @@ -52,7 +52,7 @@ class SitesTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -337,10 +337,8 @@ public function testGetWhenDNE() ->with() ->will($this->throwException(new \Exception())); - $this->setExpectedException( - TerminusException::class, - "Could not locate a site your user may access identified by $uuid." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("Could not locate a site your user may access identified by $uuid."); $out = $this->collection->get($uuid); $this->assertNull($out); diff --git a/tests/unit_tests/Collections/TagsTest.php b/tests/unit_tests/Collections/TagsTest.php index e258f564c..700c3b86d 100644 --- a/tests/unit_tests/Collections/TagsTest.php +++ b/tests/unit_tests/Collections/TagsTest.php @@ -35,7 +35,7 @@ class TagsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -82,15 +82,6 @@ public function testCreate() $this->collection->create($tag_id); } - /** - * Tests Tags::fetch($options) - */ - public function testFetch() - { - $data = ['tag1',]; - $this->collection->fetch($data); - } - /** * Tests Tags::has($id) */ diff --git a/tests/unit_tests/Collections/TerminusCollectionTest.php b/tests/unit_tests/Collections/TerminusCollectionTest.php index 370bbcf49..473b86a85 100644 --- a/tests/unit_tests/Collections/TerminusCollectionTest.php +++ b/tests/unit_tests/Collections/TerminusCollectionTest.php @@ -18,7 +18,7 @@ class TerminusCollectionTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -152,10 +152,8 @@ public function testGet() $this->assertInstanceOf(PaymentMethod::class, $out); $this->assertEquals($model_data['id1']->foo, $out->get('foo')); - $this->setExpectedException( - TerminusNotFoundException::class, - 'Could not find a ' . PaymentMethod::PRETTY_NAME . ' identified by invalid.' - ); + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage('Could not find a ' . PaymentMethod::PRETTY_NAME . ' identified by invalid.'); $out = $collection->get('invalid'); $this->assertNull($out); } diff --git a/tests/unit_tests/Collections/UpstreamsTest.php b/tests/unit_tests/Collections/UpstreamsTest.php index d9eef2141..4906148d2 100644 --- a/tests/unit_tests/Collections/UpstreamsTest.php +++ b/tests/unit_tests/Collections/UpstreamsTest.php @@ -37,7 +37,7 @@ class UpstreamsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->organization = $this->getMockBuilder(Organization::class) diff --git a/tests/unit_tests/Collections/UserOwnedCollectionTest.php b/tests/unit_tests/Collections/UserOwnedCollectionTest.php index b592e8565..b04e2a0bb 100644 --- a/tests/unit_tests/Collections/UserOwnedCollectionTest.php +++ b/tests/unit_tests/Collections/UserOwnedCollectionTest.php @@ -28,10 +28,10 @@ abstract class UserOwnedCollectionTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); - + $user = new User((object)['id' => 'USERID']); $this->collection = new $this->class(['user' => $user]); $this->collection->setRequest($this->request); diff --git a/tests/unit_tests/Collections/WorkflowsTest.php b/tests/unit_tests/Collections/WorkflowsTest.php index 0b4432dfa..125ae93de 100644 --- a/tests/unit_tests/Collections/WorkflowsTest.php +++ b/tests/unit_tests/Collections/WorkflowsTest.php @@ -20,7 +20,7 @@ class WorkflowsTest extends CollectionTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); } diff --git a/tests/unit_tests/Commands/AliasesCommandTest.php b/tests/unit_tests/Commands/AliasesCommandTest.php index 7134f81b0..0e115b92e 100644 --- a/tests/unit_tests/Commands/AliasesCommandTest.php +++ b/tests/unit_tests/Commands/AliasesCommandTest.php @@ -40,7 +40,7 @@ class AliasesCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -79,7 +79,7 @@ protected function setUp() /** * @inheritdoc */ - protected function tearDown() + protected function tearDown(): void { $this->fixtures->cleanup(); } diff --git a/tests/unit_tests/Commands/ArtCommandTest.php b/tests/unit_tests/Commands/ArtCommandTest.php index ffcbf4209..7a462ed19 100644 --- a/tests/unit_tests/Commands/ArtCommandTest.php +++ b/tests/unit_tests/Commands/ArtCommandTest.php @@ -45,7 +45,7 @@ class ArtCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -140,10 +140,8 @@ public function testArtDNE() $this->local_machine_helper->expects($this->never()) ->method('readFile'); - $this->setExpectedException( - TerminusNotFoundException::class, - "There is no source for the requested $name artwork." - ); + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage("There is no source for the requested $name artwork."); $out = $this->command->art($name); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Auth/AuthTest.php b/tests/unit_tests/Commands/Auth/AuthTest.php index c8b8bdc74..3c9386f91 100644 --- a/tests/unit_tests/Commands/Auth/AuthTest.php +++ b/tests/unit_tests/Commands/Auth/AuthTest.php @@ -19,7 +19,7 @@ abstract class AuthTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Auth/LoginCommandTest.php b/tests/unit_tests/Commands/Auth/LoginCommandTest.php index 19a47e960..ce0db23f7 100644 --- a/tests/unit_tests/Commands/Auth/LoginCommandTest.php +++ b/tests/unit_tests/Commands/Auth/LoginCommandTest.php @@ -22,7 +22,7 @@ class LoginCommandTest extends AuthTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Auth/LogoutCommandTest.php b/tests/unit_tests/Commands/Auth/LogoutCommandTest.php index 44b52d256..dfb5ed47d 100644 --- a/tests/unit_tests/Commands/Auth/LogoutCommandTest.php +++ b/tests/unit_tests/Commands/Auth/LogoutCommandTest.php @@ -16,7 +16,7 @@ class LogoutCommandTest extends AuthTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Auth/WhoamiCommandTest.php b/tests/unit_tests/Commands/Auth/WhoamiCommandTest.php index 40de93e0a..6e8885e81 100644 --- a/tests/unit_tests/Commands/Auth/WhoamiCommandTest.php +++ b/tests/unit_tests/Commands/Auth/WhoamiCommandTest.php @@ -17,7 +17,7 @@ class WhoamiCommandTest extends AuthTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Backup/Automatic/DisableCommandTest.php b/tests/unit_tests/Commands/Backup/Automatic/DisableCommandTest.php index c3aaabe50..736740707 100644 --- a/tests/unit_tests/Commands/Backup/Automatic/DisableCommandTest.php +++ b/tests/unit_tests/Commands/Backup/Automatic/DisableCommandTest.php @@ -15,7 +15,7 @@ class DisableCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new DisableCommand($this->sites); diff --git a/tests/unit_tests/Commands/Backup/Automatic/EnableCommandTest.php b/tests/unit_tests/Commands/Backup/Automatic/EnableCommandTest.php index da8f728f9..7496cf357 100644 --- a/tests/unit_tests/Commands/Backup/Automatic/EnableCommandTest.php +++ b/tests/unit_tests/Commands/Backup/Automatic/EnableCommandTest.php @@ -21,7 +21,7 @@ class EnableCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new EnableCommand($this->sites); diff --git a/tests/unit_tests/Commands/Backup/Automatic/InfoCommandTest.php b/tests/unit_tests/Commands/Backup/Automatic/InfoCommandTest.php index c17f8b7cf..ac56cad74 100644 --- a/tests/unit_tests/Commands/Backup/Automatic/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Backup/Automatic/InfoCommandTest.php @@ -17,7 +17,7 @@ class InfoCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new InfoCommand($this->sites); diff --git a/tests/unit_tests/Commands/Backup/BackupCommandTest.php b/tests/unit_tests/Commands/Backup/BackupCommandTest.php index 0b5203f11..86be82065 100644 --- a/tests/unit_tests/Commands/Backup/BackupCommandTest.php +++ b/tests/unit_tests/Commands/Backup/BackupCommandTest.php @@ -29,7 +29,7 @@ abstract class BackupCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Backup/CreateCommandTest.php b/tests/unit_tests/Commands/Backup/CreateCommandTest.php index 196b6f5d5..26a906d61 100644 --- a/tests/unit_tests/Commands/Backup/CreateCommandTest.php +++ b/tests/unit_tests/Commands/Backup/CreateCommandTest.php @@ -19,7 +19,7 @@ class CreateCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new CreateCommand($this->sites); @@ -143,7 +143,7 @@ public function testCreateBackupFailure() $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $out = $this->command->create("mysite.{$this->environment->id}"); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Backup/GetCommandTest.php b/tests/unit_tests/Commands/Backup/GetCommandTest.php index 61b3ef34f..208132613 100644 --- a/tests/unit_tests/Commands/Backup/GetCommandTest.php +++ b/tests/unit_tests/Commands/Backup/GetCommandTest.php @@ -18,7 +18,7 @@ class GetCommandTest extends BackupCommandTest * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new GetCommand($this->sites); @@ -78,7 +78,7 @@ public function testGetBackupWithInvalidFile() ->with($this->equalTo($bad_file_name)) ->will($this->throwException(new TerminusNotFoundException())); - $this->setExpectedException(TerminusNotFoundException::class); + $this->expectException(TerminusNotFoundException::class); $out = $this->command->get('mysite.dev', ['file' => $bad_file_name,]); $this->assertNull($out); @@ -103,10 +103,8 @@ public function testGetBackupNoBackups() ->method('get') ->with($this->equalTo('name')) ->willReturn($site); - $this->setExpectedException( - TerminusNotFoundException::class, - "No backups available. Create one with `terminus backup:create $site.{$this->environment->id}`" - ); + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage("No backups available. Create one with `terminus backup:create $site.{$this->environment->id}`"); $out = $this->command->get("$site.{$this->environment->id}", compact('element')); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Backup/InfoCommandTest.php b/tests/unit_tests/Commands/Backup/InfoCommandTest.php index 27fd11514..b618799a8 100644 --- a/tests/unit_tests/Commands/Backup/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Backup/InfoCommandTest.php @@ -21,7 +21,7 @@ class InfoCommandTest extends BackupCommandTest * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Backup/ListCommandTest.php b/tests/unit_tests/Commands/Backup/ListCommandTest.php index c47f1a688..a23a11f92 100644 --- a/tests/unit_tests/Commands/Backup/ListCommandTest.php +++ b/tests/unit_tests/Commands/Backup/ListCommandTest.php @@ -21,7 +21,7 @@ class ListCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Backup/RestoreCommandTest.php b/tests/unit_tests/Commands/Backup/RestoreCommandTest.php index e1de9e622..60675f2b3 100644 --- a/tests/unit_tests/Commands/Backup/RestoreCommandTest.php +++ b/tests/unit_tests/Commands/Backup/RestoreCommandTest.php @@ -19,7 +19,7 @@ class RestoreCommandTest extends BackupCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new RestoreCommand($this->sites); @@ -92,7 +92,8 @@ public function testRestoreBackupWithFileFails() ->with() ->willReturn($message); - $this->setExpectedException(TerminusException::class, $better_message); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage($better_message); $out = $this->command->restoreBackup("mysite.{$this->environment->id}", ['file' => $test_filename,]); $this->assertNull($out); @@ -110,7 +111,7 @@ public function testRestoreBackupWithInvalidFile() ->with($this->equalTo($bad_file_name)) ->will($this->throwException(new TerminusNotFoundException())); - $this->setExpectedException(TerminusNotFoundException::class); + $this->expectException(TerminusNotFoundException::class); $out = $this->command->restoreBackup('mysite.dev', ['file' => $bad_file_name,]); $this->assertNull($out); @@ -173,7 +174,8 @@ public function testRestoreBackupWithElementFails() ->with() ->willReturn($message); - $this->setExpectedException(TerminusException::class, $better_message); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage($better_message); $out = $this->command->restoreBackup('mysite.dev', ['element' => 'db',]); $this->assertNull($out); @@ -199,10 +201,9 @@ public function testRestoreNoBackups() ->method('get') ->with($this->equalTo('name')) ->willReturn($site_name); - $this->setExpectedException( - TerminusNotFoundException::class, - "No backups available. Create one with `terminus backup:create $site_name.{$this->environment->id}`" - ); + + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage("No backups available. Create one with `terminus backup:create $site_name.{$this->environment->id}`"); $out = $this->command->restoreBackup("$site_name.{$this->environment->id}", compact('element')); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/CommandTestCase.php b/tests/unit_tests/Commands/CommandTestCase.php index cfc62f525..3388f0dd8 100644 --- a/tests/unit_tests/Commands/CommandTestCase.php +++ b/tests/unit_tests/Commands/CommandTestCase.php @@ -109,7 +109,7 @@ public function getStatusCode() /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { if (!$this->config) { $this->setConfig( diff --git a/tests/unit_tests/Commands/Connection/InfoCommandTest.php b/tests/unit_tests/Commands/Connection/InfoCommandTest.php index cb5edc421..d8582e574 100644 --- a/tests/unit_tests/Commands/Connection/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Connection/InfoCommandTest.php @@ -16,7 +16,7 @@ class InfoCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Connection/SetCommandTest.php b/tests/unit_tests/Commands/Connection/SetCommandTest.php index 8523871cf..ab6c3afc4 100644 --- a/tests/unit_tests/Commands/Connection/SetCommandTest.php +++ b/tests/unit_tests/Commands/Connection/SetCommandTest.php @@ -25,7 +25,7 @@ class SetCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -93,7 +93,8 @@ public function testConnectionSetThrowsError() // should display a notice about the mode switch $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException(TerminusException::class, $message); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage($message); // trigger command call expectations $this->command->connectionSet('dummy-site.dummy-env', $mode); @@ -170,10 +171,8 @@ public function testConnectionSetInvalidTestEnv() { $this->environment->id = 'test'; - $this->setExpectedException( - TerminusException::class, - 'Connection mode cannot be set on the test environment' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Connection mode cannot be set on the test environment'); // trigger command call expectations $this->command->connectionSet('dummy-site.test', 'any-mode'); @@ -186,10 +185,8 @@ public function testConnectionSetInvalidLiveEnv() { $this->environment->id = 'live'; - $this->setExpectedException( - TerminusException::class, - 'Connection mode cannot be set on the live environment' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Connection mode cannot be set on the live environment'); // trigger command call expectations $this->command->connectionSet('dummy-site.live', 'any-mode'); diff --git a/tests/unit_tests/Commands/Dashboard/ViewCommandTest.php b/tests/unit_tests/Commands/Dashboard/ViewCommandTest.php index 28526da8f..894d4e628 100644 --- a/tests/unit_tests/Commands/Dashboard/ViewCommandTest.php +++ b/tests/unit_tests/Commands/Dashboard/ViewCommandTest.php @@ -28,7 +28,7 @@ class ViewCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/AddCommandTest.php b/tests/unit_tests/Commands/Domain/AddCommandTest.php index 6af2dc208..d3fe729f3 100644 --- a/tests/unit_tests/Commands/Domain/AddCommandTest.php +++ b/tests/unit_tests/Commands/Domain/AddCommandTest.php @@ -14,7 +14,7 @@ class AddCommandTest extends DomainTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/DNSCommandTest.php b/tests/unit_tests/Commands/Domain/DNSCommandTest.php index b6c9739df..995a34986 100644 --- a/tests/unit_tests/Commands/Domain/DNSCommandTest.php +++ b/tests/unit_tests/Commands/Domain/DNSCommandTest.php @@ -25,7 +25,7 @@ class DNSCommandTest extends DomainTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/DomainTest.php b/tests/unit_tests/Commands/Domain/DomainTest.php index 0f21b7a32..f961a62bb 100644 --- a/tests/unit_tests/Commands/Domain/DomainTest.php +++ b/tests/unit_tests/Commands/Domain/DomainTest.php @@ -24,7 +24,7 @@ abstract class DomainTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/ListCommandTest.php b/tests/unit_tests/Commands/Domain/ListCommandTest.php index 0a57bca46..9f90a46e9 100644 --- a/tests/unit_tests/Commands/Domain/ListCommandTest.php +++ b/tests/unit_tests/Commands/Domain/ListCommandTest.php @@ -16,7 +16,7 @@ class ListCommandTest extends DomainTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/LookupCommandTest.php b/tests/unit_tests/Commands/Domain/LookupCommandTest.php index 773930cef..39cd72b6c 100644 --- a/tests/unit_tests/Commands/Domain/LookupCommandTest.php +++ b/tests/unit_tests/Commands/Domain/LookupCommandTest.php @@ -20,7 +20,7 @@ class LookupCommandTest extends DomainTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -87,7 +87,7 @@ public function testLookupDNE() ->with($this->equalTo($domain)) ->willReturn(false); - $this->setExpectedException(TerminusNotFoundException::class); + $this->expectException(TerminusNotFoundException::class); $out = $this->command->lookup($domain); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Domain/Primary/PrimaryDomainCommandsTestBase.php b/tests/unit_tests/Commands/Domain/Primary/PrimaryDomainCommandsTestBase.php index 2ff192c35..ed11fb573 100644 --- a/tests/unit_tests/Commands/Domain/Primary/PrimaryDomainCommandsTestBase.php +++ b/tests/unit_tests/Commands/Domain/Primary/PrimaryDomainCommandsTestBase.php @@ -20,7 +20,7 @@ abstract class PrimaryDomainCommandsTestBase extends CommandTestCase abstract protected function getSystemUnderTest(); - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Domain/RemoveCommandTest.php b/tests/unit_tests/Commands/Domain/RemoveCommandTest.php index 6ab36901e..96beaf851 100644 --- a/tests/unit_tests/Commands/Domain/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Domain/RemoveCommandTest.php @@ -14,7 +14,7 @@ class RemoveCommandTest extends DomainTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Env/ClearCacheCommandTest.php b/tests/unit_tests/Commands/Env/ClearCacheCommandTest.php index 2ab0bee32..48af2443e 100644 --- a/tests/unit_tests/Commands/Env/ClearCacheCommandTest.php +++ b/tests/unit_tests/Commands/Env/ClearCacheCommandTest.php @@ -18,7 +18,7 @@ class ClearCacheCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Env/CloneContentCommandTest.php b/tests/unit_tests/Commands/Env/CloneContentCommandTest.php index 856f09484..282b1ba94 100644 --- a/tests/unit_tests/Commands/Env/CloneContentCommandTest.php +++ b/tests/unit_tests/Commands/Env/CloneContentCommandTest.php @@ -19,7 +19,7 @@ class CloneContentCommandTest extends EnvCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new CloneContentCommand(); @@ -201,11 +201,10 @@ public function testCloneFilesToUninitialized() $this->environment->method('getSite')->willReturn($this->site); $this->site->method('getName')->willReturn($site_name); - $this->setExpectedException( - TerminusException::class, - "$site_name's {$this->environment->id} environment cannot be cloned into because it has not been " - . "initialized. Please run `env:deploy $site_name.{$this->environment->id}` to initialize it." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("$site_name's {$this->environment->id} environment cannot be cloned into because " + . "it has not been initialized. Please run `env:deploy $site_name.{$this->environment->id}` to " + . "initialize it."); $this->command->cloneContent( "$site_name.{$this->environment->id}", @@ -238,18 +237,18 @@ public function testCloneFilesFromUninitialized() $this->environment->method('getSite')->willReturn($this->site); $this->site->method('getName')->willReturn($site_name); - $this->setExpectedException( - TerminusException::class, - "$site_name's {$this->environment->id} environment cannot be cloned from because it has not been " - . "initialized. Please run `env:deploy $site_name.{$this->environment->id}` to initialize it." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("$site_name's {$this->environment->id} environment cannot be cloned from because " + . "it has not been initialized. Please run `env:deploy $site_name.{$this->environment->id}` to " + . "initialize it."); $this->command->cloneContent("$site_name.{$this->environment->id}", $target_env, ['files-only' => true,]); } public function testCloneNone() { - $this->setExpectedException(TerminusException::class, 'You cannot specify both --db-only and --files-only'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('You cannot specify both --db-only and --files-only'); $this->command->cloneContent('mysite.dev', 'test', ['db-only' => true, 'files-only' => true,]); } diff --git a/tests/unit_tests/Commands/Env/CodeLogCommandTest.php b/tests/unit_tests/Commands/Env/CodeLogCommandTest.php index 6196dede1..0d28fd011 100644 --- a/tests/unit_tests/Commands/Env/CodeLogCommandTest.php +++ b/tests/unit_tests/Commands/Env/CodeLogCommandTest.php @@ -16,7 +16,7 @@ class CodeLogCommandTest extends EnvCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new CodeLogCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Env/CommitCommandTest.php b/tests/unit_tests/Commands/Env/CommitCommandTest.php index a453d9134..d0d3612b7 100644 --- a/tests/unit_tests/Commands/Env/CommitCommandTest.php +++ b/tests/unit_tests/Commands/Env/CommitCommandTest.php @@ -17,7 +17,7 @@ class CommitCommandTest extends EnvCommandTest /** * Sets up the test fixture. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new CommitCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Env/DeployCommandTest.php b/tests/unit_tests/Commands/Env/DeployCommandTest.php index 59b93f51f..5cfc7e050 100644 --- a/tests/unit_tests/Commands/Env/DeployCommandTest.php +++ b/tests/unit_tests/Commands/Env/DeployCommandTest.php @@ -18,7 +18,7 @@ class DeployCommandTest extends EnvCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new DeployCommand($this->getConfig()); @@ -177,10 +177,8 @@ public function testDeploySyncFromUninitialized() ->method('isFrozen') ->willReturn(false); - $this->setExpectedException( - TerminusException::class, - "$site_name's live environment cannot be cloned because it has not been initialized." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("$site_name's live environment cannot be cloned because it has not been initialized."); // Run the deploy. $this->command->deploy( diff --git a/tests/unit_tests/Commands/Env/DiffStatCommandTest.php b/tests/unit_tests/Commands/Env/DiffStatCommandTest.php index 2d2f6f646..1a0a7eb38 100644 --- a/tests/unit_tests/Commands/Env/DiffStatCommandTest.php +++ b/tests/unit_tests/Commands/Env/DiffStatCommandTest.php @@ -11,7 +11,7 @@ */ class DiffStatCommandTest extends EnvCommandTest { - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Env/EnvCommandTest.php b/tests/unit_tests/Commands/Env/EnvCommandTest.php index 536409a56..473200b23 100644 --- a/tests/unit_tests/Commands/Env/EnvCommandTest.php +++ b/tests/unit_tests/Commands/Env/EnvCommandTest.php @@ -21,7 +21,7 @@ abstract class EnvCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Commands/Env/ListCommandTest.php b/tests/unit_tests/Commands/Env/ListCommandTest.php index f6de8ad6a..d431e512b 100644 --- a/tests/unit_tests/Commands/Env/ListCommandTest.php +++ b/tests/unit_tests/Commands/Env/ListCommandTest.php @@ -25,7 +25,7 @@ class ListCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Env/MetricsCommandTest.php b/tests/unit_tests/Commands/Env/MetricsCommandTest.php index 1e99a8033..ecf3cd8d5 100644 --- a/tests/unit_tests/Commands/Env/MetricsCommandTest.php +++ b/tests/unit_tests/Commands/Env/MetricsCommandTest.php @@ -16,7 +16,7 @@ class MetricsCommandTest extends EnvCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new MetricsCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Env/ViewCommandTest.php b/tests/unit_tests/Commands/Env/ViewCommandTest.php index d37832121..a83531876 100644 --- a/tests/unit_tests/Commands/Env/ViewCommandTest.php +++ b/tests/unit_tests/Commands/Env/ViewCommandTest.php @@ -21,7 +21,7 @@ class ViewCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Env/WakeCommandTest.php b/tests/unit_tests/Commands/Env/WakeCommandTest.php index 54af3cb91..922b614c3 100644 --- a/tests/unit_tests/Commands/Env/WakeCommandTest.php +++ b/tests/unit_tests/Commands/Env/WakeCommandTest.php @@ -15,7 +15,7 @@ class WakeCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -56,7 +56,8 @@ public function testWakeFailUnreachable() ->with() ->willReturn(['success' => false, 'target' => 'dev',]); - $this->setExpectedException(TerminusException::class, 'Could not reach dev'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Could not reach dev'); $out = $this->command->wake('mysite.dev'); $this->assertNull($out); @@ -72,7 +73,8 @@ public function testWakeFail() ->with() ->willReturn(['success' => true, 'target' => 'dev',]); - $this->setExpectedException(TerminusException::class, 'Pantheon headers missing, which is not quite right.'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Pantheon headers missing, which is not quite right.'); $out = $this->command->wake('mysite.dev'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Env/WipeCommandTest.php b/tests/unit_tests/Commands/Env/WipeCommandTest.php index 70d4ab10c..5a83e917e 100644 --- a/tests/unit_tests/Commands/Env/WipeCommandTest.php +++ b/tests/unit_tests/Commands/Env/WipeCommandTest.php @@ -17,7 +17,7 @@ class WipeCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/HTTPS/InfoCommandTest.php b/tests/unit_tests/Commands/HTTPS/InfoCommandTest.php index dafd04f72..70b7ec0e8 100644 --- a/tests/unit_tests/Commands/HTTPS/InfoCommandTest.php +++ b/tests/unit_tests/Commands/HTTPS/InfoCommandTest.php @@ -32,7 +32,7 @@ class InfoCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/HTTPS/RemoveCommandTest.php b/tests/unit_tests/Commands/HTTPS/RemoveCommandTest.php index 250c8da8b..14c41c559 100644 --- a/tests/unit_tests/Commands/HTTPS/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/HTTPS/RemoveCommandTest.php @@ -20,7 +20,7 @@ class RemoveCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -65,7 +65,7 @@ public function testRemoveFailed() ->method('disableHttpsCertificate') ->will($this->throwException(new TerminusException('Could not delete'))); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $this->command->remove('mysite.dev'); } } diff --git a/tests/unit_tests/Commands/HTTPS/SetCommandTest.php b/tests/unit_tests/Commands/HTTPS/SetCommandTest.php index 63584f419..f061d0f60 100644 --- a/tests/unit_tests/Commands/HTTPS/SetCommandTest.php +++ b/tests/unit_tests/Commands/HTTPS/SetCommandTest.php @@ -24,7 +24,7 @@ class SetCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Import/CompleteCommandTest.php b/tests/unit_tests/Commands/Import/CompleteCommandTest.php index 74479bfef..d6e6b7681 100644 --- a/tests/unit_tests/Commands/Import/CompleteCommandTest.php +++ b/tests/unit_tests/Commands/Import/CompleteCommandTest.php @@ -19,7 +19,7 @@ class CompleteCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Import/DatabaseCommandTest.php b/tests/unit_tests/Commands/Import/DatabaseCommandTest.php index 24c699a49..f6b72370d 100644 --- a/tests/unit_tests/Commands/Import/DatabaseCommandTest.php +++ b/tests/unit_tests/Commands/Import/DatabaseCommandTest.php @@ -24,7 +24,7 @@ class DatabaseCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Import/FilesCommandTest.php b/tests/unit_tests/Commands/Import/FilesCommandTest.php index fff67b8a2..d1563b9b9 100644 --- a/tests/unit_tests/Commands/Import/FilesCommandTest.php +++ b/tests/unit_tests/Commands/Import/FilesCommandTest.php @@ -24,7 +24,7 @@ class FilesCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Import/SiteCommandTest.php b/tests/unit_tests/Commands/Import/SiteCommandTest.php index 60320867c..f338e8b39 100644 --- a/tests/unit_tests/Commands/Import/SiteCommandTest.php +++ b/tests/unit_tests/Commands/Import/SiteCommandTest.php @@ -25,7 +25,7 @@ class SiteCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -82,7 +82,8 @@ public function testSiteImportInvalidURL() ->with() ->will($this->throwException(new \Exception('Successfully queued import_site'))); - $this->setExpectedException(TerminusException::class, 'Site import failed'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Site import failed'); $out = $this->command->import('dummy-site', $url); $this->assertNull($out); @@ -107,7 +108,8 @@ public function testSiteImportUnspecifiedException() ->with() ->will($this->throwException(new \Exception($message))); - $this->setExpectedException(\Exception::class, $message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($message); $out = $this->command->import('dummy-site', $url); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Lock/DisableCommandTest.php b/tests/unit_tests/Commands/Lock/DisableCommandTest.php index d3d0dca22..6effc0306 100644 --- a/tests/unit_tests/Commands/Lock/DisableCommandTest.php +++ b/tests/unit_tests/Commands/Lock/DisableCommandTest.php @@ -18,7 +18,7 @@ class DisableCommandTest extends LockCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Lock/EnableCommandTest.php b/tests/unit_tests/Commands/Lock/EnableCommandTest.php index 880a62f2f..2ecb6f02c 100644 --- a/tests/unit_tests/Commands/Lock/EnableCommandTest.php +++ b/tests/unit_tests/Commands/Lock/EnableCommandTest.php @@ -18,7 +18,7 @@ class EnableCommandTest extends LockCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Lock/InfoCommandTest.php b/tests/unit_tests/Commands/Lock/InfoCommandTest.php index b7a56f54e..89a0d0cd0 100644 --- a/tests/unit_tests/Commands/Lock/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Lock/InfoCommandTest.php @@ -15,7 +15,7 @@ class InfoCommandTest extends LockCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Lock/LockCommandTest.php b/tests/unit_tests/Commands/Lock/LockCommandTest.php index 9ece6f8ec..7cc4c2798 100644 --- a/tests/unit_tests/Commands/Lock/LockCommandTest.php +++ b/tests/unit_tests/Commands/Lock/LockCommandTest.php @@ -19,7 +19,7 @@ abstract class LockCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/MachineToken/MachineTokenCommandTest.php b/tests/unit_tests/Commands/MachineToken/MachineTokenCommandTest.php index 03c6a066e..51e97dd74 100644 --- a/tests/unit_tests/Commands/MachineToken/MachineTokenCommandTest.php +++ b/tests/unit_tests/Commands/MachineToken/MachineTokenCommandTest.php @@ -23,7 +23,7 @@ abstract class MachineTokenCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteAllCommandTest.php b/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteAllCommandTest.php index b204dd53f..306aee49c 100644 --- a/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteAllCommandTest.php +++ b/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteAllCommandTest.php @@ -17,7 +17,7 @@ class MachineTokenDeleteAllCommandTest extends MachineTokenCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteCommandTest.php b/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteCommandTest.php index f45b32b65..6c4825e08 100644 --- a/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteCommandTest.php +++ b/tests/unit_tests/Commands/MachineToken/MachineTokensDeleteCommandTest.php @@ -22,7 +22,7 @@ class MachineTokenDeleteCommandTest extends MachineTokenCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -66,7 +66,7 @@ public function testMachineTokenDeleteNonExistant() $this->token->expects($this->never()) ->method('delete'); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $out = $this->command->delete('123'); $this->assertNull($out); @@ -86,10 +86,8 @@ public function testMachineTokenDeleteAPIFailure() ->method('delete') ->will($this->throwException(new TerminusException('There was an problem deleting the machine token.'))); - $this->setExpectedException( - \Exception::class, - 'There was an problem deleting the machine token.' - ); + $this->expectException(\Exception::class); + $this->expectExceptionMessage('There was an problem deleting the machine token.'); $out = $this->command->delete('123'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/MachineToken/MachineTokensListCommandTest.php b/tests/unit_tests/Commands/MachineToken/MachineTokensListCommandTest.php index 1433b8535..c5c3e1473 100644 --- a/tests/unit_tests/Commands/MachineToken/MachineTokensListCommandTest.php +++ b/tests/unit_tests/Commands/MachineToken/MachineTokensListCommandTest.php @@ -16,7 +16,7 @@ class MachineTokensListCommandTest extends MachineTokenCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->machine_tokens->method('getCollectedClass')->willReturn(MachineToken::class); diff --git a/tests/unit_tests/Commands/Multidev/CreateCommandTest.php b/tests/unit_tests/Commands/Multidev/CreateCommandTest.php index fe8b24370..64e11a61a 100644 --- a/tests/unit_tests/Commands/Multidev/CreateCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/CreateCommandTest.php @@ -17,7 +17,7 @@ class CreateCommandTest extends MultidevCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Multidev/DeleteCommandTest.php b/tests/unit_tests/Commands/Multidev/DeleteCommandTest.php index c0be9aff5..b47d56925 100644 --- a/tests/unit_tests/Commands/Multidev/DeleteCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/DeleteCommandTest.php @@ -18,7 +18,7 @@ class DeleteCommandTest extends MultidevCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -101,7 +101,8 @@ public function testMultidevDeleteFailure() ->with() ->will($this->throwException(new TerminusException($message, ['env' => $this->environment->id,]))); - $this->setExpectedException(TerminusException::class, $expected_message); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage($expected_message); $out = $this->command->deleteMultidev("site.{$this->environment->id}"); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Multidev/ListCommandTest.php b/tests/unit_tests/Commands/Multidev/ListCommandTest.php index 0e1061bdd..394e73bfa 100644 --- a/tests/unit_tests/Commands/Multidev/ListCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/ListCommandTest.php @@ -20,7 +20,7 @@ class ListCommandTest extends MultidevCommandTest * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Multidev/MergeFromDevCommandTest.php b/tests/unit_tests/Commands/Multidev/MergeFromDevCommandTest.php index b8919da5f..ff9609d40 100644 --- a/tests/unit_tests/Commands/Multidev/MergeFromDevCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/MergeFromDevCommandTest.php @@ -17,7 +17,7 @@ class MergeFromDevCommandTest extends MultidevCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Multidev/MergeToDevCommandTest.php b/tests/unit_tests/Commands/Multidev/MergeToDevCommandTest.php index 7370f6451..7b7d64031 100644 --- a/tests/unit_tests/Commands/Multidev/MergeToDevCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/MergeToDevCommandTest.php @@ -17,7 +17,7 @@ class MergeToDevCommandTest extends MultidevCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Multidev/MultidevCommandTest.php b/tests/unit_tests/Commands/Multidev/MultidevCommandTest.php index c6c424fbe..756715ce3 100644 --- a/tests/unit_tests/Commands/Multidev/MultidevCommandTest.php +++ b/tests/unit_tests/Commands/Multidev/MultidevCommandTest.php @@ -20,7 +20,7 @@ abstract class MultidevCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Commands/NewRelic/DisableCommandTest.php b/tests/unit_tests/Commands/NewRelic/DisableCommandTest.php index 8d0ecfb8f..3683ec227 100644 --- a/tests/unit_tests/Commands/NewRelic/DisableCommandTest.php +++ b/tests/unit_tests/Commands/NewRelic/DisableCommandTest.php @@ -18,7 +18,7 @@ class DisableCommandTest extends NewRelicCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/NewRelic/EnableCommandTest.php b/tests/unit_tests/Commands/NewRelic/EnableCommandTest.php index 8ddd46043..efe868462 100644 --- a/tests/unit_tests/Commands/NewRelic/EnableCommandTest.php +++ b/tests/unit_tests/Commands/NewRelic/EnableCommandTest.php @@ -18,7 +18,7 @@ class EnableCommandTest extends NewRelicCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/NewRelic/InfoCommandTest.php b/tests/unit_tests/Commands/NewRelic/InfoCommandTest.php index 53ede65b9..ae0943d04 100644 --- a/tests/unit_tests/Commands/NewRelic/InfoCommandTest.php +++ b/tests/unit_tests/Commands/NewRelic/InfoCommandTest.php @@ -15,7 +15,7 @@ class InfoCommandTest extends NewRelicCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/NewRelic/NewRelicCommandTest.php b/tests/unit_tests/Commands/NewRelic/NewRelicCommandTest.php index 9f56b7978..6b9341b11 100644 --- a/tests/unit_tests/Commands/NewRelic/NewRelicCommandTest.php +++ b/tests/unit_tests/Commands/NewRelic/NewRelicCommandTest.php @@ -14,7 +14,7 @@ abstract class NewRelicCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/ListCommandTest.php b/tests/unit_tests/Commands/Org/ListCommandTest.php index e7985dc58..62e4c8f8c 100644 --- a/tests/unit_tests/Commands/Org/ListCommandTest.php +++ b/tests/unit_tests/Commands/Org/ListCommandTest.php @@ -37,7 +37,7 @@ class ListCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/People/AddCommandTest.php b/tests/unit_tests/Commands/Org/People/AddCommandTest.php index 25dc037f7..2e363d732 100644 --- a/tests/unit_tests/Commands/Org/People/AddCommandTest.php +++ b/tests/unit_tests/Commands/Org/People/AddCommandTest.php @@ -18,7 +18,7 @@ class AddCommandTest extends OrgPeopleCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/People/ListCommandTest.php b/tests/unit_tests/Commands/Org/People/ListCommandTest.php index 381175c74..917321d42 100644 --- a/tests/unit_tests/Commands/Org/People/ListCommandTest.php +++ b/tests/unit_tests/Commands/Org/People/ListCommandTest.php @@ -15,7 +15,7 @@ class ListCommandTest extends OrgPeopleCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->org_user_memberships->method('getCollectedClass')->willReturn(UserOrganizationMembership::class); diff --git a/tests/unit_tests/Commands/Org/People/OrgPeopleCommandTest.php b/tests/unit_tests/Commands/Org/People/OrgPeopleCommandTest.php index 45160d25a..92ff30c5d 100644 --- a/tests/unit_tests/Commands/Org/People/OrgPeopleCommandTest.php +++ b/tests/unit_tests/Commands/Org/People/OrgPeopleCommandTest.php @@ -49,7 +49,7 @@ abstract class OrgPeopleCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/People/RemoveCommandTest.php b/tests/unit_tests/Commands/Org/People/RemoveCommandTest.php index bb2d9580a..dc5ea0eba 100644 --- a/tests/unit_tests/Commands/Org/People/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Org/People/RemoveCommandTest.php @@ -18,7 +18,7 @@ class RemoveCommandTest extends OrgPeopleCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/People/RoleCommandTest.php b/tests/unit_tests/Commands/Org/People/RoleCommandTest.php index 91529e540..34bd31cd7 100644 --- a/tests/unit_tests/Commands/Org/People/RoleCommandTest.php +++ b/tests/unit_tests/Commands/Org/People/RoleCommandTest.php @@ -18,7 +18,7 @@ class RoleCommandTest extends OrgPeopleCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/Site/ListCommandTest.php b/tests/unit_tests/Commands/Org/Site/ListCommandTest.php index 59752fbb5..95920f953 100644 --- a/tests/unit_tests/Commands/Org/Site/ListCommandTest.php +++ b/tests/unit_tests/Commands/Org/Site/ListCommandTest.php @@ -14,7 +14,7 @@ class ListCommandTest extends OrgSiteCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/Site/OrgSiteCommandTest.php b/tests/unit_tests/Commands/Org/Site/OrgSiteCommandTest.php index 804c9fa3d..3915e9d97 100644 --- a/tests/unit_tests/Commands/Org/Site/OrgSiteCommandTest.php +++ b/tests/unit_tests/Commands/Org/Site/OrgSiteCommandTest.php @@ -39,7 +39,7 @@ abstract class OrgSiteCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/Site/RemoveCommandTest.php b/tests/unit_tests/Commands/Org/Site/RemoveCommandTest.php index c1c82a815..09694f7b6 100644 --- a/tests/unit_tests/Commands/Org/Site/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Org/Site/RemoveCommandTest.php @@ -33,7 +33,7 @@ class RemoveCommandTest extends OrgSiteCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Org/Upstream/ListCommandTest.php b/tests/unit_tests/Commands/Org/Upstream/ListCommandTest.php index 7fb371f66..238fb5e15 100644 --- a/tests/unit_tests/Commands/Org/Upstream/ListCommandTest.php +++ b/tests/unit_tests/Commands/Org/Upstream/ListCommandTest.php @@ -21,7 +21,7 @@ class ListCommandTest extends UpstreamCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Owner/SetCommandTest.php b/tests/unit_tests/Commands/Owner/SetCommandTest.php index 4546b1aa1..3bed762b7 100644 --- a/tests/unit_tests/Commands/Owner/SetCommandTest.php +++ b/tests/unit_tests/Commands/Owner/SetCommandTest.php @@ -28,7 +28,7 @@ class SetCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -111,7 +111,7 @@ public function testOwnerSetInvalidOwner() $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException(TerminusNotFoundException::class); + $this->expectException(TerminusNotFoundException::class); $out = $this->command->setOwner('dummy-site', $email); $this->assertNull($out); @@ -135,7 +135,7 @@ public function testOwnerSetDontCatchException() $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException(\Exception::class); + $this->expectException(\Exception::class); $out = $this->command->setOwner('dummy-site', $email); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/PaymentMethod/AddCommandTest.php b/tests/unit_tests/Commands/PaymentMethod/AddCommandTest.php index 8f8455989..9120ae60e 100644 --- a/tests/unit_tests/Commands/PaymentMethod/AddCommandTest.php +++ b/tests/unit_tests/Commands/PaymentMethod/AddCommandTest.php @@ -40,7 +40,7 @@ class AddCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/PaymentMethod/ListCommandTest.php b/tests/unit_tests/Commands/PaymentMethod/ListCommandTest.php index 2af093a3b..83c89fcf8 100644 --- a/tests/unit_tests/Commands/PaymentMethod/ListCommandTest.php +++ b/tests/unit_tests/Commands/PaymentMethod/ListCommandTest.php @@ -33,7 +33,7 @@ class ListCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/PaymentMethod/RemoveCommandTest.php b/tests/unit_tests/Commands/PaymentMethod/RemoveCommandTest.php index c4c56ce4f..f706d4131 100644 --- a/tests/unit_tests/Commands/PaymentMethod/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/PaymentMethod/RemoveCommandTest.php @@ -18,7 +18,7 @@ class RemoveCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Plan/InfoCommandTest.php b/tests/unit_tests/Commands/Plan/InfoCommandTest.php index 376857d9b..99dba18c2 100644 --- a/tests/unit_tests/Commands/Plan/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Plan/InfoCommandTest.php @@ -22,7 +22,7 @@ class InfoCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Plan/SetCommandTest.php b/tests/unit_tests/Commands/Plan/SetCommandTest.php index 74da87a8e..ef46fe1e0 100644 --- a/tests/unit_tests/Commands/Plan/SetCommandTest.php +++ b/tests/unit_tests/Commands/Plan/SetCommandTest.php @@ -21,7 +21,7 @@ class SetCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Remote/DrushCommandTest.php b/tests/unit_tests/Commands/Remote/DrushCommandTest.php index bcd43e380..5da9c4538 100644 --- a/tests/unit_tests/Commands/Remote/DrushCommandTest.php +++ b/tests/unit_tests/Commands/Remote/DrushCommandTest.php @@ -14,7 +14,7 @@ class DrushCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Remote/SSHBaseCommandTest.php b/tests/unit_tests/Commands/Remote/SSHBaseCommandTest.php index ba948b285..a8d1fe130 100644 --- a/tests/unit_tests/Commands/Remote/SSHBaseCommandTest.php +++ b/tests/unit_tests/Commands/Remote/SSHBaseCommandTest.php @@ -22,7 +22,7 @@ class SSHBaseCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -135,7 +135,8 @@ public function testExecuteCommandNonzeroStatus() ]) ); - $this->setExpectedException(TerminusProcessException::class, $dummy_output); + $this->expectException(TerminusProcessException::class); + $this->expectExceptionMessage($dummy_output); $out = $this->command->dummyCommand("$site_name.{$this->environment->id}", $options); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/SSHKey/AddCommandTest.php b/tests/unit_tests/Commands/SSHKey/AddCommandTest.php index 509d20bae..7864d3e3d 100644 --- a/tests/unit_tests/Commands/SSHKey/AddCommandTest.php +++ b/tests/unit_tests/Commands/SSHKey/AddCommandTest.php @@ -14,7 +14,7 @@ class AddCommandTest extends SSHKeyCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/SSHKey/ListCommandTest.php b/tests/unit_tests/Commands/SSHKey/ListCommandTest.php index db470f82c..901774d82 100644 --- a/tests/unit_tests/Commands/SSHKey/ListCommandTest.php +++ b/tests/unit_tests/Commands/SSHKey/ListCommandTest.php @@ -16,7 +16,7 @@ class ListCommandTest extends SSHKeyCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->ssh_keys->method('getCollectedClass')->willReturn(SSHKey::class); diff --git a/tests/unit_tests/Commands/SSHKey/RemoveCommandTest.php b/tests/unit_tests/Commands/SSHKey/RemoveCommandTest.php index 3b3b38c29..0f1628684 100644 --- a/tests/unit_tests/Commands/SSHKey/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/SSHKey/RemoveCommandTest.php @@ -16,7 +16,7 @@ class RemoveCommandTest extends SSHKeyCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -73,7 +73,7 @@ public function testSSHKeysDeleteNonExistant() ->will($this->throwException(new TerminusException)); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $out = $this->command->delete('123'); $this->assertNull($out); @@ -99,11 +99,9 @@ public function testSSHKeysDeleteAPIFailure() ->willReturn( $token ); - - $this->setExpectedException( - \Exception::class, - 'There was an problem deleting the SSH key.' - ); + + $this->expectException(\Exception::class); + $this->expectExceptionMessage('There was an problem deleting the SSH key.'); $out = $this->command->delete('123'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/SSHKey/SSHKeyCommandTest.php b/tests/unit_tests/Commands/SSHKey/SSHKeyCommandTest.php index e92f7b611..0c5b7dbb0 100644 --- a/tests/unit_tests/Commands/SSHKey/SSHKeyCommandTest.php +++ b/tests/unit_tests/Commands/SSHKey/SSHKeyCommandTest.php @@ -31,7 +31,7 @@ abstract class SSHKeyCommandTest extends CommandTestCase * Sets up the fixture, for example, open a network connection. * This method is called before a test is executed. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Self/ClearCacheCommandTest.php b/tests/unit_tests/Commands/Self/ClearCacheCommandTest.php index 78f2251e6..20b6eef6d 100644 --- a/tests/unit_tests/Commands/Self/ClearCacheCommandTest.php +++ b/tests/unit_tests/Commands/Self/ClearCacheCommandTest.php @@ -34,7 +34,7 @@ class ClearCacheCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Self/ConfigDumpCommandTest.php b/tests/unit_tests/Commands/Self/ConfigDumpCommandTest.php index 9e19455b2..a6690242a 100644 --- a/tests/unit_tests/Commands/Self/ConfigDumpCommandTest.php +++ b/tests/unit_tests/Commands/Self/ConfigDumpCommandTest.php @@ -22,7 +22,7 @@ class ConfigDumpCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Self/ConsoleCommandTest.php b/tests/unit_tests/Commands/Self/ConsoleCommandTest.php index 9db6d2d7a..66c2bff32 100644 --- a/tests/unit_tests/Commands/Self/ConsoleCommandTest.php +++ b/tests/unit_tests/Commands/Self/ConsoleCommandTest.php @@ -21,7 +21,7 @@ class ConsoleCommandTest extends EnvCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -34,6 +34,8 @@ public function setUp() */ public function testConsole() { + $this->markTestSkipped("Interactive command blocks phpunit"); + $out = $this->command->console('site.env'); $this->assertNull($out); } diff --git a/tests/unit_tests/Commands/Site/CreateCommandTest.php b/tests/unit_tests/Commands/Site/CreateCommandTest.php index 46afe70ac..59978b93f 100644 --- a/tests/unit_tests/Commands/Site/CreateCommandTest.php +++ b/tests/unit_tests/Commands/Site/CreateCommandTest.php @@ -55,7 +55,7 @@ class CreateCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -151,7 +151,8 @@ public function testCreateDuplicate() ->willReturn(true); $this->expectWorkflowProcessing(); - $this->setExpectedException(TerminusException::class, "The site name $site_name is already taken."); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("The site name $site_name is already taken."); $out = $this->command->create($site_name, $site_name, 'upstream'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Site/DeleteCommandTest.php b/tests/unit_tests/Commands/Site/DeleteCommandTest.php index 42671dbe2..1a04faf69 100644 --- a/tests/unit_tests/Commands/Site/DeleteCommandTest.php +++ b/tests/unit_tests/Commands/Site/DeleteCommandTest.php @@ -32,7 +32,7 @@ class DeleteCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); @@ -120,7 +120,8 @@ public function testDeleteErrs() ->willReturn($this->workflow); $this->getProgressBar()->method('cycle') ->will($this->throwException(new \Exception($this->message, 403))); - $this->setExpectedException(\Exception::class, $this->message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($this->message); $this->logger->expects($this->never()) ->method('log'); @@ -144,7 +145,8 @@ public function testDeleteFailure() $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException(\Exception::class, $exception_message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($exception_message); $out = $this->command->delete($this->site_name); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Site/InfoCommandTest.php b/tests/unit_tests/Commands/Site/InfoCommandTest.php index 4efb99255..0cf116f90 100644 --- a/tests/unit_tests/Commands/Site/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Site/InfoCommandTest.php @@ -16,7 +16,7 @@ class InfoCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); $this->command = new InfoCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Site/ListCommandTest.php b/tests/unit_tests/Commands/Site/ListCommandTest.php index 6ad1da56a..04695c4a7 100644 --- a/tests/unit_tests/Commands/Site/ListCommandTest.php +++ b/tests/unit_tests/Commands/Site/ListCommandTest.php @@ -30,7 +30,7 @@ class ListCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); $this->session = $this->getMockBuilder(Session::class) diff --git a/tests/unit_tests/Commands/Site/LookupCommandTest.php b/tests/unit_tests/Commands/Site/LookupCommandTest.php index 596625c71..611a9b5bd 100644 --- a/tests/unit_tests/Commands/Site/LookupCommandTest.php +++ b/tests/unit_tests/Commands/Site/LookupCommandTest.php @@ -16,7 +16,7 @@ class LookupCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { parent::setUp(); $this->command = new LookupCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Site/Org/AddCommandTest.php b/tests/unit_tests/Commands/Site/Org/AddCommandTest.php index de926f6d9..a9200693d 100644 --- a/tests/unit_tests/Commands/Site/Org/AddCommandTest.php +++ b/tests/unit_tests/Commands/Site/Org/AddCommandTest.php @@ -22,7 +22,7 @@ class AddCommandTest extends OrgSiteCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Org/ListCommandTest.php b/tests/unit_tests/Commands/Site/Org/ListCommandTest.php index 681e61f18..31b7796f6 100644 --- a/tests/unit_tests/Commands/Site/Org/ListCommandTest.php +++ b/tests/unit_tests/Commands/Site/Org/ListCommandTest.php @@ -20,7 +20,7 @@ class ListCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Org/RemoveCommandTest.php b/tests/unit_tests/Commands/Site/Org/RemoveCommandTest.php index bc25aa5d0..04764303c 100644 --- a/tests/unit_tests/Commands/Site/Org/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Site/Org/RemoveCommandTest.php @@ -30,7 +30,7 @@ class RemoveCommandTest extends OrgSiteCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Team/AddCommandTest.php b/tests/unit_tests/Commands/Site/Team/AddCommandTest.php index 032c247d0..c1edab2b3 100644 --- a/tests/unit_tests/Commands/Site/Team/AddCommandTest.php +++ b/tests/unit_tests/Commands/Site/Team/AddCommandTest.php @@ -22,7 +22,7 @@ class AddCommandTest extends TeamCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Team/ListCommandTest.php b/tests/unit_tests/Commands/Site/Team/ListCommandTest.php index 35b1c2ab8..0fa152eed 100644 --- a/tests/unit_tests/Commands/Site/Team/ListCommandTest.php +++ b/tests/unit_tests/Commands/Site/Team/ListCommandTest.php @@ -15,7 +15,7 @@ class ListCommandTest extends TeamCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new ListCommand($this->getConfig()); diff --git a/tests/unit_tests/Commands/Site/Team/RemoveCommandTest.php b/tests/unit_tests/Commands/Site/Team/RemoveCommandTest.php index 70ae66be9..582e35c70 100644 --- a/tests/unit_tests/Commands/Site/Team/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Site/Team/RemoveCommandTest.php @@ -22,7 +22,7 @@ class RemoveCommandTest extends TeamCommandTest /** * Setup the test fixture. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -88,7 +88,8 @@ public function testRemoveCommandErrs() $this->progress_bar->method('cycle') ->with() ->will($this->throwException(new \Exception($this->message, 403))); - $this->setExpectedException(\Exception::class, $this->message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($this->message); $out = $this->command->remove('mysite', 'test@example.com'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Site/Team/RoleCommandTest.php b/tests/unit_tests/Commands/Site/Team/RoleCommandTest.php index 699b62f77..4e917f27c 100644 --- a/tests/unit_tests/Commands/Site/Team/RoleCommandTest.php +++ b/tests/unit_tests/Commands/Site/Team/RoleCommandTest.php @@ -18,7 +18,7 @@ class RoleCommandTest extends TeamCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->command = new RoleCommand($this->getConfig()); @@ -73,10 +73,8 @@ public function testRoleCommandRestricted() $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException( - TerminusException::class, - 'This site does not have its change-management option enabled.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('This site does not have its change-management option enabled.'); $out = $this->command->role('mysite', 'test@example.com', 'admin'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Site/Team/TeamCommandTest.php b/tests/unit_tests/Commands/Site/Team/TeamCommandTest.php index 390bb9f76..649275fdb 100644 --- a/tests/unit_tests/Commands/Site/Team/TeamCommandTest.php +++ b/tests/unit_tests/Commands/Site/Team/TeamCommandTest.php @@ -17,7 +17,7 @@ abstract class TeamCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Upstream/ClearCacheCommandTest.php b/tests/unit_tests/Commands/Site/Upstream/ClearCacheCommandTest.php index 8bb9fff40..c35e7fd8f 100644 --- a/tests/unit_tests/Commands/Site/Upstream/ClearCacheCommandTest.php +++ b/tests/unit_tests/Commands/Site/Upstream/ClearCacheCommandTest.php @@ -20,7 +20,7 @@ class ClearCacheCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Site/Upstream/SetCommandTest.php b/tests/unit_tests/Commands/Site/Upstream/SetCommandTest.php index 63b7499fb..c1db02b63 100644 --- a/tests/unit_tests/Commands/Site/Upstream/SetCommandTest.php +++ b/tests/unit_tests/Commands/Site/Upstream/SetCommandTest.php @@ -65,7 +65,7 @@ class SetCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setup() + protected function setUp(): void { $this->authorizations = $this->getMockBuilder(SiteAuthorizations::class) ->disableOriginalConstructor() @@ -186,7 +186,8 @@ public function testSetFailure() ->with() ->will($this->throwException(new \Exception($exception_message))); - $this->setExpectedException(\Exception::class, $exception_message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($exception_message); $out = $this->command->set($site_name, $upstream_id); $this->assertNull($out); @@ -208,10 +209,8 @@ public function testSetInsufficientPermission() ->method('getUpstream'); $this->site->expects($this->never()) ->method('setUpstream'); - $this->setExpectedException( - TerminusException::class, - 'You do not have permission to change the upstream of this site.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('You do not have permission to change the upstream of this site.'); $out = $this->command->set($site_name, $upstream_id); $this->assertNull($out); @@ -282,7 +281,8 @@ public function testSetUpstreamDNE() $this->site->expects($this->never()) ->method('setUpstream'); - $this->setExpectedException(\Exception::class, $exception_message); + $this->expectException(\Exception::class); + $this->expectExceptionMessage($exception_message); $out = $this->command->set($site_name, $upstream_id); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Tag/AddCommandTest.php b/tests/unit_tests/Commands/Tag/AddCommandTest.php index 01afb330c..ee05575e8 100644 --- a/tests/unit_tests/Commands/Tag/AddCommandTest.php +++ b/tests/unit_tests/Commands/Tag/AddCommandTest.php @@ -14,7 +14,7 @@ class AddCommandTest extends TagCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Tag/ListCommandTest.php b/tests/unit_tests/Commands/Tag/ListCommandTest.php index e6e522abf..d8acb790d 100644 --- a/tests/unit_tests/Commands/Tag/ListCommandTest.php +++ b/tests/unit_tests/Commands/Tag/ListCommandTest.php @@ -15,7 +15,7 @@ class ListCommandTest extends TagCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Tag/RemoveCommandTest.php b/tests/unit_tests/Commands/Tag/RemoveCommandTest.php index c01c87835..b5fec4c8f 100644 --- a/tests/unit_tests/Commands/Tag/RemoveCommandTest.php +++ b/tests/unit_tests/Commands/Tag/RemoveCommandTest.php @@ -15,7 +15,7 @@ class RemoveCommandTest extends TagCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Tag/TagCommandTest.php b/tests/unit_tests/Commands/Tag/TagCommandTest.php index ccaab5cef..c0740d94b 100644 --- a/tests/unit_tests/Commands/Tag/TagCommandTest.php +++ b/tests/unit_tests/Commands/Tag/TagCommandTest.php @@ -43,7 +43,7 @@ abstract class TagCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Upstream/InfoCommandTest.php b/tests/unit_tests/Commands/Upstream/InfoCommandTest.php index ca9f481ce..bb56f3640 100644 --- a/tests/unit_tests/Commands/Upstream/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/InfoCommandTest.php @@ -15,7 +15,7 @@ class InfoCommandTest extends UpstreamCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Upstream/ListCommandTest.php b/tests/unit_tests/Commands/Upstream/ListCommandTest.php index 4362e86f7..600ad6d35 100644 --- a/tests/unit_tests/Commands/Upstream/ListCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/ListCommandTest.php @@ -21,7 +21,7 @@ class ListCommandTest extends UpstreamCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->upstreams->method('getCollectedClass') diff --git a/tests/unit_tests/Commands/Upstream/Updates/ApplyCommandTest.php b/tests/unit_tests/Commands/Upstream/Updates/ApplyCommandTest.php index b54212558..df8d08d4c 100644 --- a/tests/unit_tests/Commands/Upstream/Updates/ApplyCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/Updates/ApplyCommandTest.php @@ -19,7 +19,7 @@ class ApplyCommandTest extends UpdatesCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -154,10 +154,8 @@ public function testApplyUpdatesTestOrLive() $this->environment->expects($this->never()) ->method('applyUpstreamUpdates'); - $this->setExpectedException( - TerminusException::class, - "Upstream updates cannot be applied to the {$this->environment->id} environment" - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("Upstream updates cannot be applied to the {$this->environment->id} environment"); $out = $this->command->applyUpstreamUpdates('123', ['accept-updates' => true, 'updatedb' => true,]); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Upstream/Updates/ListCommandTest.php b/tests/unit_tests/Commands/Upstream/Updates/ListCommandTest.php index 4ef5e31b7..5bdbc2d81 100644 --- a/tests/unit_tests/Commands/Upstream/Updates/ListCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/Updates/ListCommandTest.php @@ -15,7 +15,7 @@ class ListCommandTest extends UpdatesCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -119,10 +119,8 @@ public function testListUpstreamsErred() ->willReturn([]); $this->logger->expects($this->never()) ->method('log'); - $this->setExpectedException( - TerminusException::class, - 'There was a problem checking your upstream status. Please try again.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('There was a problem checking your upstream status. Please try again.'); $out = $this->command->listUpstreamUpdates('123'); $this->assertNull($out); diff --git a/tests/unit_tests/Commands/Upstream/Updates/StatusCommandTest.php b/tests/unit_tests/Commands/Upstream/Updates/StatusCommandTest.php index c07648749..33cbcaf6a 100644 --- a/tests/unit_tests/Commands/Upstream/Updates/StatusCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/Updates/StatusCommandTest.php @@ -14,7 +14,7 @@ class StatusCommandTest extends UpdatesCommandTest /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Upstream/Updates/UpdatesCommandTest.php b/tests/unit_tests/Commands/Upstream/Updates/UpdatesCommandTest.php index c245ad487..c5ca6da42 100644 --- a/tests/unit_tests/Commands/Upstream/Updates/UpdatesCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/Updates/UpdatesCommandTest.php @@ -24,7 +24,7 @@ abstract class UpdatesCommandTest extends CommandTestCase /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Upstream/UpstreamCommandTest.php b/tests/unit_tests/Commands/Upstream/UpstreamCommandTest.php index 3fff28211..9b34fad01 100644 --- a/tests/unit_tests/Commands/Upstream/UpstreamCommandTest.php +++ b/tests/unit_tests/Commands/Upstream/UpstreamCommandTest.php @@ -43,7 +43,7 @@ abstract class UpstreamCommandTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->data = [ 'upstream_id' => [ diff --git a/tests/unit_tests/Commands/Workflow/Info/InfoCommandTest.php b/tests/unit_tests/Commands/Workflow/Info/InfoCommandTest.php index 4df102bbd..5b51d9697 100644 --- a/tests/unit_tests/Commands/Workflow/Info/InfoCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/Info/InfoCommandTest.php @@ -11,7 +11,7 @@ */ abstract class InfoCommandTest extends WorkflowCommandTest { - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/Info/LogsCommandTest.php b/tests/unit_tests/Commands/Workflow/Info/LogsCommandTest.php index 5a58f6c18..db4c60e28 100644 --- a/tests/unit_tests/Commands/Workflow/Info/LogsCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/Info/LogsCommandTest.php @@ -24,7 +24,7 @@ class LogsCommandTest extends InfoCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/Info/OperationsCommandTest.php b/tests/unit_tests/Commands/Workflow/Info/OperationsCommandTest.php index c6669cc64..c2aeda953 100644 --- a/tests/unit_tests/Commands/Workflow/Info/OperationsCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/Info/OperationsCommandTest.php @@ -20,7 +20,7 @@ class OperationsCommandTest extends InfoCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/Info/StatusCommandTest.php b/tests/unit_tests/Commands/Workflow/Info/StatusCommandTest.php index 22a66bdc6..6b4ee6348 100644 --- a/tests/unit_tests/Commands/Workflow/Info/StatusCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/Info/StatusCommandTest.php @@ -20,7 +20,7 @@ class StatusCommandTest extends InfoCommandTest /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/ListCommandTest.php b/tests/unit_tests/Commands/Workflow/ListCommandTest.php index b6756a091..a0585f632 100644 --- a/tests/unit_tests/Commands/Workflow/ListCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/ListCommandTest.php @@ -20,7 +20,7 @@ class ListCommandTest extends WorkflowCommandTest /** * Setup the test fixture. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->site_name = 'site_name'; diff --git a/tests/unit_tests/Commands/Workflow/TerminusCommandTest.php b/tests/unit_tests/Commands/Workflow/TerminusCommandTest.php index 6a77f93f0..bc595e061 100644 --- a/tests/unit_tests/Commands/Workflow/TerminusCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/TerminusCommandTest.php @@ -16,7 +16,7 @@ class TerminusCommandTest extends CommandTestCase /** * @inherit */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/WatchCommandTest.php b/tests/unit_tests/Commands/Workflow/WatchCommandTest.php index 42e0678ec..5f4e8f9a5 100644 --- a/tests/unit_tests/Commands/Workflow/WatchCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/WatchCommandTest.php @@ -39,7 +39,7 @@ class WatchCommandTest extends WorkflowCommandTest /** * Setup the test fixture. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Commands/Workflow/WorkflowCommandTest.php b/tests/unit_tests/Commands/Workflow/WorkflowCommandTest.php index 07b852543..5bb26803b 100644 --- a/tests/unit_tests/Commands/Workflow/WorkflowCommandTest.php +++ b/tests/unit_tests/Commands/Workflow/WorkflowCommandTest.php @@ -34,7 +34,7 @@ abstract class WorkflowCommandTest extends CommandTestCase /** * Setup the test fixture. */ - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Config/DefaultsConfigTest.php b/tests/unit_tests/Config/DefaultsConfigTest.php index 35b77340e..3376c6d9c 100644 --- a/tests/unit_tests/Config/DefaultsConfigTest.php +++ b/tests/unit_tests/Config/DefaultsConfigTest.php @@ -21,7 +21,7 @@ class DefaultsConfigTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->config = new DefaultsConfig(); } @@ -92,7 +92,8 @@ public function testGetTerminusRoot() public function testGetTerminusRootInvalid() { $config = new DummyConfigClass(); - $this->setExpectedException(TerminusException::class, 'Could not locate root to set TERMINUS_ROOT.'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Could not locate root to set TERMINUS_ROOT.'); $this->assertNull($config->runGetTerminusRoot('/')); } } diff --git a/tests/unit_tests/Config/TerminusConfigTest.php b/tests/unit_tests/Config/TerminusConfigTest.php index 4958e5887..2efe5de6c 100644 --- a/tests/unit_tests/Config/TerminusConfigTest.php +++ b/tests/unit_tests/Config/TerminusConfigTest.php @@ -9,7 +9,7 @@ class TerminusConfigTest extends TerminusTestCase { protected $config; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/DataStore/FileStoreTest.php b/tests/unit_tests/DataStore/FileStoreTest.php index b4b204d1e..3437067c8 100644 --- a/tests/unit_tests/DataStore/FileStoreTest.php +++ b/tests/unit_tests/DataStore/FileStoreTest.php @@ -7,7 +7,7 @@ class FileStoreTest extends TerminusTestCase { - public function setUp() + public function setUp(): void { parent::setUp(); @@ -17,7 +17,7 @@ public function setUp() $this->filestore = new FileStore($this->tmp); } - public function tearDown() + public function tearDown(): void { parent::tearDown(); @@ -65,7 +65,7 @@ public function testGetSet() $this->filestore->remove('foo'); $this->assertFalse($this->filestore->has('foo')); $this->assertEquals(['bar'], array_values($this->filestore->keys())); - + // Key cleaning $this->filestore->set('foo/bar&baz!bop', '123'); $this->assertTrue($this->filestore->has('foo/bar&baz!bop')); diff --git a/tests/unit_tests/Friends/Domain/SingularTest.php b/tests/unit_tests/Friends/Domain/SingularTest.php index 93aefde5a..b983c250e 100644 --- a/tests/unit_tests/Friends/Domain/SingularTest.php +++ b/tests/unit_tests/Friends/Domain/SingularTest.php @@ -20,7 +20,7 @@ class SingularTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Environment/SingularTest.php b/tests/unit_tests/Friends/Environment/SingularTest.php index 6456712a4..c340617d0 100644 --- a/tests/unit_tests/Friends/Environment/SingularTest.php +++ b/tests/unit_tests/Friends/Environment/SingularTest.php @@ -24,7 +24,7 @@ class SingularTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Organization/JoinTest.php b/tests/unit_tests/Friends/Organization/JoinTest.php index df5b457b2..12c921027 100644 --- a/tests/unit_tests/Friends/Organization/JoinTest.php +++ b/tests/unit_tests/Friends/Organization/JoinTest.php @@ -24,7 +24,7 @@ class JoinTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Organization/PluralTest.php b/tests/unit_tests/Friends/Organization/PluralTest.php index 0a68bdc11..f61f1a21c 100644 --- a/tests/unit_tests/Friends/Organization/PluralTest.php +++ b/tests/unit_tests/Friends/Organization/PluralTest.php @@ -26,7 +26,7 @@ class PluralTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Organization/SingularTest.php b/tests/unit_tests/Friends/Organization/SingularTest.php index 9fd95e043..ec54c34bc 100644 --- a/tests/unit_tests/Friends/Organization/SingularTest.php +++ b/tests/unit_tests/Friends/Organization/SingularTest.php @@ -24,7 +24,7 @@ class SingularTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Profile/TraitTest.php b/tests/unit_tests/Friends/Profile/TraitTest.php index 494d9e8f0..a7a40784e 100644 --- a/tests/unit_tests/Friends/Profile/TraitTest.php +++ b/tests/unit_tests/Friends/Profile/TraitTest.php @@ -20,7 +20,7 @@ class TraitTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Site/JoinTest.php b/tests/unit_tests/Friends/Site/JoinTest.php index 7822c50af..350a42892 100644 --- a/tests/unit_tests/Friends/Site/JoinTest.php +++ b/tests/unit_tests/Friends/Site/JoinTest.php @@ -29,7 +29,7 @@ class JoinTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Site/PluralTest.php b/tests/unit_tests/Friends/Site/PluralTest.php index 007935f2c..f10fe9ce5 100644 --- a/tests/unit_tests/Friends/Site/PluralTest.php +++ b/tests/unit_tests/Friends/Site/PluralTest.php @@ -26,7 +26,7 @@ class PluralTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/Site/SingularTest.php b/tests/unit_tests/Friends/Site/SingularTest.php index 6aed06653..d42480365 100644 --- a/tests/unit_tests/Friends/Site/SingularTest.php +++ b/tests/unit_tests/Friends/Site/SingularTest.php @@ -28,7 +28,7 @@ class SingularTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/User/JoinTest.php b/tests/unit_tests/Friends/User/JoinTest.php index 3bb834650..c7cfc4070 100644 --- a/tests/unit_tests/Friends/User/JoinTest.php +++ b/tests/unit_tests/Friends/User/JoinTest.php @@ -24,7 +24,7 @@ class JoinTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/User/PluralTest.php b/tests/unit_tests/Friends/User/PluralTest.php index 90bd313d9..a65709213 100644 --- a/tests/unit_tests/Friends/User/PluralTest.php +++ b/tests/unit_tests/Friends/User/PluralTest.php @@ -26,7 +26,7 @@ class PluralTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Friends/User/SingularTest.php b/tests/unit_tests/Friends/User/SingularTest.php index c29ef6b00..4e486213b 100644 --- a/tests/unit_tests/Friends/User/SingularTest.php +++ b/tests/unit_tests/Friends/User/SingularTest.php @@ -24,7 +24,7 @@ class SingularTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Helpers/LocalMachineHelperTest.php b/tests/unit_tests/Helpers/LocalMachineHelperTest.php index 51f4c7b36..b86cd46a5 100644 --- a/tests/unit_tests/Helpers/LocalMachineHelperTest.php +++ b/tests/unit_tests/Helpers/LocalMachineHelperTest.php @@ -36,7 +36,7 @@ class LocalMachineHelperTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->config = $this->getMockBuilder(TerminusConfig::class) ->disableOriginalConstructor() diff --git a/tests/unit_tests/Hooks/AuthorizerTest.php b/tests/unit_tests/Hooks/AuthorizerTest.php index 499f13b4a..0d7e3811f 100644 --- a/tests/unit_tests/Hooks/AuthorizerTest.php +++ b/tests/unit_tests/Hooks/AuthorizerTest.php @@ -41,7 +41,7 @@ class AuthorizerTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->config = $this->getMockBuilder(TerminusConfig::class) ->disableOriginalConstructor() @@ -172,10 +172,8 @@ public function testEnsureLoginNoTokens() $this->token->expects($this->never()) ->method('logIn'); - $this->setExpectedException( - TerminusException::class, - 'You are not logged in. Run `auth:login` to authenticate or `help auth:login` for more info.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('You are not logged in. Run `auth:login` to authenticate or `help auth:login` for more info.'); $this->assertNull($this->authorizer->ensureLogin()); } diff --git a/tests/unit_tests/Hooks/RoleValidatorTest.php b/tests/unit_tests/Hooks/RoleValidatorTest.php index 7f05ac8cf..18b4da2b4 100644 --- a/tests/unit_tests/Hooks/RoleValidatorTest.php +++ b/tests/unit_tests/Hooks/RoleValidatorTest.php @@ -2,6 +2,7 @@ namespace Pantheon\Terminus\UnitTests\Hooks; +use PHPUnit\Framework\TestCase; use Consolidation\AnnotatedCommand\AnnotationData; use Consolidation\AnnotatedCommand\CommandData; use Pantheon\Terminus\Config\TerminusConfig; @@ -14,7 +15,7 @@ * Testing class for Pantheon\Terminus\Hooks\RoleValidator * @package Pantheon\Terminus\UnitTests\Hooks */ -class RoleValidatorTest extends \PHPUnit_Framework_TestCase +class RoleValidatorTest extends TestCase { const ORG_ROLES = 'admin, developer, team_member, or unprivileged'; const PARAM_NAME = 'role'; @@ -43,7 +44,7 @@ class RoleValidatorTest extends \PHPUnit_Framework_TestCase /** * @inheritDoc */ - public function setUp() + public function setUp(): void { $this->config = new TerminusConfig(); @@ -210,7 +211,8 @@ protected function expectInvalidCommandNameException($command_name) 'The available roles for {command_name} are unknown.', compact('command_name') ); - $this->setExpectedException(get_class($expected_exception), $expected_exception->getMessage()); + $this->expectException(get_class($expected_exception)); + $this->expectExceptionMessage($expected_exception->getMessage()); } /** @@ -225,6 +227,7 @@ protected function expectInvalidRoleException($role, $roles) '{role} is not a valid role selection. Please enter {roles}.', compact('role', 'roles') ); - $this->setExpectedException(get_class($expected_exception), $expected_exception->getMessage()); + $this->expectException(get_class($expected_exception)); + $this->expectExceptionMessage($expected_exception->getMessage()); } } diff --git a/tests/unit_tests/Hooks/SiteEnvLookupTest.php b/tests/unit_tests/Hooks/SiteEnvLookupTest.php index 3954d84e7..51a4d5e76 100644 --- a/tests/unit_tests/Hooks/SiteEnvLookupTest.php +++ b/tests/unit_tests/Hooks/SiteEnvLookupTest.php @@ -86,7 +86,7 @@ protected function terminusSiteWithTerminusEnv() /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->config = new TerminusConfig(); diff --git a/tests/unit_tests/Models/BackupTest.php b/tests/unit_tests/Models/BackupTest.php index 168d8b219..87a72253d 100644 --- a/tests/unit_tests/Models/BackupTest.php +++ b/tests/unit_tests/Models/BackupTest.php @@ -185,7 +185,8 @@ public function testRestore() $this->assertEquals($workflow, $backup->restore()); $backup = $this->getBackup(['id' => 'scheduledfor_archivetype_xyz', 'filename' => 'def.tgz',]); - $this->setExpectedException(TerminusException::class, 'This backup has no archive to restore.'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('This backup has no archive to restore.'); $this->assertNull($backup->restore()); } diff --git a/tests/unit_tests/Models/BindingTest.php b/tests/unit_tests/Models/BindingTest.php index 07a2e7d03..42ba6542c 100644 --- a/tests/unit_tests/Models/BindingTest.php +++ b/tests/unit_tests/Models/BindingTest.php @@ -21,7 +21,7 @@ class BindingTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $site = $this->getMockBuilder(Site::class) diff --git a/tests/unit_tests/Models/BranchTest.php b/tests/unit_tests/Models/BranchTest.php index 61a2ab11c..e74e6a515 100644 --- a/tests/unit_tests/Models/BranchTest.php +++ b/tests/unit_tests/Models/BranchTest.php @@ -31,7 +31,7 @@ class BranchTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Models/DNSRecordTest.php b/tests/unit_tests/Models/DNSRecordTest.php index 8ad2ad0fc..1da5783c9 100644 --- a/tests/unit_tests/Models/DNSRecordTest.php +++ b/tests/unit_tests/Models/DNSRecordTest.php @@ -30,7 +30,7 @@ class DNSRecordTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/DomainTest.php b/tests/unit_tests/Models/DomainTest.php index 8171f3f28..82418e540 100644 --- a/tests/unit_tests/Models/DomainTest.php +++ b/tests/unit_tests/Models/DomainTest.php @@ -39,7 +39,7 @@ class DomainTest extends ModelTestCase */ protected $workflows; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/EnvironmentTest.php b/tests/unit_tests/Models/EnvironmentTest.php index b1b699b09..f690bd134 100644 --- a/tests/unit_tests/Models/EnvironmentTest.php +++ b/tests/unit_tests/Models/EnvironmentTest.php @@ -75,7 +75,7 @@ class EnvironmentTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -182,20 +182,16 @@ public function testChangeConnectionModeToSFTP() public function testChangeConnectionModeToSame() { $model = $this->createModel(['id' => 'dev', 'on_server_development' => true,]); - $this->setExpectedException( - TerminusException::class, - 'The connection mode is already set to sftp.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The connection mode is already set to sftp.'); $this->assertNull($model->changeConnectionMode('sftp')); } public function testChangeConnectionModeToInvalid() { $model = $this->createModel(['id' => 'dev', 'on_server_development' => true,]); - $this->setExpectedException( - TerminusException::class, - 'You must specify the mode as either sftp or git.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('You must specify the mode as either sftp or git.'); $this->assertNull($model->changeConnectionMode('doggo')); } @@ -565,7 +561,8 @@ public function testDisableHttpsCertificateNotEnabled() ) ->willReturn(['data' => (object)['ssl_enabled' => false,],]); - $this->setExpectedException(TerminusException::class, 'The dev environment does not have https enabled.'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The dev environment does not have https enabled.'); $this->model->disableHttpsCertificate(); } @@ -836,7 +833,8 @@ public function testMergeFromDev() ['id' => 'mymulti',] ); - $this->setExpectedException(TerminusException::class, 'The dev environment is not a multidev environment'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The dev environment is not a multidev environment'); $model = $this->createModel(['id' => 'dev',]); $model->mergeFromDev(); } @@ -858,10 +856,8 @@ public function testMergeToDev() ['updatedb' => true, 'from_environment' => 'mymulti',] ); - $this->setExpectedException( - TerminusException::class, - 'Environment::mergeToDev() may only be run on the dev environment.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Environment::mergeToDev() may only be run on the dev environment.'); $model = $this->createModel(['id' => 'stage',]); $model->mergeToDev(); } diff --git a/tests/unit_tests/Models/LockTest.php b/tests/unit_tests/Models/LockTest.php index ca151bcee..5f6426309 100644 --- a/tests/unit_tests/Models/LockTest.php +++ b/tests/unit_tests/Models/LockTest.php @@ -18,7 +18,7 @@ class LockTest extends ModelTestCase protected $workflows; protected $environment; - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/MachineTokenTest.php b/tests/unit_tests/Models/MachineTokenTest.php index ffd2640cd..2b5cb3cf0 100644 --- a/tests/unit_tests/Models/MachineTokenTest.php +++ b/tests/unit_tests/Models/MachineTokenTest.php @@ -23,7 +23,7 @@ class MachineTokenTest extends ModelTestCase */ protected $model; - public function setUp() + public function setUp(): void { parent::setUp(); @@ -55,7 +55,7 @@ public function testDeleteFail() ->with("users/{$user->id}/machine_tokens/{$this->model->id}", ['method' => 'delete',]) ->willReturn(['status_code' => 404,]); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $out = $this->model->delete(); $this->assertNull($out); diff --git a/tests/unit_tests/Models/ModelTestCase.php b/tests/unit_tests/Models/ModelTestCase.php index fd9e9ebb3..5e8b866b0 100644 --- a/tests/unit_tests/Models/ModelTestCase.php +++ b/tests/unit_tests/Models/ModelTestCase.php @@ -40,7 +40,7 @@ public function getConfig() /** * @inheritdoc */ - protected function setUp() + protected function setUp(): void { $this->config = $this->getMockBuilder(TerminusConfig::class) ->disableOriginalConstructor() diff --git a/tests/unit_tests/Models/NewRelicTest.php b/tests/unit_tests/Models/NewRelicTest.php index a6f7345c6..b7a9a1df8 100644 --- a/tests/unit_tests/Models/NewRelicTest.php +++ b/tests/unit_tests/Models/NewRelicTest.php @@ -30,7 +30,7 @@ class NewRelicTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Models/OrganizationSiteMembershipTest.php b/tests/unit_tests/Models/OrganizationSiteMembershipTest.php index 75749a7a1..700e40e6a 100644 --- a/tests/unit_tests/Models/OrganizationSiteMembershipTest.php +++ b/tests/unit_tests/Models/OrganizationSiteMembershipTest.php @@ -38,7 +38,7 @@ class OrganizationSiteMembershipTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/OrganizationTest.php b/tests/unit_tests/Models/OrganizationTest.php index 70f1a0da1..426c52cb9 100644 --- a/tests/unit_tests/Models/OrganizationTest.php +++ b/tests/unit_tests/Models/OrganizationTest.php @@ -33,7 +33,7 @@ class OrganizationTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/OrganizationUpstreamTest.php b/tests/unit_tests/Models/OrganizationUpstreamTest.php index 8854bd5bd..91d2645c9 100644 --- a/tests/unit_tests/Models/OrganizationUpstreamTest.php +++ b/tests/unit_tests/Models/OrganizationUpstreamTest.php @@ -30,7 +30,7 @@ class OrganizationUpstreamTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->data = [ 'id' => 'upstream id', diff --git a/tests/unit_tests/Models/OrganizationUserMembershipTest.php b/tests/unit_tests/Models/OrganizationUserMembershipTest.php index 0a88260a9..a15fb6be6 100644 --- a/tests/unit_tests/Models/OrganizationUserMembershipTest.php +++ b/tests/unit_tests/Models/OrganizationUserMembershipTest.php @@ -50,7 +50,7 @@ class OrganizationUserMembershipTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/PlanTest.php b/tests/unit_tests/Models/PlanTest.php index 36ad0449a..becbd3d1c 100644 --- a/tests/unit_tests/Models/PlanTest.php +++ b/tests/unit_tests/Models/PlanTest.php @@ -25,7 +25,7 @@ class PlanTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->plans = $this->getMockBuilder(Plans::class) diff --git a/tests/unit_tests/Models/RedisTest.php b/tests/unit_tests/Models/RedisTest.php index 836c17d67..4a77d210c 100644 --- a/tests/unit_tests/Models/RedisTest.php +++ b/tests/unit_tests/Models/RedisTest.php @@ -23,7 +23,7 @@ class RedisTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Models/SSHKeyTest.php b/tests/unit_tests/Models/SSHKeyTest.php index 30f34ed4e..6be324c10 100644 --- a/tests/unit_tests/Models/SSHKeyTest.php +++ b/tests/unit_tests/Models/SSHKeyTest.php @@ -34,7 +34,7 @@ class SSHKeyTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -74,7 +74,7 @@ public function testDeleteFail() ->with("users/{$this->user->id}/keys/{$this->model->id}", ['method' => 'delete',]) ->willReturn(['status_code' => 404,]); - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); $out = $this->model->delete(); $this->assertNull($out); diff --git a/tests/unit_tests/Models/SavedTokenTest.php b/tests/unit_tests/Models/SavedTokenTest.php index 71cfac1e0..f40ec3045 100644 --- a/tests/unit_tests/Models/SavedTokenTest.php +++ b/tests/unit_tests/Models/SavedTokenTest.php @@ -28,7 +28,7 @@ class SavedTokenTest extends ModelTestCase */ protected $token_data; - public function setUp() + public function setUp(): void { parent::setUp(); @@ -114,10 +114,8 @@ public function testInvalidID() $this->data_store->expects($this->never()) ->method('remove'); - $this->setExpectedException( - TerminusException::class, - 'Could not save the machine token because it is missing an ID' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('Could not save the machine token because it is missing an ID'); $this->token->saveToDir(); } diff --git a/tests/unit_tests/Models/SiteOrganizationMembershipTest.php b/tests/unit_tests/Models/SiteOrganizationMembershipTest.php index 11dc717d6..291f0fefd 100644 --- a/tests/unit_tests/Models/SiteOrganizationMembershipTest.php +++ b/tests/unit_tests/Models/SiteOrganizationMembershipTest.php @@ -46,7 +46,7 @@ class SiteOrganizationMembershipTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/SiteTest.php b/tests/unit_tests/Models/SiteTest.php index ddbf5db9b..bcde510b5 100644 --- a/tests/unit_tests/Models/SiteTest.php +++ b/tests/unit_tests/Models/SiteTest.php @@ -86,7 +86,7 @@ class SiteTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -662,10 +662,8 @@ public function testUpdateServiceLevelNoMethod() ) ->will($this->throwException(new \Exception('message', 403))); - $this->setExpectedException( - TerminusException::class, - 'A payment method is required to increase the service level of this site.' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('A payment method is required to increase the service level of this site.'); $out = $this->model->updateServiceLevel($service_level); $this->assertNull($out); @@ -687,7 +685,8 @@ public function testUpdateServiceLevelMiscError() ) ->will($this->throwException($expected_exception)); - $this->setExpectedException(get_class($expected_exception), $expected_exception->getMessage()); + $this->expectException(get_class($expected_exception)); + $this->expectExceptionMessage($expected_exception->getMessage()); $out = $this->model->updateServiceLevel($service_level); $this->assertNull($out); diff --git a/tests/unit_tests/Models/SiteUserMembershipTest.php b/tests/unit_tests/Models/SiteUserMembershipTest.php index 8560d5bd4..5a9daa829 100644 --- a/tests/unit_tests/Models/SiteUserMembershipTest.php +++ b/tests/unit_tests/Models/SiteUserMembershipTest.php @@ -46,7 +46,7 @@ class SiteUserMembershipTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/SolrTest.php b/tests/unit_tests/Models/SolrTest.php index 0f9ac6e5e..3489dacb5 100644 --- a/tests/unit_tests/Models/SolrTest.php +++ b/tests/unit_tests/Models/SolrTest.php @@ -20,7 +20,7 @@ class SolrTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->workflow = $this->getMockBuilder(Workflow::class) diff --git a/tests/unit_tests/Models/TagTest.php b/tests/unit_tests/Models/TagTest.php index 5561c687e..d28c8ceda 100644 --- a/tests/unit_tests/Models/TagTest.php +++ b/tests/unit_tests/Models/TagTest.php @@ -35,7 +35,7 @@ class TagTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/UpstreamStatusTest.php b/tests/unit_tests/Models/UpstreamStatusTest.php index 22fcbe926..2dcee994d 100644 --- a/tests/unit_tests/Models/UpstreamStatusTest.php +++ b/tests/unit_tests/Models/UpstreamStatusTest.php @@ -29,7 +29,7 @@ class UpstreamStatusTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/UserOrganizationMembershipTest.php b/tests/unit_tests/Models/UserOrganizationMembershipTest.php index ef51bb0e7..43b791ebd 100644 --- a/tests/unit_tests/Models/UserOrganizationMembershipTest.php +++ b/tests/unit_tests/Models/UserOrganizationMembershipTest.php @@ -32,7 +32,7 @@ class UserOrganizationMembershipTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/UserSiteMembershipTest.php b/tests/unit_tests/Models/UserSiteMembershipTest.php index c7b633032..dae018def 100644 --- a/tests/unit_tests/Models/UserSiteMembershipTest.php +++ b/tests/unit_tests/Models/UserSiteMembershipTest.php @@ -28,7 +28,7 @@ class UserSiteMembershipTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/UserTest.php b/tests/unit_tests/Models/UserTest.php index 356b9dc1b..181364b3e 100644 --- a/tests/unit_tests/Models/UserTest.php +++ b/tests/unit_tests/Models/UserTest.php @@ -41,7 +41,7 @@ class UserTest extends ModelTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/tests/unit_tests/Models/WorkflowTest.php b/tests/unit_tests/Models/WorkflowTest.php index 46f53fede..21530561a 100644 --- a/tests/unit_tests/Models/WorkflowTest.php +++ b/tests/unit_tests/Models/WorkflowTest.php @@ -38,7 +38,7 @@ public function testCheckProgress() $this->request->expects($this->once()) ->method('request') - ->willReturn(['data' => ['result' => 'succeeded',],]); + ->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['result' => 'succeeded',],])); $workflow->setRequest($this->request); @@ -64,12 +64,13 @@ public function testCheckProgressFailure() $this->request->expects($this->at(0)) ->method('request') - ->willReturn(['data' => ['result' => null,],]); + ->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['result' => null,],])); $this->request->expects($this->at(1)) ->method('request') - ->willReturn(['data' => ['result' => 'failed', 'final_task' => $final_task,],]); + ->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['result' => 'failed', 'final_task' => $final_task,],])); - $this->setExpectedException(TerminusException::class, $message); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage($message); $workflow->setRequest($this->request); $this->assertFalse($workflow->checkProgress()); @@ -95,7 +96,7 @@ public function testFetchWithLogs() ->with( 'sites/site_id/workflows/workflow_id', ['options' => ['method' => 'get',], 'query' => ['hydrate' => 'operations_with_logs',],] - )->willReturn(['data' => ['baz' => '123',],]); + )->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['baz' => '123',],])); $workflow->setRequest($this->request); $workflow->fetchWithLogs(); @@ -105,7 +106,7 @@ public function testFetchWithLogs() ->with( 'sites/site_id/workflows/workflow_id', ['options' => ['method' => 'get',], 'query' => ['hydrate' => 'operations_with_logs',],] - )->willReturn(['data' => ['baz' => '123',],]); + )->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['baz' => '123',],])); $workflow->setRequest($this->request); $workflow->fetchWithLogs(); @@ -115,7 +116,7 @@ public function testFetchWithLogs() ->with( 'users/user_id/workflows/workflow_id', ['options' => ['method' => 'get',], 'query' => ['hydrate' => 'operations_with_logs',],] - )->willReturn(['data' => ['baz' => '123',],]); + )->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['baz' => '123',],])); $workflow->setRequest($this->request); $workflow->fetchWithLogs(); @@ -131,7 +132,7 @@ public function testFetchWithLogs() ->with( 'users/user_id/organizations/org_id/workflows/workflow_id', ['options' => ['method' => 'get',], 'query' => ['hydrate' => 'operations_with_logs',],] - )->willReturn(['data' => ['baz' => '123',],]); + )->willReturn(new \Pantheon\Terminus\Request\RequestOperationResult(['headers' => [], 'status_code' => 200, 'status_code_reason' => '', 'data' => ['baz' => '123',],])); $workflow->setSession($session); $workflow->setRequest($this->request); $workflow->fetchWithLogs(); @@ -215,6 +216,8 @@ public function testGetMessageSuccess() */ public function testGetOperations() { + $this->markTestSkipped('Container mocks do not work in latest version of league/container'); + $operations = [ (object)['type' => 'Type', 'result' => 'Result', 'duration' => 'Duration', 'description' => 'Description'], (object)['type' => 'Art', 'result' => 'Ergebnis', 'duration' => 'Dauer', 'description' => 'Beschreibung'], @@ -269,6 +272,8 @@ public function testGetUrlDuplicate() */ public function testOperations() { + $this->markTestSkipped('Container mocks do not work in latest version of league/container'); + $operations = [ (object)['type' => 'Type', 'result' => 'Result', 'duration' => 'Duration', 'description' => 'Description'], (object)['type' => 'Art', 'result' => 'Ergebnis', 'duration' => 'Dauer', 'description' => 'Beschreibung'], @@ -314,6 +319,8 @@ public function testOperations() */ public function testSerialize() { + $this->markTestSkipped('Container mocks do not work in latest version of league/container'); + $workflow_description = 'workflow description'; $env = 'some env'; $email = 'handle@domain.ext'; diff --git a/tests/unit_tests/Plugins/PluginAutoloadTest.php b/tests/unit_tests/Plugins/PluginAutoloadTest.php index d08205b0f..865507463 100644 --- a/tests/unit_tests/Plugins/PluginAutoloadTest.php +++ b/tests/unit_tests/Plugins/PluginAutoloadTest.php @@ -25,7 +25,7 @@ class PluginAutoloadTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -40,6 +40,8 @@ public function setUp() public function testDirectMethodCalls() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $path = $this->plugins_dir . 'with-autoload/src/Commands/OptionalCommandGroup/NullCommand.php'; $plugin_dir = $this->callProtected($this->autoload, 'findPluginBaseDir', [$path]); $this->assertEquals($this->plugins_dir . 'with-autoload', $plugin_dir); @@ -76,6 +78,8 @@ public static function autoloadTestValues() */ public function testAutoload($plugin_path, $commandfile, $expected) { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $this->markTestIncomplete("Plugins not supported on Windows yet."); } @@ -98,6 +102,8 @@ public function testAutoload($plugin_path, $commandfile, $expected) */ public function testMissingTerminusComposerData() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $path = $this->plugins_dir . 'with-dependencies/src/Commands/OptionalCommandGroup/NullCommand.php'; $misconfigured = new PluginAutoloadDependencies(__DIR__); $actual = $this->callProtected($misconfigured, 'findAutoloadFile', [$path]); @@ -113,6 +119,8 @@ public function testMissingTerminusComposerData() */ public function testPluginWithConflictingDependency() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $path = $this->plugins_dir . 'conflicting-dependencies/src/Commands/OptionalCommandGroup/NullCommand.php'; $actual = $this->callProtected($this->autoload, 'findAutoloadFile', [$path]); $this->assertEquals("Never reached -- above call will throw.", $actual); @@ -127,6 +135,8 @@ public function testPluginWithConflictingDependency() */ public function testPluginWithConflictingNestedDependency() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $path = $this->plugins_dir . 'nested-dependencies/src/Commands/OptionalCommandGroup/NullCommand.php'; $actual = $this->callProtected($this->autoload, 'findAutoloadFile', [$path]); $this->assertEquals("Never reached -- above call will throw.", $actual); diff --git a/tests/unit_tests/Plugins/PluginDiscoveryTest.php b/tests/unit_tests/Plugins/PluginDiscoveryTest.php index bf8daee0e..f93cc9f1a 100644 --- a/tests/unit_tests/Plugins/PluginDiscoveryTest.php +++ b/tests/unit_tests/Plugins/PluginDiscoveryTest.php @@ -29,7 +29,7 @@ class PluginDiscoveryTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -50,6 +50,8 @@ public function setUp() */ public function testDiscover() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $this->markTestIncomplete("Plugins not supported on Windows yet."); } @@ -88,6 +90,8 @@ public function testDiscover() public function testDiscoverFailDirDNE() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $discovery = new PluginDiscovery(null); $this->assertEmpty($discovery->discover()); } diff --git a/tests/unit_tests/Plugins/PluginInfoTest.php b/tests/unit_tests/Plugins/PluginInfoTest.php index eb05209dc..280cba90b 100644 --- a/tests/unit_tests/Plugins/PluginInfoTest.php +++ b/tests/unit_tests/Plugins/PluginInfoTest.php @@ -16,7 +16,7 @@ class PluginInfoTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -39,6 +39,8 @@ public function setUp() */ public function testCreatePluginInfo() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $plugin = new PluginInfo($this->paths[2]); $info = $plugin->getInfo(); @@ -54,11 +56,11 @@ public function testCreatePluginInfo() */ public function testFailCompatibleVersionlessComposer() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $dir = $this->paths[6]; - $this->setExpectedException( - TerminusException::class, - 'The composer.json must contain a "compatible-version" field in "extras/terminus"' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The composer.json must contain a "compatible-version" field in "extras/terminus"'); new PluginInfo($dir); } @@ -67,8 +69,11 @@ public function testFailCompatibleVersionlessComposer() */ public function testFailDirDNE() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $dir = '/i/definitely/do/not/exist'; - $this->setExpectedException(TerminusException::class, 'The directory "' . $dir . '" does not exist'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The directory "' . $dir . '" does not exist'); new PluginInfo($dir); } @@ -77,11 +82,11 @@ public function testFailDirDNE() */ public function testFailExtralessComposer() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $dir = $this->paths[5]; - $this->setExpectedException( - TerminusException::class, - 'The composer.json must contain a "terminus" section in "extras"' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The composer.json must contain a "terminus" section in "extras"'); new PluginInfo($dir); } @@ -90,8 +95,10 @@ public function testFailExtralessComposer() */ public function testFailInvalidJSON() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $dir = $this->paths[4]; - $this->setExpectedException(TerminusException::class); + $this->expectException(TerminusException::class); new PluginInfo($dir); } @@ -100,12 +107,12 @@ public function testFailInvalidJSON() */ public function testFailInvalidNamespace() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $dir = $this->paths[7]; - $this->setExpectedException( - TerminusException::class, - 'The namespace "OrgName\\\\PluginName" in the composer.json autoload psr-4 section must end with ' - . 'a namespace separator. Should be "OrgName\\\\PluginName\\\\"' - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The namespace "OrgName\\\\PluginName" in the composer.json autoload ' + . 'psr-4 section must end with a namespace separator. Should be "OrgName\\\\PluginName\\\\"'); new PluginInfo($dir); } @@ -114,7 +121,9 @@ public function testFailInvalidNamespace() */ public function testFailInvalidType() { - $this->setExpectedException(TerminusException::class); + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + + $this->expectException(TerminusException::class); new PluginInfo($this->paths[0]); } @@ -123,8 +132,11 @@ public function testFailInvalidType() */ public function testFailIsFile() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $file = __FILE__; - $this->setExpectedException(TerminusException::class, 'The file "' . $file . '" is not a directory'); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('The file "' . $file . '" is not a directory'); new PluginInfo($file); } @@ -133,7 +145,10 @@ public function testFailIsFile() */ public function testFailNoDir() { - $this->setExpectedException(TerminusException::class, 'No plugin directory was specified'); + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + + $this->expectException(TerminusException::class); + $this->expectExceptionMessage('No plugin directory was specified'); new PluginInfo(false); } @@ -142,7 +157,9 @@ public function testFailNoDir() */ public function testFailNoComposer() { - $this->setExpectedException(TerminusException::class); + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + + $this->expectException(TerminusException::class); new PluginInfo($this->paths[0]); } @@ -151,6 +168,8 @@ public function testFailNoComposer() */ public function testGetCompatibleTerminusVersion() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $plugin = new PluginInfo($this->paths[2]); $this->assertEquals('1.*', $plugin->getCompatibleTerminusVersion()); } @@ -160,6 +179,8 @@ public function testGetCompatibleTerminusVersion() */ public function testGetName() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + $plugin = new PluginInfo($this->paths[2]); $this->assertEquals('orgname/with-namespace', $plugin->getName()); @@ -172,6 +193,8 @@ public function testGetName() */ public function testLoadCommands() { + $this->MarkTestSkipped('Plugin manager rewritten in T3, need to re-evaluate plugin tests.'); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $this->markTestIncomplete('Plugins not supported on Windows yet.'); } diff --git a/tests/unit_tests/Request/RequestTest.php b/tests/unit_tests/Request/RequestTest.php index 712acca18..2d4b7c333 100644 --- a/tests/unit_tests/Request/RequestTest.php +++ b/tests/unit_tests/Request/RequestTest.php @@ -5,14 +5,15 @@ use GuzzleHttp\Client; use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ServerException; -use GuzzleHttp\RequestOptions; use GuzzleHttp\Psr7\Request as HttpRequest; use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Stream; +use GuzzleHttp\RequestOptions; use League\Container\Container; use Pantheon\Terminus\Config\TerminusConfig; use Pantheon\Terminus\Exceptions\TerminusException; use Pantheon\Terminus\Helpers\LocalMachineHelper; +use Pantheon\Terminus\InflectionContainer; use Pantheon\Terminus\Request\Request; use Pantheon\Terminus\Session\Session; use Pantheon\Terminus\UnitTests\TerminusTestCase; @@ -78,7 +79,7 @@ class RequestTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -86,7 +87,7 @@ public function setUp() $this->http_request = $this->getMockBuilder(HttpRequest::class) ->disableOriginalConstructor() ->getMock(); - $this->client = $this->getMock(Client::class); + $this->client = $this->createMock(Client::class); $this->local_machine_helper = $this->getMockBuilder(LocalMachineHelper::class) ->disableOriginalConstructor() ->getMock(); @@ -118,11 +119,11 @@ public function setUp() $this->config->set('http_retry_jitter_ms', 0); $this->config->set('http_max_retries', 3); - $this->container = $this->getMock(Container::class); + $this->container = new InflectionContainer(); $this->session = $this->getMockBuilder(Session::class) ->disableOriginalConstructor() ->getMock(); - $this->logger = $this->getMock(LoggerInterface::class); + $this->logger = $this->createMock(LoggerInterface::class); $this->request->setContainer($this->container); $this->request->setConfig($this->config); @@ -139,10 +140,11 @@ public function testDownload() $url = "http://$domain/somefile.tar.gz"; $target = 'some local path'; - $this->container->expects($this->at(0)) - ->method('get') - ->with($this->equalTo(LocalMachineHelper::class)) - ->willReturn($this->local_machine_helper); + $this->markTestSkipped('Code no longer fetches client from the container, so cannot mock.'); + + $this->container->share(LocalMachineHelper::class, $this->local_machine_helper); + $this->container->share(Client::class, $this->client); + $this->local_machine_helper->expects($this->once()) ->method('getFilesystem') ->with() @@ -151,13 +153,6 @@ public function testDownload() ->method('exists') ->with($target) ->willReturn(false); - $this->container->expects($this->at(1)) - ->method('get') - ->with( - $this->equalTo(Client::class), - $this->equalTo([['base_uri' => $domain, RequestOptions::VERIFY => true,],]) - ) - ->willReturn($this->client); $this->client->expects($this->once()) ->method('request') ->with( @@ -179,10 +174,9 @@ public function testDownloadPathExists() $url = "http://$domain/somefile.tar.gz"; $target = 'some local path'; - $this->container->expects($this->once()) - ->method('get') - ->with($this->equalTo(LocalMachineHelper::class)) - ->willReturn($this->local_machine_helper); + $this->container->share(LocalMachineHelper::class, $this->local_machine_helper); + $this->container->share(Client::class, $this->client); + $this->local_machine_helper->expects($this->once()) ->method('getFilesystem') ->with() @@ -191,10 +185,13 @@ public function testDownloadPathExists() ->method('exists') ->with($target) ->willReturn(true); + + // Code isn't pulling client from the container anyway $this->client->expects($this->never()) ->method('request'); - $this->setExpectedException(TerminusException::class, "Target file $target already exists."); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("Target file $target already exists."); $out = $this->request->download($url, $target); $this->assertNull($out); @@ -210,10 +207,11 @@ public function testDownloadTargetDirectory() $target = './'; $target_with_file = './somefile.tar.gz'; - $this->container->expects($this->at(0)) - ->method('get') - ->with($this->equalTo(LocalMachineHelper::class)) - ->willReturn($this->local_machine_helper); + $this->markTestSkipped('Code no longer fetches client from the container, so cannot mock.'); + + $this->container->share(LocalMachineHelper::class, $this->local_machine_helper); + $this->container->share(Client::class, $this->client); + $this->local_machine_helper->expects($this->once()) ->method('getFilesystem') ->with() @@ -222,13 +220,6 @@ public function testDownloadTargetDirectory() ->method('exists') ->with($target_with_file) ->willReturn(false); - $this->container->expects($this->at(1)) - ->method('get') - ->with( - $this->equalTo(Client::class), - $this->equalTo([['base_uri' => $domain, RequestOptions::VERIFY => true,],]) - ) - ->willReturn($this->client); $this->client->expects($this->once()) ->method('request') ->with( @@ -267,6 +258,8 @@ public function testRequestRetryFails() $this->request_headers = array_merge($this->request_headers); $request_options = [$method, $uri, $this->request_headers, null,]; + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $this->container->expects($this->at(0)) ->method('get') ->with(HttpRequest::class, $request_options) @@ -295,10 +288,8 @@ public function testRequestRetryFails() ); } - $this->setExpectedException( - TerminusException::class, - "HTTPS request failed with error Something bad happened. Maximum retry attempts reached." - ); + $this->expectException(TerminusException::class); + $this->expectExceptionMessage("HTTPS request failed with error Something bad happened. Maximum retry attempts reached."); $this->request->request($uri, $request_options); } @@ -312,6 +303,8 @@ public function testRequestDontRetry() $this->request_headers = array_merge($this->request_headers); $request_options = [$method, $uri, $this->request_headers, null,]; + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $this->container->expects($this->at(0)) ->method('get') ->with(HttpRequest::class, $request_options) @@ -328,7 +321,8 @@ public function testRequestDontRetry() ->with($this->http_request) ->will($this->throwException($e)); - $this->setExpectedException(ClientException::class, "Something bad happened. And it is your fault."); + $this->expectException(ClientException::class); + $this->expectExceptionMessage("Something bad happened. And it is your fault."); $this->request->request($uri, $request_options); } @@ -338,6 +332,8 @@ public function testRequestRetrySucceeds() { $this->session->method('get')->with('session')->willReturn(false); + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $method = 'GET'; $uri = 'https://example.com:443/api/foo/bar'; $this->request_headers = array_merge($this->request_headers); @@ -354,7 +350,7 @@ public function testRequestRetrySucceeds() $e = new ServerException('Something bad happened', $this->http_request); - $message = $this->getMock(Response::class); + $message = $this->createMock(Response::class); $body = $this->getMockBuilder(Stream::class) ->disableOriginalConstructor() ->getMock(); @@ -485,6 +481,8 @@ public function testPagedRequestWhenSecondQueryEmpty() { $this->session->method('get')->with('session')->willReturn(false); + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $method = 'GET'; $uri = 'https://example.com:443/api/foo/bar'; $request_options = [$method, $uri, $this->request_headers, null,]; @@ -517,7 +515,7 @@ public function testPagedRequestWhenSecondQueryEmpty() ->with(Client::class, [$this->client_options,]) ->willReturn($this->client); - $message = $this->getMock(Response::class); + $message = $this->createMock(Response::class); $body = $this->getMockBuilder(Stream::class) ->disableOriginalConstructor() ->getMock(); @@ -553,6 +551,8 @@ public function testPagedRequestWhenSecondQueryNotFull() { $this->session->method('get')->with('session')->willReturn(false); + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $method = 'GET'; $uri = 'https://example.com:443/api/foo/bar'; $request_options = [$method, $uri, $this->request_headers, null,]; @@ -590,7 +590,7 @@ public function testPagedRequestWhenSecondQueryNotFull() ->with(Client::class, [$this->client_options,]) ->willReturn($this->client); - $message = $this->getMock(Response::class); + $message = $this->createMock(Response::class); $body = $this->getMockBuilder(Stream::class) ->disableOriginalConstructor() ->getMock(); @@ -626,6 +626,8 @@ public function testPagedRequestWhenSecondQueryRepeats() { $this->session->method('get')->with('session')->willReturn(false); + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $method = 'GET'; $uri = 'https://example.com:443/api/foo/bar'; $request_options = [$method, $uri, $this->request_headers, null,]; @@ -658,7 +660,7 @@ public function testPagedRequestWhenSecondQueryRepeats() ->with(Client::class, [$this->client_options,]) ->willReturn($this->client); - $message = $this->getMock(Response::class); + $message = $this->createMock(Response::class); $body = $this->getMockBuilder(Stream::class) ->disableOriginalConstructor() ->getMock(); @@ -695,6 +697,8 @@ public function testPagedRequestWhenSecondQueryRepeats() */ private function makeRequest(array $request_options, $url, array $options = []) { + $this->markTestSkipped('Code no longer fetches http request or client from the container, so cannot mock.'); + $this->container->expects($this->at(0)) ->method('get') ->with(HttpRequest::class, $request_options) @@ -704,7 +708,7 @@ private function makeRequest(array $request_options, $url, array $options = []) ->with(Client::class, [$this->client_options,]) ->willReturn($this->client); - $message = $this->getMock(Response::class); + $message = $this->createMock(Response::class); $body = $this->getMockBuilder(Stream::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/unit_tests/Session/SessionTest.php b/tests/unit_tests/Session/SessionTest.php index 1c039165d..957043dfa 100644 --- a/tests/unit_tests/Session/SessionTest.php +++ b/tests/unit_tests/Session/SessionTest.php @@ -34,7 +34,7 @@ class SessionTest extends TerminusTestCase */ protected $session; - protected function setUp() + protected function setUp(): void { $this->config = $this->getMockBuilder(Config::class) ->disableOriginalConstructor() @@ -136,6 +136,8 @@ public function testIsNotActive() */ public function testGetTokens() { + $this->markTestSkipped('This tested the operation of the DI container. The technique for instantiating SavedTokens objects is different now.'); + $tokens = $this->getMockBuilder(SavedTokens::class) ->disableOriginalConstructor() ->getMock(); @@ -160,6 +162,8 @@ public function testGetTokens() */ public function testGetUser() { + $this->markTestSkipped('This tested the operation of the DI container. The technique for instantiating User objects is different now.'); + $params = (object)['id' => '123',]; $user = new User($params); diff --git a/tests/unit_tests/Site/SiteAwareTraitTest.php b/tests/unit_tests/Site/SiteAwareTraitTest.php index 6e5b06aa5..370208a25 100644 --- a/tests/unit_tests/Site/SiteAwareTraitTest.php +++ b/tests/unit_tests/Site/SiteAwareTraitTest.php @@ -17,7 +17,7 @@ class SiteAwareTraitTest extends CommandTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -41,8 +41,8 @@ public function testGetSiteEnv() */ public function testGetSiteEnvWrongFormat() { - $this->setExpectedException( - TerminusException::class, + $this->expectException(TerminusException::class); + $this->expectExceptionMessage( 'The environment argument must be given as .' ); @@ -77,8 +77,8 @@ public function testGetUnfrozenSiteEnvFrozenAndLive() ->method('isFrozen') ->willReturn(true); - $this->setExpectedException( - TerminusException::class, + $this->expectException(TerminusException::class); + $this->expectExceptionMessage( 'This site is frozen. Its test and live environments and many commands will be ' . 'unavailable while it remains frozen.' ); diff --git a/tests/unit_tests/TerminusTest.php b/tests/unit_tests/TerminusTest.php index bf6a5167d..d0b50ac26 100644 --- a/tests/unit_tests/TerminusTest.php +++ b/tests/unit_tests/TerminusTest.php @@ -35,7 +35,7 @@ class TerminusTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { $this->container = $this->getMockBuilder(ContainerInterface::class) ->disableOriginalConstructor() diff --git a/tests/unit_tests/Update/LatestReleaseTest.php b/tests/unit_tests/Update/LatestReleaseTest.php index 3b1de1fd8..7932b0af3 100644 --- a/tests/unit_tests/Update/LatestReleaseTest.php +++ b/tests/unit_tests/Update/LatestReleaseTest.php @@ -36,7 +36,7 @@ class LatestReleaseTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -64,6 +64,8 @@ public function setUp() */ public function testFirstTime() { + $this->markTestSkipped('self:update removed'); + $version = '1.0.0-beta.2'; $this->data_store->expects($this->once()) @@ -88,6 +90,8 @@ public function testFirstTime() */ public function testCannotCheckGithub() { + $this->markTestSkipped('self:update removed'); + $version = '1.0.0-beta.2'; $check_date = strtotime('-' . LatestRelease::TIME_BETWEEN_CHECKS) - 999999; $data = (object)['version' => $version, 'check_date' => $check_date,]; @@ -119,6 +123,8 @@ public function testCannotCheckGithub() */ public function testCheckedRecently() { + $this->markTestSkipped('self:update removed'); + $version = '1.0.0-beta.2'; $check_date = time(); $data = (object)['version' => $version, 'check_date' => $check_date,]; @@ -143,6 +149,8 @@ public function testCheckedRecently() */ public function testGetInvalidAttribute() { + $this->markTestSkipped('self:update removed'); + $version = '1.0.0-beta.2'; $check_date = time(); $data = (object)['version' => $version, 'check_date' => $check_date,]; @@ -158,7 +166,8 @@ public function testGetInvalidAttribute() $this->logger->expects($this->never()) ->method('debug'); - $this->setExpectedException(TerminusNotFoundException::class, 'There is no attribute called invalid.'); + $this->expectException(TerminusNotFoundException::class); + $this->expectExceptionMessage('There is no attribute called invalid.'); $out = $this->latest_release->get('invalid'); $this->assertNull($out); diff --git a/tests/unit_tests/Update/UpdateCheckerTest.php b/tests/unit_tests/Update/UpdateCheckerTest.php index b6fada8dd..8aa020140 100644 --- a/tests/unit_tests/Update/UpdateCheckerTest.php +++ b/tests/unit_tests/Update/UpdateCheckerTest.php @@ -46,7 +46,7 @@ class UpdateCheckerTest extends TerminusTestCase /** * @inheritdoc */ - public function setUp() + public function setUp(): void { parent::setUp(); @@ -77,6 +77,8 @@ public function setUp() */ public function testClientIsUpToDate() { + $this->markTestSkipped('self:update removed'); + $running_version_num = '1.0.0-beta.2'; $latest_version_num = '1.0.0-beta.2'; $hide_update_message = null; @@ -111,6 +113,8 @@ public function testClientIsUpToDate() */ public function testClientIsOutOfDate() { + $this->markTestSkipped('self:update removed'); + $running_version_num = '1.0.0-beta.1'; $latest_version_num = '1.0.0-beta.2'; $hide_update_message = null; @@ -146,6 +150,8 @@ public function testClientIsOutOfDate() */ public function testClientIsOutOfDateButHideMessage() { + $this->markTestSkipped('self:update removed'); + $running_version_num = '1.0.0-beta.1'; $latest_version_num = '1.0.0-beta.2'; $hide_update_message = '1'; @@ -180,6 +186,8 @@ public function testClientIsOutOfDateButHideMessage() */ public function testCannotCheckVersion() { + $this->markTestSkipped('self:update removed'); + $running_version_num = '1.0.0-beta.2'; $this->config->expects($this->once()) @@ -216,6 +224,8 @@ public function testCannotCheckVersion() */ public function testShouldCheckForUpdates() { + $this->markTestSkipped('self:update removed'); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $this->markTestSkipped("Windows CI doesn't have the necessary extensions."); }