Merge pull request #22 from clue-labs/psr4

Update to use PSR-4 autoloader
clue · Aug 7, 2024 · 4045870 · 4045870
2 parents 4320803 + e19b89d
commit 4045870
Show file tree

Hide file tree

Showing 30 changed files with 40 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
     },
     "autoload": {
-        "psr-0": {
-            "Clue\\Redis\\Protocol": "src/"
+        "psr-4": {
+            "Clue\\Redis\\Protocol\\": "src/"
         }
     }    ,
     "autoload-dev": {
-        "psr-0": {
-            "": "tests/"
+        "psr-4": {
+            "Clue\\Tests\\Redis\\Protocol\\": "tests/"
         }
     }
 }
diff --git a/src/Clue/Redis/Protocol/Factory.php → src/Factory.php b/src/Clue/Redis/Protocol/Factory.php → src/Factory.php
diff --git a/src/Clue/Redis/Protocol/Model/BulkReply.php → src/Model/BulkReply.php b/src/Clue/Redis/Protocol/Model/BulkReply.php → src/Model/BulkReply.php
diff --git a/src/Clue/Redis/Protocol/Model/ErrorReply.php → src/Model/ErrorReply.php b/src/Clue/Redis/Protocol/Model/ErrorReply.php → src/Model/ErrorReply.php
diff --git a/...lue/Redis/Protocol/Model/IntegerReply.php → src/Model/IntegerReply.php b/...lue/Redis/Protocol/Model/IntegerReply.php → src/Model/IntegerReply.php
diff --git a/...e/Redis/Protocol/Model/ModelInterface.php → src/Model/ModelInterface.php b/...e/Redis/Protocol/Model/ModelInterface.php → src/Model/ModelInterface.php
diff --git a/...e/Redis/Protocol/Model/MultiBulkReply.php → src/Model/MultiBulkReply.php b/...e/Redis/Protocol/Model/MultiBulkReply.php → src/Model/MultiBulkReply.php
diff --git a/src/Clue/Redis/Protocol/Model/Request.php → src/Model/Request.php b/src/Clue/Redis/Protocol/Model/Request.php → src/Model/Request.php
diff --git a/...Clue/Redis/Protocol/Model/StatusReply.php → src/Model/StatusReply.php b/...Clue/Redis/Protocol/Model/StatusReply.php → src/Model/StatusReply.php
diff --git a/...e/Redis/Protocol/Parser/MessageBuffer.php → src/Parser/MessageBuffer.php b/...e/Redis/Protocol/Parser/MessageBuffer.php → src/Parser/MessageBuffer.php
diff --git a/...Redis/Protocol/Parser/ParserException.php → src/Parser/ParserException.php b/...Redis/Protocol/Parser/ParserException.php → src/Parser/ParserException.php
diff --git a/...Redis/Protocol/Parser/ParserInterface.php → src/Parser/ParserInterface.php b/...Redis/Protocol/Parser/ParserInterface.php → src/Parser/ParserInterface.php
diff --git a/...e/Redis/Protocol/Parser/RequestParser.php → src/Parser/RequestParser.php b/...e/Redis/Protocol/Parser/RequestParser.php → src/Parser/RequestParser.php
diff --git a/.../Redis/Protocol/Parser/ResponseParser.php → src/Parser/ResponseParser.php b/.../Redis/Protocol/Parser/ResponseParser.php → src/Parser/ResponseParser.php
diff --git a/...otocol/Serializer/RecursiveSerializer.php → src/Serializer/RecursiveSerializer.php b/...otocol/Serializer/RecursiveSerializer.php → src/Serializer/RecursiveSerializer.php
diff --git a/...otocol/Serializer/SerializerInterface.php → src/Serializer/SerializerInterface.php b/...otocol/Serializer/SerializerInterface.php → src/Serializer/SerializerInterface.php
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol;
+
 use Clue\Redis\Protocol\Factory;
 
 class FactoryTest extends TestCase

diff --git a/tests/Model/AbstractModelTest.php b/tests/Model/AbstractModelTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractModelTest extends TestCase
 {

diff --git a/tests/Model/BulkReplyTest.php b/tests/Model/BulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\BulkReply;
 
 class BulkReplyTest extends AbstractModelTest

diff --git a/tests/Model/ErrorReplyTest.php b/tests/Model/ErrorReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\ErrorReply;
 
 class ErrorReplyTest extends AbstractModelTest

diff --git a/tests/Model/IntegerReplyTest.php b/tests/Model/IntegerReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\IntegerReply;
 
 class IntegerReplyTest extends AbstractModelTest

diff --git a/tests/Model/MultiBulkReplyTest.php b/tests/Model/MultiBulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
 use Clue\Redis\Protocol\Model\MultiBulkReply;

diff --git a/tests/Model/RequestTest.php b/tests/Model/RequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\Request;
 
 class RequestTest extends AbstractModelTest

diff --git a/tests/Model/StatusReplyTest.php b/tests/Model/StatusReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\StatusReply;
 
 class StatusReplyTest extends AbstractModelTest

diff --git a/tests/Parser/AbstractParserTest.php b/tests/Parser/AbstractParserTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\MessageBuffer;
 use Clue\Redis\Protocol\Parser\ParserInterface;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractParserTest extends TestCase
 {

diff --git a/tests/Parser/RequestParserTest.php b/tests/Parser/RequestParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Model\Request;
 use Clue\Redis\Protocol\Parser\RequestParser;
 

diff --git a/tests/Parser/ResponseParserTest.php b/tests/Parser/ResponseParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\ResponseParser;
 
 class ResponseParserTest extends AbstractParserTest

diff --git a/tests/Serializer/AbstractSerializerTest.php b/tests/Serializer/AbstractSerializerTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractSerializerTest extends TestCase
 {
@@ -88,10 +91,10 @@ public function testArrayMultiBulkReply()
 
     public function testErrorReply()
     {
-        $model = $this->serializer->createReplyModel(new Exception('ERR failure'));
+        $model = $this->serializer->createReplyModel(new \Exception('ERR failure'));
         $this->assertInstanceOf('Clue\Redis\Protocol\Model\ErrorReply', $model);
         $this->assertEquals('ERR failure', $model->getValueNative());
-        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new Exception('ERR failure')));
+        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new \Exception('ERR failure')));
     }
 
     public function testInvalidArgument()

diff --git a/tests/Serializer/RecursiveSerializerTest.php b/tests/Serializer/RecursiveSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
 
 class RecursiveSerializerTest extends AbstractSerializerTest

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,10 @@
 <?php
 
-class TestCase extends \PHPUnit\Framework\TestCase
+namespace Clue\Tests\Redis\Protocol;
+
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase
 {
     public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
     {