Getting start for 7

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
-  - '7.4'
+  - '8.0'
 
 git:
   depth: 1

composer.json

@@ -41,7 +41,7 @@
 	],
 	"autoload" : {
 		"psr-4" : {
-			"Pluf\\" : "src/"
+			"Pluf\\Core\\" : "src/"
 		}
 	},
 	"autoload-dev" : {

src/Exception.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-namespace Pluf;
+namespace Pluf\Core;
 
 use Throwable;
 use JsonSerializable;

src/Exception/InvalidBodyContentException.php

@@ -0,0 +1,7 @@
+<?php
+namespace Pluf\Core\Exception;
+
+class InvalidBodyContentException extends \Pluf\Core\Exception
+{
+}
+

src/Exception/ResourceNotFoundException.php

@@ -0,0 +1,14 @@
+<?php
+namespace Pluf\Core\Exception;
+
+use Throwable;
+
+class ResourceNotFoundException extends \Pluf\Core\Exception
+{
+
+    public function __construct($message = '', ?int $code = null, ?Throwable $previous = null, ?int $status = 404, ?array $params = [], ?array $solutions = [])
+    {
+        parent::__construct($message, $code, $previous, $status, $params, $solutions);
+    }
+}
+

src/Exception/UnhandledException.php

@@ -0,0 +1,14 @@
+<?php
+namespace Pluf\Core\Exception;
+
+use Throwable;
+
+class UnhandledException extends \Pluf\Core\Exception
+{
+
+    public function __construct($message = '', ?int $code = null, ?Throwable $previous = null, ?int $status = 500, ?array $params = [], ?array $solutions = [])
+    {
+        parent::__construct($message, $code, $previous, $status, $params, $solutions);
+    }
+}
+

src/ExceptionBuilder.php

@@ -1,5 +1,5 @@
 <?php
-namespace Pluf;
+namespace Pluf\Core;
 
 use Throwable;
 

src/Process/Http/AccessLog.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\RequestInterface;

src/Process/Http/FileToResponse.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\ResponseInterface;

src/Process/Http/IfMethodIs.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\RequestInterface;

src/Process/Http/IfMethodIsDelete.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 class IfMethodIsDelete extends IfMethodIs
 {

src/Process/Http/IfMethodIsGet.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 class IfMethodIsGet extends IfMethodIs
 {

src/Process/Http/IfMethodIsPost.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 class IfMethodIsPost extends IfMethodIs
 {

src/Process/Http/IfMethodIsPut.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 class IfMethodIsPut extends IfMethodIs
 {

src/Process/Http/IfPathAndMethodIs.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\RequestInterface;

src/Process/Http/IfPathIs.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\RequestInterface;

src/Process/Http/RequestBodyParser.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Pluf\Scion\Process\Http\Exception\InvalidBodyContentException;
@@ -81,8 +81,6 @@ public function __invoke(ServerRequestInterface $request, UnitTrackerInterface $
                         throw new InvalidBodyContentException("Not supported content type: " . $parsedContentType);
                 }
             }
-
-            var_dump($request->getParsedBody());
         }
         // run pipeline
         return $unitTracker->next([

src/Process/Http/ResourceNotFoundException.php → src/Process/Http/ResourceNotFound.php

@@ -16,7 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pluf\Core\Exception\ResourceNotFoundException;
 
 /**
  * Throw exception and break to path
@@ -25,12 +28,16 @@
  * @author maso ([email protected])
  *        
  */
-class ResourceNotFoundException
+class ResourceNotFound
 {
 
-    public function __invoke()
+    public function __invoke(ServerRequestInterface $request)
     {
-        throw new \Exception("Resouce not found");
+        throw new ResourceNotFoundException("Requested resouce not found : {{resource}}",
+            status: 404,
+            params:[
+                "resource" => $request?->getUri()?->getPath()
+            ]);
     }
 }
 

src/Process/Http/ResponseBodyEncoder.php

@@ -16,33 +16,50 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-namespace Pluf\Process\Http;
+namespace Pluf\Core\Process\Http;
 
 use Pluf\Scion\UnitTrackerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Log\LoggerInterface;
+use Pluf\Core\Exception;
 
 class ResponseBodyEncoder
 {
 
-    // 
+    //
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, StreamFactoryInterface $streamFactory, LoggerInterface $logger, UnitTrackerInterface $unitTracker)
     {
         $result = "";
+        $status = 200;
         try {
             $result = $unitTracker->next();
         } catch (Throwable $t) {
-            $response = $response->withStatus(500);
+            if (! ($t instanceof Exception)) {
+                $ex = new Exception\UnhandledException(
+                    message: $t->getMessage(), 
+                    previous: $t);
+            } else {
+                $ex = $t;
+            }
+
+            $status = $ex->getStatus();
+            // TODO: maso, 2021: enable exception json annotations
             $result = [
                 'message' => $t->getMessage()
             ];
         }
-
+
+        // TODO: maso, 2021: support objectMapper
+        // $supportMime = $request->getHeader("Accepted");
         $resultEncode = json_encode($result);
-        return $response->withBody($streamFactory->createStream($resultEncode));
+        $contentType = 'application/json';
+
+        return $response->withStatus($status)
+            ->withHeader("Content-Type", $contentType)
+            ->withBody($streamFactory->createStream($resultEncode));
     }
 }
 

tests/Process/Http/AccessLogTest.php

@@ -20,10 +20,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Pluf\Scion\UnitTrackerInterface;
-use Pluf\Scion\Process\Http\AccessLog;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
+use Pluf\Core\Process\Http\AccessLog;
 
 /**
  * AccessLog test case.

tests/Process/Http/FileToResponseTest.php

@@ -2,10 +2,10 @@
 namespace Pluf\Tests\Process\Http;
 
 use PHPUnit\Framework\TestCase;
+use Pluf\Core\Process\Http\FileToResponse;
 use Pluf\Http\ResponseFactory;
 use Pluf\Http\ServerRequestFactory;
 use Pluf\Scion\UnitTrackerInterface;
-use Pluf\Scion\Process\Http\FileToResponse;
 
 class FileToResponseTest extends TestCase
 {

tests/Process/Http/IfMethodIsTest.php

@@ -20,12 +20,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Pluf\Scion\UnitTrackerInterface;
-use Pluf\Scion\Process\Http\IfMethodIsDelete;
-use Pluf\Scion\Process\Http\IfMethodIsGet;
-use Pluf\Scion\Process\Http\IfMethodIsPost;
 use Psr\Http\Message\RequestInterface;
-use Pluf\Scion\Process\Http\IfMethodIsPut;
-use Pluf\Scion\Process\Http\IfMethodIs;
+
+use Pluf\Core\Process\Http\IfMethodIsDelete;
+use Pluf\Core\Process\Http\IfMethodIsGet;
+use Pluf\Core\Process\Http\IfMethodIsPost;
+use Pluf\Core\Process\Http\IfMethodIsPut;
+use Pluf\Core\Process\Http\IfMethodIs;
 
 /**
  * IfMethodIsDelete test case.

tests/Process/Http/IfPathAndMethodIsTest.php

@@ -21,7 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use Pluf\Http\UriFactory;
 use Pluf\Scion\UnitTrackerInterface;
-use Pluf\Scion\Process\Http\IfPathAndMethodIs;
+use Pluf\Core\Process\Http\IfPathAndMethodIs;
 use Psr\Http\Message\RequestInterface;
 
 /**

tests/Process/Http/IfPathIsTest.php

@@ -21,7 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use Pluf\Http\UriFactory;
 use Pluf\Scion\UnitTrackerInterface;
-use Pluf\Scion\Process\Http\IfPathIs;
+use Pluf\Core\Process\Http\IfPathIs;
 use Psr\Http\Message\RequestInterface;
 
 /**

tests/Process/Http/RequestBodyParserTest.php

@@ -6,7 +6,7 @@
 use Pluf\Http\StreamFactory;
 use Pluf\Http\UriFactory;
 use Pluf\Scion\UnitTracker;
-use Pluf\Scion\Process\Http\RequestBodyParser;
+use Pluf\Core\Process\Http\RequestBodyParser;
 use Pluf\Tests\Process\Http\Mock\ReturnRequestParsedBody;
 
 class RequestBodyParserTest extends TestCase