[TASK] Use contract folder for interfaces

andreaswolf · Apr 16, 2024 · 9191716 · 9191716
1 parent aa7c890
commit 9191716
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 11 deletions.
diff --git 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 → fractor-xml/src/Contract/DomNodeVisitor.php b/fractor-xml/src/DomNodeVisitor.php → 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 → fractor-xml/src/Contract/XmlFractor.php b/fractor-xml/src/XmlFractor.php → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → fractor/src/Contract/FileProcessor.php b/fractor/src/Fractor/FileProcessor.php → 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 → fractor/src/Contract/FractorRule.php b/fractor/src/Fractor/FractorRule.php → 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
@@ -3,6 +3,7 @@
 namespace a9f\Fractor\Fractor;
 
 use a9f\Fractor\Configuration\FractorConfig;
+use a9f\Fractor\Contract\FileProcessor;
 use a9f\Fractor\FileSystem\FileFinder;
 
 /**