Bug 735196: Support "bugs.php.net" URLs in "See also" field

r=gerv a=LpSolit

diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index 03a5ab60831956f8cfe83fc136ca43c8b5ec42c3..52b6e61c3769446291516312424c78c3a1e6dc27 100644 (file)
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -14,6 +14,7 @@ use constant MORE_SUB_CLASSES => qw(
     Bugzilla::Extension::MoreBugUrl::Rietveld
     Bugzilla::Extension::MoreBugUrl::RT
     Bugzilla::Extension::MoreBugUrl::GetSatisfaction
+    Bugzilla::Extension::MoreBugUrl::PHP
 );
 
 # We need to update bug_see_also table because both

diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm
new file mode 100644 (file)
index 0000000..c8d4e16
--- /dev/null
+++ b/extensions/MoreBugUrl/lib/PHP.pm
@@ -0,0 +1,40 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::MoreBugUrl::PHP;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+    my ($class, $uri) = @_;
+
+    # PHP Bug URLs have only one form:
+    #   https://bugs.php.net/bug.php?id=1234
+    return ($uri->authority =~ /^bugs.php.net$/i
+            and $uri->path =~ m|/bug.php$|
+            and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
+}
+
+sub _check_value {
+    my $class = shift;
+
+    my $uri = $class->SUPER::_check_value(@_);
+
+    # PHP Bug URLs redirect to HTTPS, so just use the HTTPS scheme.
+    $uri->scheme('https');
+
+    # And remove any # part if there is one.
+    $uri->fragment(undef);
+
+    return $uri;
+}
+
+1;

diff --git a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
index 60d662034c4c965a6386b9acbf6bce132e3a45f7..7683e429946475f5c8d379ee2f2b328ac43b04a3 100644 (file)
--- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
+++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
@@ -10,3 +10,4 @@
 <li>An issue in a Rietveld installation.</li>
 <li>A ticket in an RT installation.</li>
 <li>A topic on getsatisfaction.com.</li>
+<li>A b[% %]ug on b[% %]ugs.php.net.</li>