scalar context does not need to be enforced anymore

mojolicious · Jan 7, 2015 · 8deaf7e · 8deaf7e
1 parent c39a167
commit 8deaf7e
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 22 deletions.
diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -15,7 +15,7 @@ sub detect {
   my $self = shift;
 
   # Environment variable
-  return $self->parts([splitdir(abs_path $ENV{MOJO_HOME})]) if $ENV{MOJO_HOME};
+  return $self->parts([splitdir abs_path $ENV{MOJO_HOME}]) if $ENV{MOJO_HOME};
 
   # Try to find home from lib directory
   if (my $class = @_ ? shift : 'Mojo::HelloWorld') {
@@ -28,7 +28,7 @@ sub detect {
       pop @home while @home && ($home[-1] =~ /^b?lib$/ || $home[-1] eq '');
 
       # Turn into absolute path
-      return $self->parts([splitdir(abs_path(catdir(@home) || '.'))]);
+      return $self->parts([splitdir abs_path catdir(@home) || '.']);
     }
   }
 
@@ -44,12 +44,12 @@ sub lib_dir {
 sub list_files {
   my ($self, $dir) = @_;
 
-  $dir = catdir @{$self->parts}, split '/', ($dir // '');
+  $dir = catdir @{$self->parts}, split('/', $dir // '');
   return [] unless -d $dir;
   my @files;
   find {
     wanted => sub {
-      my @parts = splitdir(abs2rel($File::Find::name, $dir));
+      my @parts = splitdir abs2rel($File::Find::name, $dir);
       push @files, join '/', @parts unless grep {/^\./} @parts;
     },
     no_chdir => 1
@@ -58,16 +58,16 @@ sub list_files {
   return [sort @files];
 }
 
-sub mojo_lib_dir { catdir(dirname(__FILE__), '..') }
+sub mojo_lib_dir { catdir dirname(__FILE__), '..' }
 
 sub new { @_ > 1 ? shift->SUPER::new->parse(@_) : shift->SUPER::new }
 
 sub parse { shift->parts([splitdir shift]) }
 
-sub rel_dir { catdir(@{shift->parts}, split '/', shift) }
-sub rel_file { catfile(@{shift->parts}, split '/', shift) }
+sub rel_dir  { catdir @{shift->parts},  split('/', shift) }
+sub rel_file { catfile @{shift->parts}, split('/', shift) }
 
-sub to_string { catdir(@{shift->parts}) }
+sub to_string { catdir @{shift->parts} }
 
 1;
 

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -142,10 +142,10 @@ sub _listen {
   my $options = {
     address => $url->host,
     backlog => $self->backlog,
-    reuse   => scalar $query->param('reuse'),
+    reuse   => $query->param('reuse')
   };
   if (my $port = $url->port) { $options->{port} = $port }
-  $options->{"tls_$_"} = scalar $query->param($_) for qw(ca cert ciphers key);
+  $options->{"tls_$_"} = $query->param($_) for qw(ca cert ciphers key);
   my $verify = $query->param('verify');
   $options->{tls_verify} = hex $verify if defined $verify;
   delete $options->{address} if $options->{address} eq '*';

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -80,7 +80,7 @@ sub class_to_file {
   return decamelize($class);
 }
 
-sub class_to_path { join '.', join('/', split /::|'/, shift), 'pm' }
+sub class_to_path { join '.', join('/', split(/::|'/, shift)), 'pm' }
 
 sub decamelize {
   my $str = shift;
@@ -139,7 +139,7 @@ sub punycode_decode {
   my @output;
 
   # Consume all code points before the last delimiter
-  push @output, split '', $1 if $input =~ s/(.*)\x2d//s;
+  push @output, split('', $1) if $input =~ s/(.*)\x2d//s;
 
   while (length $input) {
     my $oldi = $i;

diff --git a/lib/Mojolicious/Command.pm b/lib/Mojolicious/Command.pm
@@ -53,9 +53,8 @@ sub extract_usage {
 
 sub help { print shift->usage }
 
-sub rel_dir { catdir(getcwd(), split '/', pop) }
-
-sub rel_file { catfile(getcwd(), split '/', pop) }
+sub rel_dir  { catdir getcwd(),  split('/', pop) }
+sub rel_file { catfile getcwd(), split('/', pop) }
 
 sub render_data {
   my ($self, $name) = (shift, shift);

diff --git a/lib/Mojolicious/Command/generate/plugin.pm b/lib/Mojolicious/Command/generate/plugin.pm
@@ -15,7 +15,7 @@ sub run {
   my $class = $name =~ /^[a-z]/ ? camelize($name) : $name;
   $class = "Mojolicious::Plugin::$class";
   my $app = class_to_path $class;
-  my $dir = join '-', split '::', $class;
+  my $dir = join '-', split('::', $class);
   $self->render_to_rel_file('class', "$dir/lib/$app", $class, $name);
 
   # Test

diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -1093,7 +1093,7 @@ C<register> is called.
     my ($self, $app) = @_;
 
     # Append "templates" and "public" directories
-    my $base = catdir(dirname(__FILE__), 'AlertAssets');
+    my $base = catdir dirname(__FILE__), 'AlertAssets';
     push @{$app->renderer->paths}, catdir($base, 'templates');
     push @{$app->static->paths},   catdir($base, 'public');
   }

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -13,7 +13,7 @@ sub import {
   $ENV{MOJO_EXE} ||= (caller)[1];
 
   # Reuse home directory if possible
-  local $ENV{MOJO_HOME} = catdir(split '/', dirname $ENV{MOJO_EXE})
+  local $ENV{MOJO_HOME} = catdir split('/', dirname $ENV{MOJO_EXE})
     unless $ENV{MOJO_HOME};
 
   # Initialize application class

diff --git a/lib/Mojolicious/Plugin/PODRenderer.pm b/lib/Mojolicious/Plugin/PODRenderer.pm
@@ -80,7 +80,7 @@ sub _perldoc {
   my $c = shift;
 
   # Find module or redirect to CPAN
-  my $module = join '::', split '/', scalar $c->param('module');
+  my $module = join '::', split('/', $c->param('module'));
   my $path
     = Pod::Simple::Search->new->find($module, map { $_, "$_/pods" } @INC);
   return $c->redirect_to("https://metacpan.org/pod/$module")

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -199,7 +199,7 @@ sub template_path {
 
   # Search all paths
   for my $path (@{$self->paths}) {
-    my $file = catfile($path, split '/', $name);
+    my $file = catfile $path, split('/', $name);
     return $file if -r $file;
   }
 

diff --git a/t/mojolicious/dispatch.t b/t/mojolicious/dispatch.t
@@ -76,8 +76,7 @@ is_deeply $c->every_param('bar'), [], 'no values';
 is $c->param(foo => undef)->param('foo'), undef, 'no value';
 is $c->param(foo => Mojo::Upload->new(name => 'bar'))->param('foo')->name,
   'bar', 'right value';
-is scalar $c->param(foo => ['ba;r', 'baz'])->param('foo'), 'baz',
-  'right value';
+is $c->param(foo => ['ba;r', 'baz'])->param('foo'), 'baz', 'right value';
 is_deeply $c->every_param('foo'), ['ba;r', 'baz'], 'right values';
 
 # Reserved stash values are hidden