Merge record and structure events inside new namespace

lib/Alchemy/Phrasea/Border/Manager.php

@@ -13,8 +13,8 @@ namespace Alchemy\Phrasea\Border;
 
 use Alchemy\Phrasea\Border\Checker\CheckerInterface;
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Alchemy\Phrasea\Metadata\Tag\TfArchivedate;
 use Alchemy\Phrasea\Metadata\Tag\TfQuarantine;
 use Alchemy\Phrasea\Metadata\Tag\TfBasename;

lib/Alchemy/Phrasea/Command/RecordAdd.php

@@ -13,8 +13,8 @@ namespace Alchemy\Phrasea\Command;
 
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCreatedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Model\Entities\LazaretSession;
 use Symfony\Component\Console\Input\InputArgument;

lib/Alchemy/Phrasea/Controller/Admin/Fields.php

@@ -11,9 +11,6 @@
 
 namespace Alchemy\Phrasea\Controller\Admin;
 
-use Alchemy\Phrasea\Core\Event\DataboxEvent\UpdateStructureFieldEvent;
-use Alchemy\Phrasea\Core\Event\DataboxEvent\DeleteStructureFieldEvent;
-use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Metadata\TagProvider;
 use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;
 use JMS\TranslationBundle\Annotation\Ignore;
@@ -117,8 +114,6 @@ class Fields implements ControllerProviderInterface
                 $this->updateFieldWithData($app, $field, $jsonField);
                 $field->save();
                 $fields[] = $field->toArray();
-
-                $app['dispatcher']->dispatch(PhraseaEvents::DATABOX_UPDATE_FIELD, new UpdateStructureFieldEvent($field, $jsonField));
             } catch (\Exception $e) {
                 $connection->rollback();
                 $app->abort(500, $app->trans('Field %name% could not be saved, please try again or contact an admin.', ['%name%' => $jsonField['name']]));
@@ -283,8 +278,6 @@ class Fields implements ControllerProviderInterface
         $this->updateFieldWithData($app, $field, $data);
         $field->save();
 
-        $app['dispatcher']->dispatch(PhraseaEvents::DATABOX_UPDATE_FIELD, new UpdateStructureFieldEvent($databox, $field, $jsonField));
-
         return $app->json($field->toArray());
     }
 
@@ -294,8 +287,6 @@ class Fields implements ControllerProviderInterface
         $field = \databox_field::get_instance($app, $databox, $id);
         $field->delete();
 
-        $app['dispatcher']->dispatch(PhraseaEvents::DATABOX_DELETE_FIELD, new DeleteStructureFieldEvent($databox, $field));
-
         return new Response('', 204);
     }
 
@@ -331,7 +322,6 @@ class Fields implements ControllerProviderInterface
 
     private function updateFieldWithData(Application $app, \databox_field $field, array $data)
     {
-
         $field
             ->set_name($data['name'])
             ->set_thumbtitle($data['thumbtitle'])

lib/Alchemy/Phrasea/Controller/Admin/Root.php

@@ -11,9 +11,6 @@
 
 namespace Alchemy\Phrasea\Controller\Admin;
 
-use Alchemy\Phrasea\Core\Event\DataboxEvent\DeleteStatusEvent;
-use Alchemy\Phrasea\Core\Event\DataboxEvent\UpdateStatusEvent;
-use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Exception\SessionNotFound;
 use Alchemy\Phrasea\Helper\DatabaseHelper;
 use Alchemy\Phrasea\Helper\PathHelper;
@@ -325,17 +322,12 @@ class Root implements ControllerProviderInterface
 
             $error = false;
 
-            $status = \databox_status::getStatus($app, $databox_id)[$bit];
-            $databox = $app['phraseanet.appbox']->get_databox((int) $databox_id);
-
             try {
                 \databox_status::deleteStatus($app, $app['phraseanet.appbox']->get_databox($databox_id), $bit);
             } catch (\Exception $e) {
                 $error = true;
             }
 
-            $app['dispatcher']->dispatch(PhraseaEvents::DATABOX_DELETE_STATUS, new DeleteStatusEvent($databox, $status));
-
             return $app->json(['success' => !$error]);
         })
             ->bind('admin_statusbit_delete')
@@ -357,8 +349,6 @@ class Root implements ControllerProviderInterface
                 'labels_off' => $request->request->get('labels_off', []),
             ];
 
