-short is dead, RT#49771

diff --git a/Changes b/Changes
index 0844064..8a5ece0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -29,6 +29,9 @@
   Refactoring / cleanups:
      - Reduce minimum supported perl version from 5.8.6 to 5.8.4 as there are
        many people still running/testing this version with no known issues.
+     - The -short option has been removed from catalyst.pl, stopping new
+       applications from being generated using the ::[MVC]:: naming scheme as
+       this is deprecated and generates warnings. RT#49771
 
   Tests:
      - Make the optional_http_server.t test an author only test which must be

diff --git a/script/catalyst.pl b/script/catalyst.pl
index 287c12e..e9083cc 100755 (executable)
--- a/script/catalyst.pl
+++ b/script/catalyst.pl
@@ -26,14 +26,12 @@ my $force    = 0;
 my $help     = 0;
 my $makefile = 0;
 my $scripts  = 0;
-my $short    = 0;
 
 GetOptions(
     'help|?'      => \$help,
     'force|nonew' => \$force,
     'makefile'    => \$makefile,
     'scripts'     => \$scripts,
-    'short'       => \$short
 );
 
 pod2usage(1) if ( $help || !$ARGV[0] );
@@ -43,7 +41,7 @@ my $helper = Catalyst::Helper->new(
         '.newfiles' => !$force,
         'makefile'  => $makefile,
         'scripts'   => $scripts,
-        'short'     => $short,
+        'short'     => 0, # FIXME - to be removed.
     }
 );
 pod2usage(1) unless $helper->mk_app( $ARGV[0] );
@@ -67,7 +65,6 @@ upgrade the skeleton of your old application.
    -help       display this help and exit
    -makefile   only update Makefile.PL
    -scripts    only update helper scripts
-   -short      use short names, M/V/C instead of Model/View/Controller.
 
  application-name must be a valid Perl module name and can include "::", 
  which will be converted to '-' in the project name.