update php ze-ph samples

2019-01-31 10:07:18 +08:00
parent 2eb99f602a
commit 562442764a
29 changed files with 80 additions and 44 deletions
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/XmlItem.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/XmlItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);

 namespace App\DTO;

--- a/samples/server/petstore/php-ze-ph/src/App/ErrorMiddleware.php
+++ b/samples/server/petstore/php-ze-ph/src/App/ErrorMiddleware.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App;
+
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Stdlib\ErrorHandler;
+
+class ErrorMiddleware implements MiddlewareInterface
+{
+    public function process(Request $request, DelegateInterface $delegate)
+    {
+        $result = null;
+        try {
+            ErrorHandler::start();
+            $result = $delegate->process($request);
+            ErrorHandler::stop(true);
+            if (!($result instanceof Response)) {
+                throw new \RuntimeException(sprintf(
+                    'Invalid response: expecting %s, got %s',
+                    Response::class,
+                    is_object($result)? get_class($result) : gettype($result)
+                ));
+            }
+        }
+        catch (\Exception $error) {
+            $result = (new \Zend\Diactoros\Response())->withStatus(500, 'Internal server error');
+            error_log((string)$error);
+        }
+        return $result;
+    }
+}
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/AnotherFakeDummy.php
@@ -17,7 +17,7 @@ class AnotherFakeDummy
 {
    /**
     * To test special tags
-     * @PHA\Patch()
+     * @PHA\handlePatch
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Fake.php
@@ -17,7 +17,7 @@ class Fake
 {
    /**
     * To test \&quot;client\&quot; model
-     * @PHA\Patch()
+     * @PHA\handlePatch
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
@@ -38,7 +38,7 @@ class Fake
    }
    /**
     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
-     * @PHA\Post()
+     * @PHA\handlePost
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
@@ -50,7 +50,7 @@ class Fake
    }
    /**
     * To test enum parameters
-     * @PHA\Get()
+     * @PHA\handleGet
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
@@ -62,7 +62,7 @@ class Fake
    }
    /**
     * Fake endpoint to test group parameters (optional)
-     * @PHA\Delete()
+     * @PHA\handleDelete
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithFileSchema.php
@@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeBodyWithFileSchema
 {
    /**
-     * @PHA\Put()
+     * @PHA\handlePut
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\FileSchemaTestClass::class,"objectAttr":"bodyData"})
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeBodyWithQueryParams.php
@@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeBodyWithQueryParams
 {
    /**
-     * @PHA\Put()
+     * @PHA\handlePut
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeClassnameTest.php
@@ -17,7 +17,7 @@ class FakeClassnameTest
 {
    /**
     * To test class name in snake case
-     * @PHA\Patch()
+     * @PHA\handlePatch
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Client::class,"objectAttr":"bodyData"})
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeCreateXmlItem.php
@@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);

 namespace App\Handler;

-use Articus\PathHandler\Operation;
 use Articus\PathHandler\Annotation as PHA;
 use Articus\PathHandler\Consumer as PHConsumer;
 use Articus\PathHandler\Producer as PHProducer;
@@ -13,10 +13,11 @@ use Psr\Http\Message\ServerRequestInterface;
 /**
 * @PHA\Route(pattern="/fake/create_xml_item")
 */
-class FakeCreateXmlItem implements Operation\PostInterface
+class FakeCreateXmlItem
 {
    /**
     * creates an XmlItem
+     * @PHA\handlePost
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/xml")
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
@@ -32,13 +33,13 @@ class FakeCreateXmlItem implements Operation\PostInterface
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\XmlItem::class,"objectAttr":"bodyData"})
     * @param ServerRequestInterface $request
     *
-     * @throws PHException\HttpCode 500 if the method is not implemented
+     * @throws PHException\HttpCode 501 if the method is not implemented
     */
-    public function handlePost(ServerRequestInterface $request)
+    public function createXmlItem(ServerRequestInterface $request)
    {
        //TODO implement method
        /** @var \App\DTO\XmlItem $bodyData */
        $bodyData = $request->getAttribute("bodyData");
-        throw new PHException\HttpCode(500, "Not implemented");
+        throw new PHException\HttpCode(501, "Not implemented");
    }
 }
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeInlineAdditionalProperties.php
@@ -17,7 +17,7 @@ class FakeInlineAdditionalProperties
 {
    /**
     * test inline additionalProperties
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * TODO check if attribute is valid and can handle your container type
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeJsonFormData.php
@@ -17,7 +17,7 @@ class FakeJsonFormData
 {
    /**
     * test json serialization of form data
-     * @PHA\Get()
+     * @PHA\handleGet
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterBoolean.php
@@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeOuterBoolean
 {
    /**
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*")
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterComposite.php
@@ -16,10 +16,10 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeOuterComposite
 {
    /**
-     * @PHA\Post()
+     * @PHA\handlePost
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\OuterComposite::class,"objectAttr":"bodyData"})
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*")
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterNumber.php
@@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeOuterNumber
 {
    /**
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*")
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakeOuterString.php
@@ -16,9 +16,9 @@ use Psr\Http\Message\ServerRequestInterface;
 class FakeOuterString
 {
    /**
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
-     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="n/a")
+     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="*/*")
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/FakePetIdUploadImageWithRequiredFile.php
@@ -17,7 +17,7 @@ class FakePetIdUploadImageWithRequiredFile
 {
    /**
     * uploads an image (required)
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
     * @param ServerRequestInterface $request
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/Pet.php
@@ -17,7 +17,7 @@ class Pet
 {
    /**
     * Add a new pet to the store
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
@@ -36,7 +36,7 @@ class Pet
    }
    /**
     * Update an existing pet
-     * @PHA\Put()
+     * @PHA\handlePut
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Consumer(name=PHConsumer\Json::class, mediaType="application/json")
     * TODO check if consumer is valid, if it has correct priority and if it can be moved to class annotation
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByStatus.php
@@ -17,7 +17,7 @@ class PetFindByStatus
 {
    /**
     * Finds Pets by status
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetFindByTags.php
@@ -17,7 +17,7 @@ class PetFindByTags
 {
    /**
     * Finds Pets by tags
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetId.php
@@ -17,7 +17,7 @@ class PetPetId
 {
    /**
     * Deletes a pet
-     * @PHA\Delete()
+     * @PHA\handleDelete
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
@@ -29,7 +29,7 @@ class PetPetId
    }
    /**
     * Find pet by ID
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
@@ -47,7 +47,7 @@ class PetPetId
    }
    /**
     * Updates a pet in the store with form data
-     * @PHA\Post()
+     * @PHA\handlePost
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/PetPetIdUploadImage.php
@@ -17,7 +17,7 @@ class PetPetIdUploadImage
 {
    /**
     * uploads an image
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
     * @param ServerRequestInterface $request
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreInventory.php
@@ -17,7 +17,7 @@ class StoreInventory
 {
    /**
     * Returns pet inventories by status
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/json")
     * @param ServerRequestInterface $request
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrder.php
@@ -17,7 +17,7 @@ class StoreOrder
 {
    /**
     * Place an order for a pet
-     * @PHA\Post()
+     * @PHA\handlePost
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\Order::class,"objectAttr":"bodyData"})
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/StoreOrderOrderId.php
@@ -17,7 +17,7 @@ class StoreOrderOrderId
 {
    /**
     * Delete purchase order by ID
-     * @PHA\Delete()
+     * @PHA\handleDelete
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
@@ -29,7 +29,7 @@ class StoreOrderOrderId
    }
    /**
     * Find purchase order by ID
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/User.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/User.php
@@ -17,7 +17,7 @@ class User
 {
    /**
     * Create user
-     * @PHA\Post()
+     * @PHA\handlePost
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
     * @param ServerRequestInterface $request
     *
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithArray.php
@@ -17,7 +17,7 @@ class UserCreateWithArray
 {
    /**
     * Creates list of users with given input array
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if attribute is valid and can handle your container type
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"})
     * @param ServerRequestInterface $request
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserCreateWithList.php
@@ -17,7 +17,7 @@ class UserCreateWithList
 {
    /**
     * Creates list of users with given input array
-     * @PHA\Post()
+     * @PHA\handlePost
     * TODO check if attribute is valid and can handle your container type
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"\App\DTO\User[]","objectAttr":"bodyData"})
     * @param ServerRequestInterface $request
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogin.php
@@ -17,7 +17,7 @@ class UserLogin
 {
    /**
     * Logs user into the system
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserLogout.php
@@ -17,7 +17,7 @@ class UserLogout
 {
    /**
     * Logs out current logged in user session
-     * @PHA\Get()
+     * @PHA\handleGet
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
--- a/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php
+++ b/samples/server/petstore/php-ze-ph/src/App/Handler/UserUsername.php
@@ -17,7 +17,7 @@ class UserUsername
 {
    /**
     * Delete user
-     * @PHA\Delete()
+     * @PHA\handleDelete
     * @param ServerRequestInterface $request
     *
     * @throws PHException\HttpCode 501 if the method is not implemented
@@ -29,7 +29,7 @@ class UserUsername
    }
    /**
     * Get user by user name
-     * @PHA\Get()
+     * @PHA\handleGet
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
     * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="application/xml")
     * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
@@ -47,7 +47,7 @@ class UserUsername
    }
    /**
     * Updated user
-     * @PHA\Put()
+     * @PHA\handlePut
     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":\App\DTO\User::class,"objectAttr":"bodyData"})
     * @param ServerRequestInterface $request
     *