-            $databox = $app['phraseanet.appbox']->get_databox((int) $databox_id);
-
             \databox_status::updateStatus($app, $databox_id, $bit, $properties);
 
             if (null !== $request->request->get('delete_icon_off')) {
@@ -453,10 +443,6 @@ class Root implements ControllerProviderInterface
                 }
             }
 
-            $status = \databox_status::getStatus($app, $databox_id)[$bit];
-
-            $app['dispatcher']->dispatch(PhraseaEvents::DATABOX_UPDATE_STATUS, new UpdateStatusEvent($databox, $status));
-
             return $app->redirectPath('database_display_statusbit', ['databox_id' => $databox_id, 'success' => 1]);
         })->assert('databox_id', '\d+')
           ->assert('bit', '\d+')

lib/Alchemy/Phrasea/Controller/Api/V1.php

@@ -11,10 +11,10 @@
 
 namespace Alchemy\Phrasea\Controller\Api;
 
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCreatedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Silex\ControllerProviderInterface;
 use Alchemy\Phrasea\Cache\Cache as CacheInterface;
 use Alchemy\Phrasea\Core\PhraseaEvents;

lib/Alchemy/Phrasea/Controller/Prod/Edit.php

@@ -11,9 +11,9 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Metadata\Tag\TfEditdate;

lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php

@@ -11,10 +11,10 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCreatedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\Model\Entities\LazaretFile;
 use Alchemy\Phrasea\Border;

lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCollectionChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordCollectionChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;

lib/Alchemy/Phrasea/Controller/Prod/Property.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;

lib/Alchemy/Phrasea/Controller/Prod/Records.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordDeletedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordDeletedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Controller/Prod/Story.php

@@ -13,8 +13,8 @@ namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
 use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Controller/Prod/Tools.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordOriginalNameChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordOriginalNameChangedEvent;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use DataURI;
 use PHPExiftool\Exception\ExceptionInterface as PHPExiftoolException;

lib/Alchemy/Phrasea/Controller/Prod/Upload.php

@@ -14,8 +14,8 @@ namespace Alchemy\Phrasea\Controller\Prod;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Attribute\Status;
 use Alchemy\Phrasea\Core\Event\LazaretEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCreatedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use DataURI\Parser;
 use DataURI\Exception\Exception as DataUriException;

lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php

@@ -11,8 +11,8 @@
 
 namespace Alchemy\Phrasea\Controller\Thesaurus;
 
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Alchemy\Phrasea\Model\Entities\User;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Core/Event/DataboxEvent/DeleteStatusEvent.php

@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2014 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
-
-class DeleteStatusEvent extends DataboxEvent
-{
-    private $status;
-
-    public function __construct(\databox $databox, array $status)
-    {
-        $this->status = $status;
-
-        parent::__construct($databox);
-    }
-
-    public function getStatus()
-    {
-        return $this->status;
-    }
-}

lib/Alchemy/Phrasea/Core/Event/DataboxEvent/UpdateStructureFieldEvent.php

