From ed97989ca26840a8f406c392163f4b09b8eb1a5d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 14 Jul 2019 22:22:06 +0200 Subject: [PATCH] Revert "Remove deprecated bootstrap.php fallback" This reverts commit f8061bbca13b0cbaea418acedc03c008bbf8edcb. We will keep this fallback in place, to avoid unnecessary breakage of backwards compatibility for extension authors. Removal is planned for the final 0.1 release. --- src/Extension/Extension.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/Extension/Extension.php b/src/Extension/Extension.php index 521048836..a657c4e95 100644 --- a/src/Extension/Extension.php +++ b/src/Extension/Extension.php @@ -257,9 +257,9 @@ class Extension implements Arrayable private function getExtenders(): array { - $extenderFile = "{$this->path}/extend.php"; + $extenderFile = $this->getExtenderFile(); - if (! file_exists($extenderFile)) { + if (! $extenderFile) { return []; } @@ -285,6 +285,24 @@ class Extension implements Arrayable ); } + private function getExtenderFile(): ?string + { + $filename = "{$this->path}/extend.php"; + + if (file_exists($filename)) { + return $filename; + } + + // To give extension authors some time to migrate to the new extension + // format, we will also fallback to the old bootstrap.php name. Consider + // this feature deprecated. + $deprecatedFilename = "{$this->path}/bootstrap.php"; + + if (file_exists($deprecatedFilename)) { + return $deprecatedFilename; + } + } + /** * Tests whether the extension has assets. *