github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-12 09:12:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename extension's bootstrap.php to extend.php

Browse Source 
...while supporting the old name for a while.

Fixes #1556.
Refs #1557.
This commit is contained in:
Franz Liedke 2018-08-24 00:08:56 +02:00
parent 3a0e982df1
commit 4c8908c005
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Extension/Extension.php
View File

@ -113,22 +113,8 @@ class Extension implements Arrayable
public function extend(Container $app) public function extend(Container $app)
{ {
$bootstrapper = $this->getBootstrapperPath(); foreach ($this->getExtenders() as $extender) {
// If an extension has not yet switched to the new extend.php
if (! file_exists($bootstrapper)) {
return;
}
$extenders = require $bootstrapper;
if (! is_array($extenders)) {
$extenders = [$extenders];
}
$extenders = array_flatten($extenders);
foreach ($extenders as $extender) {
// If an extension has not yet switched to the new bootstrap.php
// format, it might return a function (or more of them). We wrap // format, it might return a function (or more of them). We wrap
// these in a Compat extender to enjoy an unique interface. // these in a Compat extender to enjoy an unique interface.
if ($extender instanceof \Closure || is_string($extender)) { if ($extender instanceof \Closure || is_string($extender)) {
@ -274,9 +260,39 @@ class Extension implements Arrayable
return $this->path; return $this->path;
} }
public function getBootstrapperPath() private function getExtenders(): array
{ {
return "{$this->path}/bootstrap.php"; $extenderFile = $this->getExtenderFile();
if (! $extenderFile) {
return [];
}
$extenders = require $extenderFile;
if (! is_array($extenders)) {
$extenders = [$extenders];
}
return array_flatten($extenders);
}
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;
}
} }
/** /**