package Catalyst::Component;
-use strict;
-use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
-use NEXT;
+use Moose;
+use MooseX::Adopt::Class::Accessor::Fast;
use Catalyst::Utils;
+with 'MooseX::Emulate::Class::Accessor::Fast';
+with 'Catalyst::ClassData';
+
+
=head1 NAME
Catalyst::Component - Catalyst Component Base Class
__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
-
-
-sub new {
+around new => sub {
+ my $orig = shift;
my ( $self, $c ) = @_;
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
- return $self->NEXT::new(
- $self->merge_config_hashes( $self->config, $arguments ) );
-}
+ my $args = $self->merge_config_hashes( $self->config, $arguments );
+ return $self->$orig( $args );
+};
sub COMPONENT {
my ( $self, $c ) = @_;
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-
- if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
- return $new;
- }
- else {
- if ( my $new = $self->new( $c, $arguments ) ) {
- return $new;
- }
- else {
- my $class = ref $self || $self;
- my $new = $self->merge_config_hashes(
- $self->config, $arguments );
- return bless $new, $class;
- }
- }
+ $self->new($c, $arguments);
+
+# if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
+# return $new;
+# }
+# else {
+# if ( my $new = $self->new( $c, $arguments ) ) {
+# return $new;
+# }
+# else {
+# my $class = ref $self || $self;
+# my $new = $self->merge_config_hashes(
+# $self->config, $arguments );
+# return bless $new, $class;
+# }
+# }
}
sub config {