Update to core 1.3.

composer.json

@@ -23,7 +23,7 @@
     "ext-json": "*",
     "psr/log": "1.0",
     "psr/cache": "1.0",
-    "jivoo/core": "^1.0",
+    "jivoo/core": "^1.3",
     "composer/semver": "^1.2"
   },
   "require-dev": {

src/ActiveModel/ActiveModel.php

@@ -29,8 +29,24 @@
 /**
  * An active model containing active records, see also {@see ActiveRecord}.
  */
-abstract class ActiveModel extends ModelBase
+abstract class ActiveModel extends ModelBase implements \Jivoo\EventSubject
 {
+    use \Jivoo\EventSubjectTrait;
+
+    /**
+     * ActiveModel events.
+     * 
+     * @var string[]
+     */
+    protected $events = array(
+        'beforeSave',
+        'afterSave',
+        'beforeValidate',
+        'afterValidate',
+        'afterCreate',
+        'afterLoad',
+        'beforeDelete'
+    );
 
     /**
      * @var string Name of database table used by model, null for default based
@@ -120,6 +136,7 @@ abstract class ActiveModel extends ModelBase
      */
     final public function __construct(Schema $schema)
     {
+        $this->e = new \Jivoo\EventManager($this);
         $this->name = Utilities::getClassName(get_class($this));
         $this->schema = $schema;
         if (! isset($this->table)) {
@@ -176,6 +193,14 @@ final public function __construct(Schema $schema)
     protected function init()
     {
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getEvents()
+    {
+        return $this->events;
+    }
 
     /**
      * Call a mixin method.

src/ActiveModel/ActiveRecord.php

@@ -171,7 +171,7 @@ public function getModel()
     public function addData(array $data, $allowedFields = null)
     {
         if (! isset($allowedFields)) {
-            $allowedFields = $this->model->getDefinition->getFields();
+            $allowedFields = $this->model->getDefinition()->getFields();
         }
         if (is_array($allowedFields)) {
             $allowedFields = array_flip($allowedFields);