@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2014 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
-
-class UpdateStructureFieldEvent extends DataboxEvent
-{
-    private $field;
-    private $data;
-
-    public function __construct(\databox $databox, \databox_field $field, $data)
-    {
-        $this->field = $field;
-        $this->data = $data;
-
-        parent::__construct($databox);
-    }
-
-    /**
-     * @return \databox_field
-     */
-    public function getField()
-    {
-        return $this->field;
-    }
-
-    /**
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-}

lib/Alchemy/Phrasea/Core/Event/Record/RecordCollectionChangedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordCollectionChangedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordCreatedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordCreatedEvent extends RecordEvent
 {}

lib/Alchemy/Phrasea/Core/Event/Record/RecordDeletedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordDeletedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 use Alchemy\Phrasea\Model\RecordInterface;
 use Symfony\Component\EventDispatcher\Event;

lib/Alchemy/Phrasea/Core/Event/Record/RecordEvents.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 final class RecordEvents
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordIndexEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordIndexEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordMetadataChangedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordMetadataChangedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordOriginalNameChangedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordOriginalNameChangedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordStatusChangedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordStatusChangedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordSubDefinitionCreatedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordSubDefinitionCreatedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/RecordSubDefinitionSubstitutedEvent.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\RecordEvent;
+namespace Alchemy\Phrasea\Core\Event\Record;
 
 class RecordSubDefinitionSubstitutedEvent extends RecordEvent
 {

lib/Alchemy/Phrasea/Core/Event/Record/Structure/FieldDeletedEvent.php

@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
 
-class DataboxIndexEvent extends DataboxEvent
+class FieldDeletedEvent extends FieldEvent
 {
-
 }

lib/Alchemy/Phrasea/Core/Event/Record/Structure/FieldEvent.php

@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
 
-class DeleteStructureFieldEvent extends DataboxEvent
+abstract class FieldEvent extends RecordStructureEvent
 {
     private $field;
 
     public function __construct(\databox $databox, \databox_field $field)
     {
-        $this->field = $field;
-
         parent::__construct($databox);
+
+        $this->field = $field;
     }
 
     /**

lib/Alchemy/Phrasea/Core/Event/Record/Structure/FieldUpdatedEvent.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
+
+class FieldUpdatedEvent extends FieldEvent
+{
+}

lib/Alchemy/Phrasea/Core/Event/Record/Structure/RecordStructureEvent.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
 
-use Symfony\Component\EventDispatcher\Event as SfEvent;
+use Symfony\Component\EventDispatcher\Event;
 
-class DataboxEvent extends SfEvent
+abstract class RecordStructureEvent extends Event
 {
     private $databox;
 

lib/Alchemy/Phrasea/Core/Event/Record/Structure/RecordStructureEvents.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
+
+final class RecordStructureEvents
+{
+    const FIELD_UPDATED = 'record_structure.field.changed';
+    const FIELD_DELETED = 'record_structure.field.deleted';
+    const STATUS_BIT_UPDATED = 'record_structure.status_bit.updated';
+    const STATUS_BIT_DELETED = 'record_structure.status_bit.deleted';
+}

lib/Alchemy/Phrasea/Core/Event/Record/Structure/StatusBitDeletedEvent.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
+
+class StatusBitDeletedEvent extends StatusBitEvent
+{
+}

lib/Alchemy/Phrasea/Core/Event/Record/Structure/StatusBitEvent.php

@@ -9,21 +9,21 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Event\DataboxEvent;
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
 
-class UpdateStatusEvent extends DataboxEvent
+abstract class StatusBitEvent extends RecordStructureEvent
 {
-    private $status;
+    private $bit;
 
-    public function __construct(\databox $databox, array $status)
+    public function __construct(\databox $databox, $bit)
     {
-        $this->status = $status;
-
         parent::__construct($databox);
+
+        $this->bit = $bit;
     }
 
-    public function getStatus()
+    public function getBit()
     {
-        return $this->status;
+        return $this->bit;
     }
 }

lib/Alchemy/Phrasea/Core/Event/Record/Structure/StatusBitUpdatedEvent.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Core\Event\Record\Structure;
+
+class StatusBitUpdatedEvent extends StatusBitEvent
+{
+    private $properties;
+
+    public function __construct(\databox $databox, $bit, array $properties)
+    {
+        parent::__construct($databox, $bit);
+
+        $this->properties = $properties;
+    }
+
+    public function getProperties()
+    {
+        return $this->properties;
+    }
+}

lib/Alchemy/Phrasea/Core/PhraseaEvents.php

@@ -42,14 +42,6 @@ final class PhraseaEvents
     const EXPORT_MAIL_FAILURE = 'export.mail-failure';
     const EXPORT_CREATE = 'export.create';
 
-
-
-    const DATABOX_UPDATE_FIELD = 'databox.update.field';
-    const DATABOX_DELETE_FIELD = 'databox.delete.field';
-
-    const DATABOX_UPDATE_STATUS = 'databox.create.status';
-    const DATABOX_DELETE_STATUS = 'databox.delete.status';
-
     const COLLECTION_CHANGE_NAME = 'collection.name';
     const COLLECTION_CREATE = 'collection.create';
 

lib/Alchemy/Phrasea/Media/SubdefGenerator.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Media;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordSubDefinitionCreatedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordSubDefinitionCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use MediaAlchemyst\Alchemyst;
 use MediaAlchemyst\Specification\SpecificationInterface;
 use MediaVorus\MediaVorus;

lib/Alchemy/Phrasea/Media/SubdefSubstituer.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\Media;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMediaSubstitutedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMediaSubstitutedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use MediaAlchemyst\Alchemyst;
 use MediaAlchemyst\Exception\ExceptionInterface as MediaAlchemystException;
 use MediaVorus\Media\MediaInterface;

lib/Alchemy/Phrasea/Metadata/PhraseanetMetadataSetter.php

@@ -11,8 +11,8 @@
 
 namespace Alchemy\Phrasea\Metadata;
 
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
 use PHPExiftool\Driver\Metadata\Metadata;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 

lib/Alchemy/Phrasea/TaskManager/Job/ArchiveJob.php

@@ -12,8 +12,8 @@
 namespace Alchemy\Phrasea\TaskManager\Job;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCreatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordCreatedEvent;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\TaskManager\Editor\ArchiveEditor;

lib/Alchemy/Phrasea/TaskManager/Job/RecordMoverJob.php

@@ -12,10 +12,10 @@
 namespace Alchemy\Phrasea\TaskManager\Job;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordCollectionChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordDeletedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordStatusChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordCollectionChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordDeletedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordStatusChangedEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Alchemy\Phrasea\TaskManager\Editor\RecordMoverEditor;
 use JMS\Serializer\EventDispatcher\EventDispatcher;

lib/classes/caption/field.php

@@ -10,8 +10,8 @@
  */
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class caption_field implements cache_cacheableInterface

lib/classes/databox/field.php

@@ -10,6 +10,10 @@
  */
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Core\Event\Record\Structure\FieldDeletedEvent;
+use Alchemy\Phrasea\Core\Event\Record\Structure\FieldEvent;
+use Alchemy\Phrasea\Core\Event\Record\Structure\FieldUpdatedEvent;
+use Alchemy\Phrasea\Core\Event\Record\Structure\RecordStructureEvents;
 use Alchemy\Phrasea\Vocabulary;
 use Alchemy\Phrasea\Vocabulary\ControlProvider\ControlProviderInterface;
 use Alchemy\Phrasea\Metadata\Tag\Nosource;
@@ -359,6 +363,8 @@ class databox_field implements cache_cacheableInterface
         $this->delete_data_from_cache();
         $this->databox->saveStructure($dom_struct);
 
+        $this->dispatchEvent(RecordStructureEvents::FIELD_DELETED, new FieldDeletedEvent($databox, $this));
+
         return;
     }
 
