From cce5492c8a963f81cf33d94a418f0ea1dac49c8a Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 23 Sep 2014 14:49:15 +0000
Subject: [PATCH] BUG8446, QA Followup: Minor Code Tidies

---
 C4/Auth.pm                 |    2 +-
 C4/Auth_with_shibboleth.pm |    3 +--
 t/Auth_with_shibboleth.t   |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c0bd618..684faae 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -58,12 +58,12 @@ BEGIN {
     $shib        = C4::Context->config('useshibboleth') || 0;
     $caslogout   = C4::Context->preference('casLogout');
     require C4::Auth_with_cas;             # no import
-    require C4::Auth_with_shibboleth;
     if ($ldap) {
     require C4::Auth_with_ldap;
     import C4::Auth_with_ldap qw(checkpw_ldap);
     }
     if ($shib) {
+        require C4::Auth_with_shibboleth;
         import C4::Auth_with_shibboleth
           qw(shib_ok checkpw_shib logout_shib login_shib_url get_login_shib);
 
diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
index ec954cd..d2a4cdf 100644
--- a/C4/Auth_with_shibboleth.pm
+++ b/C4/Auth_with_shibboleth.pm
@@ -17,8 +17,7 @@ package C4::Auth_with_shibboleth;
 # 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;
+use Modern::Perl;
 
 use C4::Debug;
 use C4::Context;
diff --git a/t/Auth_with_shibboleth.t b/t/Auth_with_shibboleth.t
index f400989..bd627e2 100644
--- a/t/Auth_with_shibboleth.t
+++ b/t/Auth_with_shibboleth.t
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 #
-# This Koha test module is a stub!
 # Add more tests here!!!
 
 use Modern::Perl;
-- 
1.7.10.4