Skip to content

Commit 573e452

Browse files
committed
Merge remote-tracking branch 'personal/branch-api-extraction' into branch-api-extraction
# Conflicts: # include/branch-overrides.inc # include/branches.inc # include/gpg-keys.inc # tests/Unit/Releases/LegacyReleaseHelpersTest.php
2 parents 6e20c66 + 1e85c70 commit 573e452

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

include/branch-overrides.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
return [
44
/* 3.0 is here because version_compare() can't handle the only version in
55
* $OLDRELEASES, and it saves another special case in
6-
* Branches::getBranchSecurityEOLDate(). */
6+
* get_branch_security_eol_date(). */
77
'3.0' => [
88
'security' => '2000-10-20',
99
],

include/branches.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function get_branch_release_date($branch): ?DateTime
338338
return isset($initial['date']) ? new DateTime($initial['date']) : null;
339339
}
340340

341-
#[Deprecated('Use Branches::getBranchSupportStatus')]
341+
#[Deprecated('Use Branches::getBranchSupportState')]
342342
function get_branch_support_state($branch) {
343343
$initial = get_branch_release_date($branch);
344344
$bug = get_branch_bug_eol_date($branch);

include/gpg-keys.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
use phpweb\Releases\Branches;
44

5+
require __DIR__ . '/branches.inc';
6+
57
// GPG keys used for signing releases.
68

79
function gpg_key_get(string $rm): ?string {

0 commit comments

Comments
 (0)