chop s

chevere · Jun 18, 2020 · f2d6c20 · f2d6c20
1 parent 1d84381
commit f2d6c20
Show file tree

Hide file tree

Showing 32 changed files with 48 additions and 49 deletions.
diff --git a/bin/chevere b/bin/chevere
@@ -19,8 +19,8 @@ use Chevere\Components\Console\Commands\ControllerRunCommand;
 use Chevere\Components\Filesystem\DirFromString;
 use Chevere\Components\Instances\BootstrapInstance;
 use Chevere\Components\Instances\WritersInstance;
-use Chevere\Components\Writers\StreamWriter;
-use Chevere\Components\Writers\Writers;
+use Chevere\Components\Writer\StreamWriter;
+use Chevere\Components\Writer\Writers;
 use Laminas\Diactoros\StreamFactory;
 
 foreach ([

diff --git a/components/Instances/WritersInstance.php b/components/Instances/WritersInstance.php
@@ -15,7 +15,7 @@
 
 use Chevere\Components\Message\Message;
 use Chevere\Exceptions\Core\LogicException;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 
 /**
  * @codeCoverageIgnore

diff --git a/components/Plugin/Plugs/EventListeners/EventListenersRunner.php b/components/Plugin/Plugs/EventListeners/EventListenersRunner.php
@@ -18,7 +18,7 @@
 use Chevere\Interfaces\Plugin\Plugs\EventListener\EventListenersQueueInterface;
 use Chevere\Interfaces\Plugin\Plugs\EventListener\EventListenersRunnerInterface;
 use Chevere\Interfaces\Plugin\PlugsQueueInterface;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 use Throwable;
 
 final class EventListenersRunner implements EventListenersRunnerInterface

diff --git a/components/ThrowableHandler/Handle.php b/components/ThrowableHandler/Handle.php
@@ -21,7 +21,7 @@
 use Chevere\Interfaces\ThrowableHandler\DocumentInterface;
 use Chevere\Interfaces\ThrowableHandler\ThrowableHandlerInterface;
 use Exception;
-use function Chevere\Components\Writers\writers;
+use function Chevere\Components\Writer\writers;
 
 /**
  * @codeCoverageIgnore

diff --git a/components/VarDump/Outputters/AbstractOutputter.php b/components/VarDump/Outputters/AbstractOutputter.php
@@ -14,7 +14,7 @@
 namespace Chevere\Components\VarDump\Outputters;
 
 use Chevere\Interfaces\VarDump\OutputterInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 abstract class AbstractOutputter implements OutputterInterface
 {

diff --git a/components/VarDump/VarDump.php b/components/VarDump/VarDump.php
@@ -16,7 +16,7 @@
 use Chevere\Interfaces\VarDump\FormatterInterface;
 use Chevere\Interfaces\VarDump\OutputterInterface;
 use Chevere\Interfaces\VarDump\VarDumpInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 use function DeepCopy\deep_copy;
 
 final class VarDump implements VarDumpInterface

diff --git a/components/VarDump/VarDumper.php b/components/VarDump/VarDumper.php
@@ -17,7 +17,7 @@
 use Chevere\Interfaces\VarDump\FormatterInterface;
 use Chevere\Interfaces\VarDump\VarDumpableInterface;
 use Chevere\Interfaces\VarDump\VarDumperInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 /**
  * Provides dumping for for variables of any kind of deep.

diff --git a/components/VarDump/VarOutputter.php b/components/VarDump/VarOutputter.php
@@ -19,7 +19,7 @@
 use Chevere\Interfaces\VarDump\OutputterInterface;
 use Chevere\Interfaces\VarDump\VarDumperInterface;
 use Chevere\Interfaces\VarDump\VarOutputterInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 /**
  * Writes information about a variable.

diff --git a/components/VarDump/functions.php b/components/VarDump/functions.php
@@ -62,7 +62,7 @@ function getVarDumpHtml(): VarDumpInterface
 namespace {
     use Chevere\Components\Instances\VarDumpInstance;
     use Chevere\Components\Instances\WritersInstance;
-    use Chevere\Components\Writers\Writers;
+    use Chevere\Components\Writer\Writers;
     use function Chevere\Components\VarDump\getVarDumpConsole;
 
     if (function_exists('xd') === false) { // @codeCoverageIgnore

diff --git a/components/Writers/NullWriter.php → components/Writer/NullWriter.php b/components/Writers/NullWriter.php → components/Writer/NullWriter.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Writers;
+namespace Chevere\Components\Writer;
 
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 final class NullWriter implements WriterInterface
 {

diff --git a/components/Writers/StreamWriter.php → components/Writer/StreamWriter.php b/components/Writers/StreamWriter.php → components/Writer/StreamWriter.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Writers;
+namespace Chevere\Components\Writer;
 
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 use Psr\Http\Message\StreamInterface;
 
 final class StreamWriter implements WriterInterface

diff --git a/...onents/Writers/StreamWriterFromString.php → components/Writer/StreamWriterFromString.php b/...onents/Writers/StreamWriterFromString.php → components/Writer/StreamWriterFromString.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Writers;
+namespace Chevere\Components\Writer;
 
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 use Laminas\Diactoros\Stream;
 use Laminas\Diactoros\StreamFactory;
 use Psr\Http\Message\StreamInterface;

diff --git a/components/Writers/Writers.php → components/Writer/Writers.php b/components/Writers/Writers.php → components/Writer/Writers.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Writers;
+namespace Chevere\Components\Writer;
 
 use Chevere\Components\Message\Message;
 use Chevere\Exceptions\Core\RuntimeException;
-use Chevere\Interfaces\Writers\WriterInterface;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 use Laminas\Diactoros\Stream;
 
 final class Writers implements WritersInterface

diff --git a/components/Writers/functions.php → components/Writer/functions.php b/components/Writers/functions.php → components/Writer/functions.php
@@ -11,11 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Components\Writers;
+namespace Chevere\Components\Writer;
 
 use Chevere\Components\Instances\WritersInstance;
-use Chevere\Interfaces\Writers\WritersInterface;
-use Exception;
+use Chevere\Interfaces\Writer\WritersInterface;
 
 /**
  * @codeCoverageIgnore

diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "files": [
             "components/Type/functions.php",
             "components/VarDump/functions.php",
-            "components/Writers/functions.php"
+            "components/Writer/functions.php"
         ],
         "psr-4": {
             "Chevere\\Components\\": "components/",
@@ -53,4 +53,4 @@
     "bin": [
         "bin/chevere"
     ]
-}
+}
diff --git a/interfaces/Plugin/Plugs/EventListener/EventListenerInterface.php b/interfaces/Plugin/Plugs/EventListener/EventListenerInterface.php
@@ -14,7 +14,7 @@
 namespace Chevere\Interfaces\Plugin\Plugs\EventListener;
 
 use Chevere\Interfaces\Plugin\PlugInterface;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 
 interface EventListenerInterface extends PlugInterface
 {

diff --git a/interfaces/Plugin/Plugs/EventListener/EventListenersRunnerInterface.php b/interfaces/Plugin/Plugs/EventListener/EventListenersRunnerInterface.php
@@ -14,7 +14,7 @@
 namespace Chevere\Interfaces\Plugin\Plugs\EventListener;
 
 use Chevere\Components\Plugin\Plugs\EventListeners\EventListenersQueue;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 
 interface EventListenersRunnerInterface
 {

diff --git a/interfaces/VarDump/OutputterInterface.php b/interfaces/VarDump/OutputterInterface.php
@@ -13,7 +13,7 @@
 
 namespace Chevere\Interfaces\VarDump;
 
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 interface OutputterInterface
 {

diff --git a/interfaces/VarDump/VarDumpInterface.php b/interfaces/VarDump/VarDumpInterface.php
@@ -13,7 +13,7 @@
 
 namespace Chevere\Interfaces\VarDump;
 
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 interface VarDumpInterface
 {

diff --git a/interfaces/VarDump/VarDumperInterface.php b/interfaces/VarDump/VarDumperInterface.php
@@ -22,7 +22,7 @@
 use Chevere\Components\VarDump\Processors\ResourceProcessor;
 use Chevere\Components\VarDump\Processors\StringProcessor;
 use Chevere\Interfaces\Type\TypeInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 
 interface VarDumperInterface
 {

diff --git a/interfaces/Writers/WriterInterface.php → interfaces/Writer/WriterInterface.php b/interfaces/Writers/WriterInterface.php → interfaces/Writer/WriterInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Interfaces\Writers;
+namespace Chevere\Interfaces\Writer;
 
 use Chevere\Interfaces\To\ToStringInterface;
 

diff --git a/interfaces/Writers/WritersInterface.php → interfaces/Writer/WritersInterface.php b/interfaces/Writers/WritersInterface.php → interfaces/Writer/WritersInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Interfaces\Writers;
+namespace Chevere\Interfaces\Writer;
 
 interface WritersInterface
 {

diff --git a/tests/Plugin/Plugs/EventListeners/EventListenersRunnerTest.php b/tests/Plugin/Plugs/EventListeners/EventListenersRunnerTest.php
@@ -15,8 +15,8 @@
 
 use Chevere\Components\Plugin\Plugs\EventListeners\EventListenersQueue;
 use Chevere\Components\Plugin\Plugs\EventListeners\EventListenersRunner;
-use Chevere\Components\Writers\StreamWriter;
-use Chevere\Components\Writers\Writers;
+use Chevere\Components\Writer\StreamWriter;
+use Chevere\Components\Writer\Writers;
 use Chevere\Tests\Plugin\Plugs\EventListeners\_resources\TestEventListener;
 use Laminas\Diactoros\StreamFactory;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Plugin/Plugs/EventListeners/EventedTest.php b/tests/Plugin/Plugs/EventListeners/EventedTest.php
@@ -15,8 +15,8 @@
 
 use Chevere\Components\Plugin\Plugs\EventListeners\EventListenersQueue;
 use Chevere\Components\Plugin\Plugs\EventListeners\EventListenersRunner;
-use Chevere\Components\Writers\StreamWriter;
-use Chevere\Components\Writers\Writers;
+use Chevere\Components\Writer\StreamWriter;
+use Chevere\Components\Writer\Writers;
 use Chevere\Tests\Plugin\Plugs\EventListeners\_resources\TestEventable;
 use Chevere\Tests\Plugin\Plugs\EventListeners\_resources\TestEventListener;
 use Laminas\Diactoros\StreamFactory;

diff --git a/tests/Plugin/Plugs/EventListeners/_resources/TestEventListener.php b/tests/Plugin/Plugs/EventListeners/_resources/TestEventListener.php
@@ -14,7 +14,7 @@
 namespace Chevere\Tests\Plugin\Plugs\EventListeners\_resources;
 
 use Chevere\Interfaces\Plugin\Plugs\EventListener\EventListenerInterface;
-use Chevere\Interfaces\Writers\WritersInterface;
+use Chevere\Interfaces\Writer\WritersInterface;
 use Chevere\Tests\Plugin\Plugs\EventListeners\_resources\TestEventable;
 
 final class TestEventListener implements EventListenerInterface

diff --git a/tests/VarDump/Traits/VarDumperTrait.php b/tests/VarDump/Traits/VarDumperTrait.php
@@ -16,7 +16,7 @@
 use Chevere\Components\VarDump\Formatters\PlainFormatter;
 use Chevere\Components\VarDump\VarDumpable;
 use Chevere\Components\VarDump\VarDumper;
-use Chevere\Components\Writers\StreamWriter;
+use Chevere\Components\Writer\StreamWriter;
 use Chevere\Interfaces\VarDump\VarDumperInterface;
 use Laminas\Diactoros\StreamFactory;
 

diff --git a/tests/VarDump/VarDumpTest.php b/tests/VarDump/VarDumpTest.php
@@ -16,9 +16,9 @@
 use Chevere\Components\VarDump\Formatters\PlainFormatter;
 use Chevere\Components\VarDump\Outputters\PlainOutputter;
 use Chevere\Components\VarDump\VarDump;
-use Chevere\Components\Writers\StreamWriter;
+use Chevere\Components\Writer\StreamWriter;
 use Chevere\Interfaces\VarDump\VarDumpInterface;
-use Chevere\Interfaces\Writers\WriterInterface;
+use Chevere\Interfaces\Writer\WriterInterface;
 use Laminas\Diactoros\StreamFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;

diff --git a/tests/VarDump/VarOutputterTest.php b/tests/VarDump/VarOutputterTest.php
@@ -21,7 +21,7 @@
 use Chevere\Components\VarDump\Outputters\HtmlOutputter;
 use Chevere\Components\VarDump\Outputters\PlainOutputter;
 use Chevere\Components\VarDump\VarOutputter;
-use Chevere\Components\Writers\StreamWriter;
+use Chevere\Components\Writer\StreamWriter;
 use Chevere\Tests\VarDump\Traits\DebugBacktraceTrait;
 use Laminas\Diactoros\StreamFactory;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Writers/NullWriterTest.php → tests/Writer/NullWriterTest.php b/tests/Writers/NullWriterTest.php → tests/Writer/NullWriterTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Tests\Writers;
+namespace Chevere\Tests\Writer;
 
-use Chevere\Components\Writers\NullWriter;
+use Chevere\Components\Writer\NullWriter;
 use PHPUnit\Framework\TestCase;
 
 final class NullWriterTest extends TestCase

diff --git a/tests/Writers/StreamWriterTest.php → tests/Writer/StreamWriterTest.php b/tests/Writers/StreamWriterTest.php → tests/Writer/StreamWriterTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Tests\Writers;
+namespace Chevere\Tests\Writer;
 
-use Chevere\Components\Writers\StreamWriter;
+use Chevere\Components\Writer\StreamWriter;
 use Laminas\Diactoros\StreamFactory;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/Writers/WritersTest.php → tests/Writer/WritersTest.php b/tests/Writers/WritersTest.php → tests/Writer/WritersTest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Chevere\Tests\Writers;
+namespace Chevere\Tests\Writer;
 
-use Chevere\Interfaces\Writers\WriterInterface;
-use Chevere\Components\Writers\StreamWriter;
-use Chevere\Components\Writers\Writers;
+use Chevere\Interfaces\Writer\WriterInterface;
+use Chevere\Components\Writer\StreamWriter;
+use Chevere\Components\Writer\Writers;
 use Laminas\Diactoros\StreamFactory;
 use PHPUnit\Framework\TestCase;
 

diff --git a/trash/utils/http2.php b/trash/utils/http2.php
@@ -18,7 +18,7 @@
 use Chevere\Components\Filesystem\Path;
 use Chevere\Components\Instances\BootstrapInstance;
 use Chevere\Components\Instances\WritersInstance;
-use Chevere\Components\Writers\Writers;
+use Chevere\Components\Writer\Writers;
 use Chevere\TestApp\App\Controllers\TestController;
 use Ds\Map;
 use Spiral\Goridge;