From 919171649e5b5ca5fca9d812740e00c74c958393 Mon Sep 17 00:00:00 2001
From: Sebastian Schreiber <me@schreibersebastian.de>
Date: Tue, 16 Apr 2024 13:49:13 +0200
Subject: [PATCH] [TASK] Use contract folder for interfaces

---
 fractor-xml/src/AbstractXmlFractor.php                        | 4 +++-
 fractor-xml/src/{ => Contract}/DomNodeVisitor.php             | 4 +++-
 fractor-xml/src/{ => Contract}/XmlFractor.php                 | 4 +++-
 .../src/DependencyInjection/XmlFractorCompilerPass.php        | 2 +-
 fractor-xml/src/DomDocumentIterator.php                       | 2 ++
 fractor-xml/src/XmlFileProcessor.php                          | 3 ++-
 fractor-xml/tests/DomDocumentIteratorTest.php                 | 2 +-
 fractor-xml/tests/Fixtures/CollectingDomNodeVisitor.php       | 2 +-
 fractor/src/Configuration/FractorConfig.php                   | 4 ++--
 fractor/src/{Fractor => Contract}/FileProcessor.php           | 2 +-
 fractor/src/{Fractor => Contract}/FractorRule.php             | 2 +-
 fractor/src/Fractor/FractorRunner.php                         | 1 +
 12 files changed, 21 insertions(+), 11 deletions(-)
 rename fractor-xml/src/{ => Contract}/DomNodeVisitor.php (85%)
 rename fractor-xml/src/{ => Contract}/XmlFractor.php (76%)
 rename fractor/src/{Fractor => Contract}/FileProcessor.php (82%)
 rename fractor/src/{Fractor => Contract}/FractorRule.php (51%)

diff --git a/fractor-xml/src/AbstractXmlFractor.php b/fractor-xml/src/AbstractXmlFractor.php
index 337687ac..4b21abd3 100644
--- a/fractor-xml/src/AbstractXmlFractor.php
+++ b/fractor-xml/src/AbstractXmlFractor.php
@@ -2,7 +2,9 @@
 
 namespace a9f\FractorXml;
 
