Bug 17600: Standardize our EXPORT_OK

[srvgit] / C4 / TmplTokenType.pm

diff --git a/C4/TmplTokenType.pm b/C4/TmplTokenType.pm
index f723d76..91bc40c 100644 (file)
--- a/C4/TmplTokenType.pm
+++ b/C4/TmplTokenType.pm
@@ -4,25 +4,22 @@ package C4::TmplTokenType;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 require Exporter;
 
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
 ###############################################################################
 
 =head1 NAME
@@ -38,27 +35,29 @@ The predefined constants are
 
 ###############################################################################
 
-$VERSION = 3.07.00.049;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(
-    &TEXT
-    &TEXT_PARAMETRIZED
-    &CDATA
-    &TAG
-    &DECL
-    &PI
-    &DIRECTIVE
-    &COMMENT
-    &UNKNOWN
-);
 
 ###############################################################################
 
 use vars qw( $_text $_text_parametrized $_cdata
     $_tag $_decl $_pi $_directive $_comment $_null $_unknown );
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
+
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT_OK = qw(
+      TEXT
+      TEXT_PARAMETRIZED
+      CDATA
+      TAG
+      DECL
+      PI
+      DIRECTIVE
+      COMMENT
+      UNKNOWN
+    );
+
     my $new = sub {
        my $this = 'C4::TmplTokenType';#shift;
        my $class = ref($this) || $this;
@@ -83,15 +82,15 @@ sub to_string {
     return $this->{'name'}
 }
 
-sub TEXT               () { $_text }
-sub TEXT_PARAMETRIZED  () { $_text_parametrized }
-sub CDATA              () { $_cdata }
-sub TAG                        () { $_tag }
-sub DECL               () { $_decl }
-sub PI                 () { $_pi }
-sub DIRECTIVE          () { $_directive }
-sub COMMENT            () { $_comment }
-sub UNKNOWN            () { $_unknown }
+sub TEXT              { $_text }
+sub TEXT_PARAMETRIZED { $_text_parametrized }
+sub CDATA             { $_cdata }
+sub TAG               { $_tag }
+sub DECL              { $_decl }
+sub PI                { $_pi }
+sub DIRECTIVE         { $_directive }
+sub COMMENT           { $_comment }
+sub UNKNOWN           { $_unknown }
 
 ###############################################################################