From 51085267456c9bd8d87e96d9d7dd4f99671d3035 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Tue, 31 Oct 2017 17:41:34 +0100
Subject: [PATCH] enforce proper capitalization
---
lib/IdPAccountManager/AuthenticationToken.pm | 16 ++++++++--------
...enticationtoken.pm => AuthenticationToken.pm} | 2 +-
.../Data/Authenticationtoken/Manager.pm | 15 ---------------
.../{Serviceprovider.pm => ServiceProvider.pm} | 2 +-
.../Data/Serviceprovider/Manager.pm | 15 ---------------
.../Data/{Testaccount.pm => TestAccount.pm} | 2 +-
.../Data/TestAccount/Manager.pm | 15 +++++++++++++++
.../Data/Testaccount/Manager.pm | 15 ---------------
lib/IdPAccountManager/ServiceProvider.pm | 10 +++++-----
lib/IdPAccountManager/TestAccount.pm | 16 ++++++++--------
10 files changed, 39 insertions(+), 69 deletions(-)
rename lib/IdPAccountManager/Data/{Authenticationtoken.pm => AuthenticationToken.pm} (92%)
delete mode 100644 lib/IdPAccountManager/Data/Authenticationtoken/Manager.pm
rename lib/IdPAccountManager/Data/{Serviceprovider.pm => ServiceProvider.pm} (90%)
delete mode 100644 lib/IdPAccountManager/Data/Serviceprovider/Manager.pm
rename lib/IdPAccountManager/Data/{Testaccount.pm => TestAccount.pm} (93%)
create mode 100644 lib/IdPAccountManager/Data/TestAccount/Manager.pm
delete mode 100644 lib/IdPAccountManager/Data/Testaccount/Manager.pm
diff --git a/lib/IdPAccountManager/AuthenticationToken.pm b/lib/IdPAccountManager/AuthenticationToken.pm
index 2262d7d..992cbda 100644
--- a/lib/IdPAccountManager/AuthenticationToken.pm
+++ b/lib/IdPAccountManager/AuthenticationToken.pm
@@ -7,8 +7,8 @@ package IdPAccountManager::AuthenticationToken;
use strict;
use warnings;
-use IdPAccountManager::Data::Authenticationtoken;
-use IdPAccountManager::Data::Authenticationtoken::Manager;
+use IdPAccountManager::Data::AuthenticationToken;
+use IdPAccountManager::Data::AuthenticationToken::Manager;
use Conf;
@@ -19,7 +19,7 @@ use Carp;
INIT {
## Set error mode to non fatal
- IdPAccountManager::Data::Authenticationtoken::Manager->error_mode('return');
+ IdPAccountManager::Data::AuthenticationToken::Manager->error_mode('return');
}
sub new {
@@ -30,13 +30,13 @@ sub new {
bless $self, $pkg;
- ## Object may be created either with a hashref as argument or an IdPAccountManager::Data::Authenticationtoken object
- ## Second case is usefull when fetching a set of IdPAccountManager::Data::Authenticationtoken via IdPAccountManager::Data::Authenticationtoken::Manager
- if (ref($_[0]) eq 'IdPAccountManager::Data::Authenticationtoken') {
+ ## Object may be created either with a hashref as argument or an IdPAccountManager::Data::AuthenticationToken object
+ ## Second case is usefull when fetching a set of IdPAccountManager::Data::AuthenticationToken via IdPAccountManager::Data::AuthenticationToken::Manager
+ if (ref($_[0]) eq 'IdPAccountManager::Data::AuthenticationToken') {
$self->{'persistent'} = $_[0];
} else {
$self->{'persistent'} =
- IdPAccountManager::Data::Authenticationtoken->new(%args);
+ IdPAccountManager::Data::AuthenticationToken->new(%args);
}
return $self;
@@ -114,7 +114,7 @@ sub list_authentication_tokens {
my %args = @_;
my $persistent_tokens =
- IdPAccountManager::Data::Authenticationtoken::Manager
+ IdPAccountManager::Data::AuthenticationToken::Manager
->get_authenticationtokens(%args);
my $authentication_tokens;
foreach my $persistent_token (@{$persistent_tokens}) {
diff --git a/lib/IdPAccountManager/Data/Authenticationtoken.pm b/lib/IdPAccountManager/Data/AuthenticationToken.pm
similarity index 92%
rename from lib/IdPAccountManager/Data/Authenticationtoken.pm
rename to lib/IdPAccountManager/Data/AuthenticationToken.pm
index 0efcac0..8c5c192 100644
--- a/lib/IdPAccountManager/Data/Authenticationtoken.pm
+++ b/lib/IdPAccountManager/Data/AuthenticationToken.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::Data::Authenticationtoken;
+package IdPAccountManager::Data::AuthenticationToken;
use strict;
use warnings;
diff --git a/lib/IdPAccountManager/Data/Authenticationtoken/Manager.pm b/lib/IdPAccountManager/Data/Authenticationtoken/Manager.pm
deleted file mode 100644
index 5b7563e..0000000
--- a/lib/IdPAccountManager/Data/Authenticationtoken/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::Data::Authenticationtoken::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::Data::Authenticationtoken;
-
-sub object_class { 'IdPAccountManager::Data::Authenticationtoken' }
-
-__PACKAGE__->make_manager_methods('authenticationtokens');
-
-1;
-
diff --git a/lib/IdPAccountManager/Data/Serviceprovider.pm b/lib/IdPAccountManager/Data/ServiceProvider.pm
similarity index 90%
rename from lib/IdPAccountManager/Data/Serviceprovider.pm
rename to lib/IdPAccountManager/Data/ServiceProvider.pm
index 5a1304b..209ac30 100644
--- a/lib/IdPAccountManager/Data/Serviceprovider.pm
+++ b/lib/IdPAccountManager/Data/ServiceProvider.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::Data::Serviceprovider;
+package IdPAccountManager::Data::ServiceProvider;
use strict;
use warnings;
diff --git a/lib/IdPAccountManager/Data/Serviceprovider/Manager.pm b/lib/IdPAccountManager/Data/Serviceprovider/Manager.pm
deleted file mode 100644
index 63f4734..0000000
--- a/lib/IdPAccountManager/Data/Serviceprovider/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::Data::Serviceprovider::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::Data::Serviceprovider;
-
-sub object_class { 'IdPAccountManager::Data::Serviceprovider' }
-
-__PACKAGE__->make_manager_methods('serviceproviders');
-
-1;
-
diff --git a/lib/IdPAccountManager/Data/Testaccount.pm b/lib/IdPAccountManager/Data/TestAccount.pm
similarity index 93%
rename from lib/IdPAccountManager/Data/Testaccount.pm
rename to lib/IdPAccountManager/Data/TestAccount.pm
index 9c8fe2e..2225523 100644
--- a/lib/IdPAccountManager/Data/Testaccount.pm
+++ b/lib/IdPAccountManager/Data/TestAccount.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::Data::Testaccount;
+package IdPAccountManager::Data::TestAccount;
use strict;
use warnings;
diff --git a/lib/IdPAccountManager/Data/TestAccount/Manager.pm b/lib/IdPAccountManager/Data/TestAccount/Manager.pm
new file mode 100644
index 0000000..4d96788
--- /dev/null
+++ b/lib/IdPAccountManager/Data/TestAccount/Manager.pm
@@ -0,0 +1,15 @@
+package IdPAccountManager::Data::TestAccount::Manager;
+
+use strict;
+use warnings;
+
+use base qw(Rose::DB::Object::Manager);
+
+use IdPAccountManager::Data::TestAccount;
+
+sub object_class { 'IdPAccountManager::Data::TestAccount' }
+
+__PACKAGE__->make_manager_methods('testaccounts');
+
+1;
+
diff --git a/lib/IdPAccountManager/Data/Testaccount/Manager.pm b/lib/IdPAccountManager/Data/Testaccount/Manager.pm
deleted file mode 100644
index fb4edcc..0000000
--- a/lib/IdPAccountManager/Data/Testaccount/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::Data::Testaccount::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::Data::Testaccount;
-
-sub object_class { 'IdPAccountManager::Data::Testaccount' }
-
-__PACKAGE__->make_manager_methods('testaccounts');
-
-1;
-
diff --git a/lib/IdPAccountManager/ServiceProvider.pm b/lib/IdPAccountManager/ServiceProvider.pm
index 37cf767..aafc696 100644
--- a/lib/IdPAccountManager/ServiceProvider.pm
+++ b/lib/IdPAccountManager/ServiceProvider.pm
@@ -7,10 +7,10 @@ package IdPAccountManager::ServiceProvider;
use strict;
use warnings;
-use base 'IdPAccountManager::Data::Serviceprovider';
+use base 'IdPAccountManager::Data::ServiceProvider';
-use IdPAccountManager::Data::Serviceprovider;
-use IdPAccountManager::Data::Serviceprovider::Manager;
+use IdPAccountManager::Data::ServiceProvider;
+use IdPAccountManager::Data::ServiceProvider::Manager;
use IdPAccountManager::Tools;
use Conf;
@@ -19,7 +19,7 @@ use Carp;
INIT {
## Set error mode to non fatal
- IdPAccountManager::Data::Serviceprovider::Manager->error_mode('return');
+ IdPAccountManager::Data::ServiceProvider::Manager->error_mode('return');
}
## Print the content of a test account
@@ -69,7 +69,7 @@ sub list_service_providers {
my %args = @_;
my $persistent_accounts =
- IdPAccountManager::Data::Serviceprovider::Manager->get_serviceproviders(
+ IdPAccountManager::Data::ServiceProvider::Manager->get_serviceproviders(
%args);
my $service_providers;
foreach my $persistent_sp (@{$persistent_accounts}) {
diff --git a/lib/IdPAccountManager/TestAccount.pm b/lib/IdPAccountManager/TestAccount.pm
index 60f6850..a586a98 100644
--- a/lib/IdPAccountManager/TestAccount.pm
+++ b/lib/IdPAccountManager/TestAccount.pm
@@ -7,8 +7,8 @@ package IdPAccountManager::TestAccount;
use strict;
use warnings;
-use IdPAccountManager::Data::Testaccount;
-use IdPAccountManager::Data::Testaccount::Manager;
+use IdPAccountManager::Data::TestAccount;
+use IdPAccountManager::Data::TestAccount::Manager;
use IdPAccountManager::Tools;
use Conf;
@@ -18,7 +18,7 @@ use Carp;
INIT {
## Set error mode to non fatal
- IdPAccountManager::Data::Testaccount::Manager->error_mode('return');
+ IdPAccountManager::Data::TestAccount::Manager->error_mode('return');
}
sub new {
@@ -29,13 +29,13 @@ sub new {
bless $self, $pkg;
- ## Object may be created either with a hashref as argument or an IdPAccountManager::Data::Testaccount object
- ## Second case is usefull when fetching a set of IdPAccountManager::Data::Testaccount via IdPAccountManager::Data::Testaccount::Manager
- if (ref($_[0]) eq 'IdPAccountManager::Data::Testaccount') {
+ ## Object may be created either with a hashref as argument or an IdPAccountManager::Data::TestAccount object
+ ## Second case is usefull when fetching a set of IdPAccountManager::Data::TestAccount via IdPAccountManager::Data::TestAccount::Manager
+ if (ref($_[0]) eq 'IdPAccountManager::Data::TestAccount') {
$self->{'persistent'} = $_[0];
} else {
$self->{'persistent'} =
- IdPAccountManager::Data::Testaccount->new(%args);
+ IdPAccountManager::Data::TestAccount->new(%args);
}
return $self;
@@ -103,7 +103,7 @@ sub list_test_accounts {
my %args = @_;
my $persistent_accounts =
- IdPAccountManager::Data::Testaccount::Manager->get_testaccounts(%args);
+ IdPAccountManager::Data::TestAccount::Manager->get_testaccounts(%args);
my $accounts;
foreach my $persistent_account (@{$persistent_accounts}) {
my $account = IdPAccountManager::TestAccount->new($persistent_account);
--
GitLab