Merge pull request #82 from timble/feature/81-mixin

Do not mix EventMixin automatically

code/controller/abstract.php

@@ -77,9 +77,6 @@ public function __construct( ObjectConfig $config)
 
  // Mixin the behavior (and command) interface
  $this->mixin('lib:behavior.mixin', $config);
-
- // Mixin the event interface
- $this->mixin('lib:event.mixin', $config);
  }
 
  /**
@@ -93,7 +90,6 @@ public function __construct( ObjectConfig $config)
  protected function _initialize(ObjectConfig $config)
  {
  $config->append(array(
- 'command_chain' => 'lib:command.chain',
  'command_handlers' => array('lib:command.handler.event'),
  'dispatched' => false,
  'request' => array(),

code/dispatcher/abstract.php

@@ -50,7 +50,7 @@ public function __construct(ObjectConfig $config)
  $this->addCommandCallback('before.dispatch', '_resolveRequest');
 
  //Register the default exception handler
- $this->addEventListener('onException', array($this, 'fail'));
+ $this->getObject('event.publisher')->addListener('onException', array($this, 'fail'));
  }
 
  /**

code/model/abstract.php

@@ -62,9 +62,6 @@ public function __construct(ObjectConfig $config)
 
  // Mixin the behavior interface
  $this->mixin('lib:behavior.mixin', $config);
-
- // Mixin the event interface
- $this->mixin('lib:event.mixin', $config);
  }
 
  /**
@@ -81,7 +78,6 @@ protected function _initialize(ObjectConfig $config)
  'identity_key' => null,
  'state' => 'lib:model.state',
  'state_defaults' => array(),
- 'command_chain' => 'lib:command.chain',
  'command_handlers' => array('lib:command.handler.event'),
  ));
 
@@ -162,7 +158,7 @@ final public function count()
  * Reset the model data and state
  *
  * @param array $modified List of changed state names
- * @return $this
+ * @return ModelAbstract
  */
  final public function reset(array $modified = array())
  {

code/view/abstract.php

@@ -91,9 +91,6 @@ public function __construct(ObjectConfig $config)
  // Mixin the behavior (and command) interface
  $this->mixin('lib:behavior.mixin', $config);
 
- // Mixin the event interface
- $this->mixin('lib:event.mixin', $config);
-
  //Fetch the view data before rendering
  $this->addCommandCallback('before.render', '_fetchData');
  }