@@ -467,9 +473,16 @@ class databox_field implements cache_cacheableInterface
         $this->delete_data_from_cache();
         $this->databox->saveStructure($dom_struct);
 
+        $this->dispatchEvent(RecordStructureEvents::FIELD_UPDATED, new FieldUpdatedEvent($databox, $this));
+
         return $this;
     }
 
+    private function dispatchEvent($eventName, FieldEvent $event = null)
+    {
+        $this->app['dispatcher']->dispatch($eventName, $event);
+    }
+
     /**
      * Sets a localized label for the field.
      *

lib/classes/databox/status.php

@@ -257,6 +257,8 @@ class databox_status
 
                 unset(self::$_status[$databox->get_sbas_id()]->status[$bit]);
 
+                $app['dispatcher']->dispatch(RecordStructureEvents::STATUS_BIT_DELETED, new StatusBitDeletedEvent($databox, $bit));
+
                 return true;
             }
         }
@@ -348,6 +350,9 @@ class databox_status
             if ( ! isset(self::$_status[$sbas_id]->status[$bit]['img_off'])) {
                 self::$_status[$sbas_id]->status[$bit]['img_off'] = null;
             }
+
+            $properties = self::$_status[$sbas_id]->status[$bit];
+            $app['dispatcher']->dispatch(RecordStructureEvents::STATUS_BIT_UPDATED, new StatusBitUpdatedEvent($databox, $bit, $properties));
         }
 
         return false;

lib/classes/module/console/fieldsMerge.php

@@ -14,8 +14,8 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Alchemy\Phrasea\Command\Command;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordEvents;
-use Alchemy\Phrasea\Core\Event\RecordEvent\RecordMetadataChangedEvent;
+use Alchemy\Phrasea\Core\Event\Record\RecordEvents;
+use Alchemy\Phrasea\Core\Event\Record\RecordMetadataChangedEvent;
 
 class module_console_fieldsMerge extends Command
 {