[Rt-commit] rt branch, 3.8/perlcritic, updated. rt-3.8.10-163-g3a356e2
Thomas Sibley
trs at bestpractical.com
Fri Jul 22 16:32:39 EDT 2011
The branch, 3.8/perlcritic has been updated
via 3a356e291aaa3054522503cb68b82aac3eff5169 (commit)
via 94479bf647f518b1351252336f391bd748ef9817 (commit)
via f24ca5a4a44aff77b9c71a2993f159e6329fd6ba (commit)
via 500c3932d9d41a08ac00469f79e3fc080105b34e (commit)
via 754e54f5e793f23ac80abd0e8a399b1d7c723bc0 (commit)
via 1b9c3a0ab62dcc06e8a32be182ee173ac913ff37 (commit)
via 6f00ff4fc74c75428c463382ee3a1ce5ceec787c (commit)
via f5ce79774c461898963e9a8619f8476714a7d932 (commit)
via a1f259d83bab9a61973129557697dc44d8ac64c8 (commit)
via fb9f1a42b4fbc91d2f9c0f9e5a3f850b582c4be8 (commit)
via baca239fa7cbf44d8b3dc6b53c99b1a4b3df60a4 (commit)
via 32790dd7c493c7cfc9e13dced790729dfa1cb761 (commit)
via c2a62e0bcf6b2c9012bdd455bfb1e77f17e98844 (commit)
via e058576331f8582b55602fa1673453372d0e38d4 (commit)
via 13b9808a366842f91e39be8f2b17a1a577be236a (commit)
via c8b94cd3512f50c98473ff476a0956fbec2c9353 (commit)
via 898158b910cb1b52b453128269412c1ad27c8191 (commit)
via 009ac346808142bb15bbe18052959ee26aa25d8b (commit)
via 05a19321b051f1b359702dc89eb3636eb7b26bfd (commit)
via 6ea2dab669a04865058a6a84509f138f15c4c95a (commit)
via 496f1774944f6290a0d8c7123218d01d4095d51e (commit)
via fb7f10f18d612dc2b8a3a261e3d5e54991a753fd (commit)
via 7909a4cec0bee2d2c885f2f12702b585a265bdcc (commit)
via 39437cf15bf51ba0ebb7fbc46bfe1b0c3e243ed6 (commit)
via 8d8458331dbe6aaa88acdb4dbfd363cf48088389 (commit)
via f779371334c4c05fd924994455b7466d209b8fdf (commit)
via e579ecff187bfa0c10f3d1bdccc0d7021ed2f85c (commit)
via 2a52d3d6d74ebf78409184aa464afef2eb4b5510 (commit)
via 10449f4db8850ecbc710188ce12a86cf855aec89 (commit)
via ccabdca1691661b20c0c7a6f28b3a09d7a7b275f (commit)
via f2b03490af0fe59fe5a15524b1a9d5e71d761a22 (commit)
via 21b1a76d6a6d6a4b33f6d94b38891e90e9c1eb1c (commit)
via 59de14cca00123cae864653fa3f801933266cc39 (commit)
via 1f546a5267effbc4303d7822718f161af39a73e3 (commit)
via 52bff73055f9c50827437274d322df257b111a2d (commit)
via b1d29d010bb4b03f7ee7db275566945d7d9e6643 (commit)
via 0693d96e5726e772d6edb375f956097e258fb83d (commit)
via 569153f3e5c0f4335e3baa3bd11dda2717d7cefe (commit)
via 1ac2e5e907cf9408b0079b4fb4ba5cd819cb73c6 (commit)
via 5dc393a9b99c27e942830c5a031cc66720731ac1 (commit)
via 1092352eae418d29b85742db0f8b82600657921b (commit)
via cfddff073ede33d9318f345c3e9e17db45b8bd75 (commit)
via c9a9dbbd694ddb9383194f25d13c7da8155a72df (commit)
via 2118a149f29b44e9364fda234186eeaf2758a7a6 (commit)
via e492d103afbaa3f557c6190bc8ee9ec345d56bc6 (commit)
via 0449ec0c9b8ca3d7b7ebaef07ce7a2d43745d1e5 (commit)
via 17486c45d8411b4cbc01bb782c225eaf61e59778 (commit)
via ecba2dd81095e517653d387cf82738d90aebf588 (commit)
via d952c6dfebda93f608ae6c04a90c3685ef415a51 (commit)
via 16bbf6a971572095d2a75ddb10d3d87fddbce1f7 (commit)
via 73020770a87b95436beb675f92445c78b6011b7c (commit)
via a732527e128ee9c00e9001b25888f613b6b2cd3f (commit)
via a964bd8a923f7baeb1e4825e904c2a6e2b9b97e2 (commit)
via f4d4ef0d149fc0ab95bb2dd7107fb788975f5999 (commit)
via cf3c225816a520a646b9e821a3b7558b0a9140a5 (commit)
via 45f1040265a6ebe170c9c674f30517d3e270de1d (commit)
via 827d1b6ce971c628c39d997a1de306f079d01ccf (commit)
via 54c09430d2ed33537c1b94f218fa359b96f2d99a (commit)
via a984bde8a01b6dfd778106772ee4c0b9caa1cd45 (commit)
via c134f783af8bd383ad338661a0c6957f4947a6b9 (commit)
via f6d421d82fdebf87ff474c34e301d2c10f307e95 (commit)
via 0ed5d57e58822bff0423fa6b2f0d6a0553d695b1 (commit)
via c4ee4e25c468ad4ab497b970e83b7a9fe4284762 (commit)
via 1386549ca73d153d4ecc40a4b29acf09a17742cf (commit)
via 6df6dfc8245f1a11cab04421089e976cb5e0439b (commit)
via 066726cff24cc43849b0435df6e649b7ccb11dc2 (commit)
via 6cf18e2fab2fc44c1f6de64b0d5980ac6d24d188 (commit)
via 0714f325f320c7daf9b68dd13c1dcb25bef0a8ea (commit)
via d4e27a96b73d9c8c4ada0921eec54e8ec12e5f7a (commit)
via a6b2494f8379ce8825699b729d394afb13ba5209 (commit)
via ad4508f3e87f4faf97781cd54df499a25d1fe379 (commit)
via 5bf9e145ed8fa93095e9ac2b7d5f6a822250ab77 (commit)
via ced7d7c94e434e30d17f2559fcce0274093bef7b (commit)
via 885466edd708034370b17802afbcf33f727e5ac6 (commit)
via 890908d9e82b2d1ecab4fcf9ce772ebc237e8f0a (commit)
via 582076a44e97ccf6029fbdf270897259fc758d31 (commit)
via 43740a5d4c68d377a2f322847a518981253a9831 (commit)
via 342492a57e6082628a3485ebf48fdd698a46598e (commit)
via 58ee776ed434ac5c762d630e3b0c36b14f6915e4 (commit)
via 0737898e6f94dbaae69a151c48a165eb1880144c (commit)
via f251ac850313cc4023fc8eba84c3f4e268707e03 (commit)
via 601e49eaccb5a3126dc69e1e5e251e7713f55717 (commit)
via a1121325f34902c1dacffbcbb01aec17df0b9945 (commit)
via 4e76efa287d449c2229098c4d962c81019309d89 (commit)
via 4c217bfa1caa6703556c12d9a88ec75d4735a778 (commit)
via 157169c5d92034426b0710e3bbf985b2250a310d (commit)
via 8106c5ad7d27c3c7702529e1bf4977aade4f72f6 (commit)
via 50606310b0f2af49b030811032821b36cdf029cd (commit)
via d66ea69c4788189d9fbf2af846185f294786a897 (commit)
via 1742bc2c0da4dc0aefae57b52a969176c4907946 (commit)
via 383e514038c63d9086386ef9903f0b4a010ab368 (commit)
via 3cae6656ce9e4aadfe42221ff5fe19ecb4480668 (commit)
via cd5042967c26ee5606d576dc7f4eedcf448c1a08 (commit)
via ce06803a655eae181473e8ce23012430f1ad94e0 (commit)
via d11deb6c3e94110566541bc014233d8eef10f331 (commit)
via 58b4fa414839f457e724a3fcc7b4f11673ef4d82 (commit)
from 5bff45e96a2fac0cfbdaa9dc325dc2590eaa0ca4 (commit)
Summary of changes:
bin/rt-crontool.in | 3 +-
bin/rt.in | 16 ++++-
bin/standalone_httpd.in | 3 +
lib/RT.pm.in | 9 ++-
lib/RT/ACE.pm | 6 +-
lib/RT/ACE_Overlay.pm | 2 +-
lib/RT/ACL_Overlay.pm | 18 +++---
lib/RT/Action.pm | 2 +-
lib/RT/Action/Autoreply.pm | 5 +-
lib/RT/Action/CreateTickets.pm | 6 ++-
lib/RT/Action/EscalatePriority.pm | 1 +
lib/RT/Action/Notify.pm | 7 +-
lib/RT/Action/NotifyGroup.pm | 2 +
lib/RT/Action/RecordComment.pm | 4 +-
lib/RT/Action/RecordCorrespondence.pm | 4 +-
lib/RT/Action/ResolveMembers.pm | 3 +-
lib/RT/Action/SendEmail.pm | 16 ++++--
lib/RT/Action/SetPriority.pm | 2 +-
lib/RT/Approval/Rule.pm | 2 +-
lib/RT/Approval/Rule/Created.pm | 5 +-
lib/RT/Approval/Rule/NewPending.pm | 4 +-
lib/RT/Approval/Rule/Passed.pm | 2 +-
lib/RT/Approval/Rule/Rejected.pm | 5 +-
lib/RT/Attachment.pm | 6 +-
lib/RT/Attachment_Overlay.pm | 6 +-
lib/RT/Attribute.pm | 6 +-
lib/RT/Attribute_Overlay.pm | 8 +-
lib/RT/Attributes_Overlay.pm | 5 +-
lib/RT/Base.pm | 1 +
lib/RT/CachedGroupMember.pm | 6 +-
lib/RT/CachedGroupMembers_Overlay.pm | 4 +-
lib/RT/Condition.pm | 1 +
lib/RT/Config.pm | 1 +
lib/RT/CurrentUser.pm | 4 +-
lib/RT/CustomField.pm | 6 +-
lib/RT/CustomFieldValue.pm | 6 +-
lib/RT/CustomField_Overlay.pm | 16 +++---
lib/RT/CustomFields_Overlay.pm | 23 +++++---
lib/RT/Dashboard.pm | 12 ++--
lib/RT/EmailParser.pm | 7 +-
lib/RT/Graph/Tickets.pm | 2 +-
lib/RT/Group.pm | 6 +-
lib/RT/GroupMember.pm | 6 +-
lib/RT/GroupMembers_Overlay.pm | 4 +-
lib/RT/Group_Overlay.pm | 15 +++--
lib/RT/Groups_Overlay.pm | 39 +++++++-----
lib/RT/Handle.pm | 6 +-
lib/RT/I18N.pm | 9 ++-
lib/RT/Interface/CLI.pm | 1 +
lib/RT/Interface/Email.pm | 8 ++-
lib/RT/Interface/REST.pm | 1 +
lib/RT/Interface/Web.pm | 32 ++++++++--
lib/RT/Interface/Web/Handler.pm | 6 +-
lib/RT/Interface/Web/Menu/Item.pm | 10 ++--
lib/RT/Interface/Web/QueryBuilder/Tree.pm | 3 +
lib/RT/Interface/Web/Session.pm | 1 +
lib/RT/Interface/Web/Standalone.pm | 6 +-
lib/RT/Interface/Web/Standalone/PreFork.pm | 2 +-
lib/RT/Link.pm | 6 +-
lib/RT/Links_Overlay.pm | 8 ++-
lib/RT/ObjectCustomField.pm | 6 +-
lib/RT/ObjectCustomFieldValue.pm | 6 +-
lib/RT/ObjectCustomField_Overlay.pm | 2 +-
lib/RT/ObjectCustomFields_Overlay.pm | 10 ++--
lib/RT/Principal.pm | 6 +-
lib/RT/Principal_Overlay.pm | 1 +
lib/RT/Queue.pm | 6 +-
lib/RT/Queue_Overlay.pm | 1 +
lib/RT/Queues_Overlay.pm | 4 +-
lib/RT/Record.pm | 9 ++-
lib/RT/Reminders.pm | 26 +++++----
lib/RT/Report/Tickets.pm | 9 ++-
lib/RT/Report/Tickets/Entry.pm | 2 +-
lib/RT/Rule.pm | 9 +--
lib/RT/Ruleset.pm | 3 +-
lib/RT/SavedSearch.pm | 3 +-
lib/RT/SavedSearches.pm | 1 +
lib/RT/Scrip.pm | 6 +-
lib/RT/ScripAction.pm | 6 +-
lib/RT/ScripAction_Overlay.pm | 19 +++---
lib/RT/ScripActions_Overlay.pm | 3 +-
lib/RT/ScripCondition.pm | 6 +-
lib/RT/ScripCondition_Overlay.pm | 19 +++---
lib/RT/ScripConditions_Overlay.pm | 3 +-
lib/RT/Scrip_Overlay.pm | 3 +-
lib/RT/Scrips_Overlay.pm | 38 +++++++-----
lib/RT/Search.pm | 1 +
lib/RT/Search/Googleish.pm | 2 +-
lib/RT/SearchBuilder.pm | 18 +++---
lib/RT/SharedSetting.pm | 8 +-
lib/RT/Shredder.pm | 8 ++-
lib/RT/Shredder/POD.pm | 6 ++
lib/RT/Shredder/Plugin.pm | 1 +
lib/RT/Shredder/Plugin/Base.pm | 1 +
lib/RT/System.pm | 10 +++-
lib/RT/Template.pm | 6 +-
lib/RT/Templates_Overlay.pm | 27 +++++----
lib/RT/Test.pm | 17 ++++--
lib/RT/Test/Email.pm | 2 +-
lib/RT/Ticket.pm | 6 +-
lib/RT/Ticket_Overlay.pm | 7 +-
lib/RT/Tickets_Overlay.pm | 90 ++++++++++++++++------------
lib/RT/Tickets_Overlay_SQL.pm | 13 +++--
lib/RT/Transaction.pm | 6 +-
lib/RT/Transaction_Overlay.pm | 7 +-
lib/RT/Transactions_Overlay.pm | 2 +-
lib/RT/URI.pm | 4 +-
lib/RT/URI/base.pm | 4 +-
lib/RT/User.pm | 6 +-
lib/RT/User_Overlay.pm | 4 +-
lib/RT/Users_Overlay.pm | 27 ++++----
sbin/extract-message-catalog | 1 +
sbin/license_tag | 8 +-
sbin/rt-email-dashboards.in | 19 +++---
sbin/rt-email-digest.in | 2 +
sbin/rt-email-group-admin.in | 1 +
sbin/rt-message-catalog | 6 +-
sbin/rt-setup-database.in | 4 +-
sbin/rt-shredder.in | 3 +-
sbin/rt-test-dependencies.in | 6 ++
sbin/rt-validator.in | 3 +
121 files changed, 576 insertions(+), 383 deletions(-)
- Log -----------------------------------------------------------------
commit 3a356e291aaa3054522503cb68b82aac3eff5169
Merge: 5bff45e 94479bf
Author: Thomas Sibley <trs at bestpractical.com>
Date: Fri Jul 22 16:19:34 2011 -0400
Merge branch '3.8/perlcritic-explicit-returns' into 3.8/perlcritic
Conflicts:
lib/RT/ObjectCustomFields_Overlay.pm
lib/RT/ScripAction_Overlay.pm
lib/RT/ScripCondition_Overlay.pm
diff --cc lib/RT/ObjectCustomFields_Overlay.pm
index 9a4eecd,2221b19..f658455
--- a/lib/RT/ObjectCustomFields_Overlay.pm
+++ b/lib/RT/ObjectCustomFields_Overlay.pm
@@@ -100,7 -100,8 +100,7 @@@ sub HasEntryForCustomField
sub CustomFields {
my $self = shift;
- map { $_->CustomFieldObj } @{$self->ItemsArrayRef};
- my %seen;
+ return map { $_->CustomFieldObj } @{$self->ItemsArrayRef};
}
sub _DoSearch {
diff --cc lib/RT/ScripAction_Overlay.pm
index 3fea295,14d368a..969171b
--- a/lib/RT/ScripAction_Overlay.pm
+++ b/lib/RT/ScripAction_Overlay.pm
@@@ -164,20 -164,23 +164,21 @@@ sub LoadAction
@_ );
$self->{_TicketObj} = $args{TicketObj};
-
- #TODO: Put this in an eval
- $self->ExecModule =~ /^(\w+)$/;
- my $module = $1;
- my $type = "RT::Action::". $module;
-
+
+ $self->ExecModule =~ /^(\w+)$/ or die "Invalid scrip action: ".$self->ExecModule;
+ my $type = "RT::Action::" . $1;
+
eval "require $type" || die "Require of $type failed.\n$@\n";
-
- $self->{'Action'} = $type->new ( Argument => $self->Argument,
- CurrentUser => $self->CurrentUser,
- ScripActionObj => $self,
- ScripObj => $args{'ScripObj'},
- TemplateObj => $self->TemplateObj,
- TicketObj => $args{'TicketObj'},
- TransactionObj => $args{'TransactionObj'},
- );
+
+ return $self->{'Action'} = $type->new(
+ Argument => $self->Argument,
+ CurrentUser => $self->CurrentUser,
+ ScripActionObj => $self,
+ ScripObj => $args{'ScripObj'},
+ TemplateObj => $self->TemplateObj,
+ TicketObj => $args{'TicketObj'},
+ TransactionObj => $args{'TransactionObj'},
+ );
}
# }}}
diff --cc lib/RT/ScripCondition_Overlay.pm
index ecb7735,e5ee88f..6d89703
--- a/lib/RT/ScripCondition_Overlay.pm
+++ b/lib/RT/ScripCondition_Overlay.pm
@@@ -167,20 -167,23 +167,21 @@@ sub LoadCondition
my %args = ( TransactionObj => undef,
TicketObj => undef,
@_ );
-
- #TODO: Put this in an eval
- $self->ExecModule =~ /^(\w+)$/;
- my $module = $1;
- my $type = "RT::Condition::". $module;
-
+
+ $self->ExecModule =~ /^(\w+)$/ or die "Invalid scrip condition: ".$self->ExecModule;
+ my $type = "RT::Condition::" . $1;
+
eval "require $type" || die "Require of $type failed.\n$@\n";
-
- $self->{'Condition'} = $type->new ( 'ScripConditionObj' => $self,
- 'TicketObj' => $args{'TicketObj'},
- 'ScripObj' => $args{'ScripObj'},
- 'TransactionObj' => $args{'TransactionObj'},
- 'Argument' => $self->Argument,
- 'ApplicableTransTypes' => $self->ApplicableTransTypes,
- CurrentUser => $self->CurrentUser
- );
+
+ return $self->{'Condition'} = $type->new(
+ 'ScripConditionObj' => $self,
+ 'TicketObj' => $args{'TicketObj'},
+ 'ScripObj' => $args{'ScripObj'},
+ 'TransactionObj' => $args{'TransactionObj'},
+ 'Argument' => $self->Argument,
+ 'ApplicableTransTypes' => $self->ApplicableTransTypes,
+ CurrentUser => $self->CurrentUser
+ );
}
# }}}
diff --cc lib/RT/Tickets_Overlay.pm
index bb7008d,915fcd5..650f1af
--- a/lib/RT/Tickets_Overlay.pm
+++ b/lib/RT/Tickets_Overlay.pm
@@@ -2334,9 -2343,16 +2342,9 @@@ sub LimitWatcher
@_
);
- #build us up a description
- my ( $watcher_type, $desc );
- if ( $args{'TYPE'} ) {
- $watcher_type = $args{'TYPE'};
- }
- else {
- $watcher_type = "Watcher";
- }
+ my $watcher_type = $args{'TYPE'} || "Watcher";
- $self->Limit(
+ return $self->Limit(
FIELD => $watcher_type,
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list