OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Use upstream \Drupal\log\Event\LogEvent instead of custom event.

This commit is contained in:
Michael Stenta 2021-10-18 15:23:26 -04:00
parent e552e6b9c5
commit d3b3bd862d
8 changed files with 15 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/asset/group/src/EventSubscriber/LogEventSubscriber.php
View File

@ -7,7 +7,7 @@ use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
use Drupal\farm_group\GroupMembershipInterface;
use Drupal\farm_location\EventSubscriber\LogEventSubscriber as LocationLogEventSubscriber;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Event\LogEvent;
use Drupal\log\Entity\LogInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -69,7 +69,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log delete.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logDelete(LogEvent $event) {
@ -80,7 +80,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log presave.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logPresave(LogEvent $event) {

6
modules/core/inventory/src/EventSubscriber/LogEventSubscriber.php
View File

@ -5,8 +5,8 @@ namespace Drupal\farm_inventory\EventSubscriber;
use Drupal\asset\Entity\AssetInterface;
use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Entity\LogInterface;
use Drupal\log\Event\LogEvent;
use Drupal\quantity\Entity\QuantityInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -58,7 +58,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log delete.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logDelete(LogEvent $event) {
@ -68,7 +68,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log presave.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logPresave(LogEvent $event) {

6
modules/core/location/src/EventSubscriber/LogEventSubscriber.php
View File

@ -6,8 +6,8 @@ use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
use Drupal\farm_location\AssetLocationInterface;
use Drupal\farm_location\LogLocationInterface;
use Drupal\farm_geo\Traits\WktTrait;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Entity\LogInterface;
use Drupal\log\Event\LogEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
@ -70,7 +70,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log delete.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logDelete(LogEvent $event) {
@ -80,7 +80,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log presave.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function logPresave(LogEvent $event) {

50
modules/core/log/farm_log.module
View File

@ -7,56 +7,6 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Entity\LogInterface;
/**
* Implements hook_ENTITY_TYPE_presave().
*/
function farm_log_log_presave(LogInterface $log) {
// Dispatch an event on log presave.
// @todo Replace this with core event via https://www.drupal.org/node/2551893.
$event = new LogEvent($log);
$event_dispatcher = \Drupal::service('event_dispatcher');
$event_dispatcher->dispatch(LogEvent::PRESAVE, $event);
}
/**
* Implements hook_ENTITY_TYPE_insert().
*/
function farm_log_log_insert(LogInterface $log) {
// Dispatch an event on log insert.
// @todo Replace this with core event via https://www.drupal.org/node/2551893.
$event = new LogEvent($log);
$event_dispatcher = \Drupal::service('event_dispatcher');
$event_dispatcher->dispatch(LogEvent::INSERT, $event);
}
/**
* Implements hook_ENTITY_TYPE_update().
*/
function farm_log_log_update(LogInterface $log) {
// Dispatch an event on log update.
// @todo Replace this with core event via https://www.drupal.org/node/2551893.
$event = new LogEvent($log);
$event_dispatcher = \Drupal::service('event_dispatcher');
$event_dispatcher->dispatch(LogEvent::UPDATE, $event);
}
/**
* Implements hook_ENTITY_TYPE_delete().
*/
function farm_log_log_delete(LogInterface $log) {
// Dispatch an event on log delete.
// @todo Replace this with core event via https://www.drupal.org/node/2551893.
$event = new LogEvent($log);
$event_dispatcher = \Drupal::service('event_dispatcher');
$event_dispatcher->dispatch(LogEvent::DELETE, $event);
}
/**
* Implements hook_entity_prepare_form().

4
modules/core/log/modules/quantity/src/EventSubscriber/LogEventSubscriber.php
View File

@ -3,7 +3,7 @@
namespace Drupal\farm_log_quantity\EventSubscriber;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Event\LogEvent;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@ -50,7 +50,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Perform actions on log delete.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* Config crud event.
*/
public function logDelete(LogEvent $event) {

35
modules/core/log/src/Event/LogEvent.php
View File

@ -1,35 +0,0 @@
<?php
namespace Drupal\farm_log\Event;
use Drupal\log\Entity\LogInterface;
use Symfony\Contracts\EventDispatcher\Event;
/**
* Event that is fired by hook_log_OPERATION().
*/
class LogEvent extends Event {
const PRESAVE = 'farm_log_presave';
const INSERT = 'farm_log_insert';
const UPDATE = 'farm_log_update';
const DELETE = 'farm_log_delete';
/**
* The Log entity.
*
* @var \Drupal\log\Entity\LogInterface
*/
public LogInterface $log;
/**
* Constructs the object.
*
* @param \Drupal\log\Entity\LogInterface $log
* The Log entity.
*/
public function __construct(LogInterface $log) {
$this->log = $log;
}
}

4
modules/core/owner/src/EventSubscriber/LogEventSubscriber.php
View File

@ -3,7 +3,7 @@
namespace Drupal\farm_owner\EventSubscriber;
use Drupal\Core\Session\AccountInterface;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Event\LogEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
@ -43,7 +43,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Set the log owner to the current user, if an owner isn't specified.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function setLogOwner(LogEvent $event): void {

4
modules/log/birth/src/EventSubscriber/LogEventSubscriber.php
View File

@ -4,7 +4,7 @@ namespace Drupal\farm_birth\EventSubscriber;
use Drupal\Core\Messenger\MessengerInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\farm_log\Event\LogEvent;
use Drupal\log\Event\LogEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
@ -47,7 +47,7 @@ class LogEventSubscriber implements EventSubscriberInterface {
/**
* Sync child asset fields to reflect those saved in a birth log.
*
* @param \Drupal\farm_log\Event\LogEvent $event
* @param \Drupal\log\Event\LogEvent $event
* The log event.
*/
public function syncBirthChildren(LogEvent $event): void {