From a8b1b5b29ae1a6a852f16f077a32e84615ddfb6b Mon Sep 17 00:00:00 2001 From: TravisCarden Date: Mon, 14 Dec 2020 16:25:44 -0500 Subject: [PATCH 1/3] Bumped version number. --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index 903cd9f2a..d95827c3d 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v3.1.1 +v3.1.2 From 381c7fd6a25813ea6e5821e6c3b9972b9237509b Mon Sep 17 00:00:00 2001 From: Travis Carden Date: Mon, 14 Dec 2020 16:41:09 -0500 Subject: [PATCH 2/3] Added workaround for "Call to undefined method ::getAnnotations()" error. (#120) --- src/Domain/Fixture/FixtureCreator.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Domain/Fixture/FixtureCreator.php b/src/Domain/Fixture/FixtureCreator.php index c26a1dd0d..eff0c69f0 100644 --- a/src/Domain/Fixture/FixtureCreator.php +++ b/src/Domain/Fixture/FixtureCreator.php @@ -264,6 +264,10 @@ private function fixDefaultDependencies(): void { $additions[] = 'phpspec/prophecy-phpunit:^2'; } + if ($this->shouldDowngradePhpunit()) { + $additions[] = 'phpunit/phpunit:9.4.3'; + } + // Require additional packages. $prefer_source = $this->options->preferSource(); $no_update = !$this->options->isBare(); @@ -316,6 +320,21 @@ private function shouldRequireProphecyPhpunit(): bool { return $required->matches($actual); } + /** + * Determines whether or not to downgrade PHPUnit. + * + * Workaround for "Call to undefined method ::getAnnotations()" error." + * + * @see https://www.drupal.org/project/drupal/issues/3186443 + * + * @return bool + * Returns TRUE if it should be downgraded, or FALSE if not. + */ + private function shouldDowngradePhpunit(): bool { + $version = $this->options->getCoreResolved(); + return Comparator::equalTo($version, '9.1.0.0'); + } + /** * Gets the list of unwanted packages. * From f995e0b0cd1aa382dc6d35c22ade78e106b6f954 Mon Sep 17 00:00:00 2001 From: TravisCarden Date: Mon, 14 Dec 2020 16:59:45 -0500 Subject: [PATCH 3/3] Updated changelog. --- docs/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 803d590f2..f91cc3554 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [v3.1.2](https://github.com/acquia/orca/tree/v3.1.2) (2020-12-14) + +[Full Changelog](https://github.com/acquia/orca/compare/v3.1.1...v3.1.2) + +**Fixed bugs:** + +- Add workaround for "Call to undefined method ::getAnnotations\(\)" error [\#120](https://github.com/acquia/orca/pull/120) ([TravisCarden](https://github.com/TravisCarden)) + ## [v3.1.1](https://github.com/acquia/orca/tree/v3.1.1) (2020-12-04) [Full Changelog](https://github.com/acquia/orca/compare/v3.1.0...v3.1.1)