From b3d5cb79074e13c979c2dbb2af109e637bc98a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20K=C3=A4hm?= <rafael.kaehm@dkd.de>
Date: Wed, 8 Nov 2023 14:44:02 +0100
Subject: [PATCH] [TASK] Rename namespace \\Trait\\ to \\Traits\\, due of
 consistency with 11.6.x

The \\Trait\\  namespace is allowed on PHP 8.0+ only.
To avoid confusions between EXT:solr 11.6 and 12.0 the namespace is adjusted to 11.6.x state.

Relates: #3843, #3844
---
 Classes/EventListener/Extbase/PersistenceEventListener.php | 2 +-
 Classes/IndexQueue/RecordMonitor.php                       | 2 +-
 Classes/{Trait => Traits}/SkipMonitoringTrait.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename Classes/{Trait => Traits}/SkipMonitoringTrait.php (96%)

diff --git a/Classes/EventListener/Extbase/PersistenceEventListener.php b/Classes/EventListener/Extbase/PersistenceEventListener.php
index 700dbf1343..fc039e4f7a 100644
--- a/Classes/EventListener/Extbase/PersistenceEventListener.php
+++ b/Classes/EventListener/Extbase/PersistenceEventListener.php
@@ -20,7 +20,7 @@
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\RecordDeletedEvent;
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\RecordGarbageCheckEvent;
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\RecordUpdatedEvent;
-use ApacheSolrForTypo3\Solr\Trait\SkipMonitoringTrait;
+use ApacheSolrForTypo3\Solr\Traits\SkipMonitoringTrait;
 use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
 use TYPO3\CMS\Extbase\Event\Persistence\EntityPersistedEvent;
 use TYPO3\CMS\Extbase\Event\Persistence\EntityRemovedFromPersistenceEvent;
diff --git a/Classes/IndexQueue/RecordMonitor.php b/Classes/IndexQueue/RecordMonitor.php
index d3d516a20e..62e32e747c 100644
--- a/Classes/IndexQueue/RecordMonitor.php
+++ b/Classes/IndexQueue/RecordMonitor.php
@@ -21,7 +21,7 @@
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\RecordMovedEvent;
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\RecordUpdatedEvent;
 use ApacheSolrForTypo3\Solr\Domain\Index\Queue\UpdateHandler\Events\VersionSwappedEvent;
-use ApacheSolrForTypo3\Solr\Trait\SkipMonitoringTrait;
+use ApacheSolrForTypo3\Solr\Traits\SkipMonitoringTrait;
 use ApacheSolrForTypo3\Solr\Util;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
diff --git a/Classes/Trait/SkipMonitoringTrait.php b/Classes/Traits/SkipMonitoringTrait.php
similarity index 96%
rename from Classes/Trait/SkipMonitoringTrait.php
rename to Classes/Traits/SkipMonitoringTrait.php
index 04757f5675..16b69c6343 100644
--- a/Classes/Trait/SkipMonitoringTrait.php
+++ b/Classes/Traits/SkipMonitoringTrait.php
@@ -15,7 +15,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace ApacheSolrForTypo3\Solr\Trait;
+namespace ApacheSolrForTypo3\Solr\Traits;
 
 use ApacheSolrForTypo3\Solr\System\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;