-use a9f\Fractor\Fractor\FractorRule;
+use a9f\Fractor\Contract\FractorRule;
+use a9f\FractorXml\Contract\DomNodeVisitor;
+use a9f\FractorXml\Contract\XmlFractor;
 
 abstract class AbstractXmlFractor implements DomNodeVisitor, XmlFractor, FractorRule
 {
diff --git a/fractor-xml/src/DomNodeVisitor.php b/fractor-xml/src/Contract/DomNodeVisitor.php
similarity index 85%
rename from fractor-xml/src/DomNodeVisitor.php
rename to fractor-xml/src/Contract/DomNodeVisitor.php
index 8c5792d9..175e128d 100644
--- a/fractor-xml/src/DomNodeVisitor.php
+++ b/fractor-xml/src/Contract/DomNodeVisitor.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace a9f\FractorXml;
+namespace a9f\FractorXml\Contract;
+
+use a9f\FractorXml\DomDocumentIterator;
 
 /**
  * TODO decide if the methods should allow returning values that then replace things/modify the DOM?
diff --git a/fractor-xml/src/XmlFractor.php b/fractor-xml/src/Contract/XmlFractor.php
similarity index 76%
rename from fractor-xml/src/XmlFractor.php
rename to fractor-xml/src/Contract/XmlFractor.php
index 13f34730..70092c27 100644
--- a/fractor-xml/src/XmlFractor.php
+++ b/fractor-xml/src/Contract/XmlFractor.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace a9f\FractorXml;
+namespace a9f\FractorXml\Contract;
+
+use a9f\FractorXml\DomDocumentIterator;
 
 interface XmlFractor extends DomNodeVisitor
 {
diff --git a/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php b/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php
index 2ab8d8ad..fdcc3c08 100644
--- a/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php
+++ b/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php
@@ -2,8 +2,8 @@
 
 namespace a9f\FractorXml\DependencyInjection;
 
+use a9f\FractorXml\Contract\XmlFractor;
 use a9f\FractorXml\XmlFileProcessor;
-use a9f\FractorXml\XmlFractor;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
diff --git a/fractor-xml/src/DomDocumentIterator.php b/fractor-xml/src/DomDocumentIterator.php
index 9a91980a..79500a5b 100644
--- a/fractor-xml/src/DomDocumentIterator.php
+++ b/fractor-xml/src/DomDocumentIterator.php
@@ -2,6 +2,8 @@
 
 namespace a9f\FractorXml;
 
+use a9f\FractorXml\Contract\DomNodeVisitor;
+
 final class DomDocumentIterator
 {
     /** @var int */
diff --git a/fractor-xml/src/XmlFileProcessor.php b/fractor-xml/src/XmlFileProcessor.php
index 1ecd9f96..061cc1c2 100644
--- a/fractor-xml/src/XmlFileProcessor.php
+++ b/fractor-xml/src/XmlFileProcessor.php
@@ -2,7 +2,8 @@
 
 namespace a9f\FractorXml;
 
-use a9f\Fractor\Fractor\FileProcessor;
+use a9f\Fractor\Contract\FileProcessor;
+use a9f\FractorXml\Contract\XmlFractor;
 
 final class XmlFileProcessor implements FileProcessor
 {
diff --git a/fractor-xml/tests/DomDocumentIteratorTest.php b/fractor-xml/tests/DomDocumentIteratorTest.php
index a552870d..929c9460 100644
--- a/fractor-xml/tests/DomDocumentIteratorTest.php
+++ b/fractor-xml/tests/DomDocumentIteratorTest.php
@@ -2,8 +2,8 @@
 
 namespace a9f\FractorXml\Tests;
 
+use a9f\FractorXml\Contract\DomNodeVisitor;
 use a9f\FractorXml\DomDocumentIterator;
-use a9f\FractorXml\DomNodeVisitor;
 use a9f\FractorXml\Tests\Fixtures\CollectingDomNodeVisitor;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/fractor-xml/tests/Fixtures/CollectingDomNodeVisitor.php b/fractor-xml/tests/Fixtures/CollectingDomNodeVisitor.php
index b32120be..4dab8875 100644
--- a/fractor-xml/tests/Fixtures/CollectingDomNodeVisitor.php
+++ b/fractor-xml/tests/Fixtures/CollectingDomNodeVisitor.php
@@ -2,7 +2,7 @@
 
 namespace a9f\FractorXml\Tests\Fixtures;
 
-use a9f\FractorXml\DomNodeVisitor;
+use a9f\FractorXml\Contract\DomNodeVisitor;
 
 class CollectingDomNodeVisitor implements DomNodeVisitor
 {
diff --git a/fractor/src/Configuration/FractorConfig.php b/fractor/src/Configuration/FractorConfig.php
index 0d395cae..cbc4c56b 100644
--- a/fractor/src/Configuration/FractorConfig.php
+++ b/fractor/src/Configuration/FractorConfig.php
@@ -2,8 +2,8 @@
 
 namespace a9f\Fractor\Configuration;
 
-use a9f\Fractor\Fractor\FileProcessor;
-use a9f\Fractor\Fractor\FractorRule;
+use a9f\Fractor\Contract\FileProcessor;
+use a9f\Fractor\Contract\FractorRule;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 final class FractorConfig extends ContainerBuilder
diff --git a/fractor/src/Fractor/FileProcessor.php b/fractor/src/Contract/FileProcessor.php
similarity index 82%
rename from fractor/src/Fractor/FileProcessor.php
rename to fractor/src/Contract/FileProcessor.php
index a131ecc1..b9982479 100644
--- a/fractor/src/Fractor/FileProcessor.php
+++ b/fractor/src/Contract/FileProcessor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace a9f\Fractor\Fractor;
+namespace a9f\Fractor\Contract;
 
 interface FileProcessor
 {
diff --git a/fractor/src/Fractor/FractorRule.php b/fractor/src/Contract/FractorRule.php
similarity index 51%
rename from fractor/src/Fractor/FractorRule.php
rename to fractor/src/Contract/FractorRule.php
index 5b93798c..e1f5f8a3 100644
--- a/fractor/src/Fractor/FractorRule.php
+++ b/fractor/src/Contract/FractorRule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace a9f\Fractor\Fractor;
+namespace a9f\Fractor\Contract;
 
 interface FractorRule
 {
diff --git a/fractor/src/Fractor/FractorRunner.php b/fractor/src/Fractor/FractorRunner.php
index e882f0dd..43665ccb 100644
--- a/fractor/src/Fractor/FractorRunner.php
+++ b/fractor/src/Fractor/FractorRunner.php
@@ -3,6 +3,7 @@
 namespace a9f\Fractor\Fractor;
 
 use a9f\Fractor\Configuration\FractorConfig;
+use a9f\Fractor\Contract\FileProcessor;
 use a9f\Fractor\FileSystem\FileFinder;
 
 /**