Merge pull request #10 from hetg/feature/add-fixtures

Feature/add fixtures

Author: hetg

README.md

@@ -1,6 +1,6 @@
 # JWT + FOS User + FOS REST template
 
-**Instalation**
+**Installation**
 
 1. Generate the SSH keys:
     ```
@@ -22,9 +22,5 @@
     ```
 5. Create admin user
     ```
-    bin/console fos:user:create
-    ```
-6. Promote admin user to admin role (ROLE_SUPER_ADMIN)
-    ```
-    bin/console fos:user:promote
-    ```
+    bin/console doctrine:fixtures:load
+    ```

composer.json

@@ -4,7 +4,7 @@
     "type": "project",
     "license": "proprietary",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-openssl": "*",
@@ -78,5 +78,8 @@
             "allow-contrib": false,
             "require": "4.4.*"
         }
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.4"
     }
 }

composer.lock

@@ -14,4 +14,5 @@
     Gesdinet\JWTRefreshTokenBundle\GesdinetJWTRefreshTokenBundle::class => ['all' => true],
     Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Nelmio\ApiDocBundle\NelmioApiDocBundle::class => ['all' => true],
+    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
 ];

config/bundles.php

@@ -1,9 +1,17 @@
 nelmio_api_doc:
     documentation:
         info:
-            title: App
-            #description: This is an awesome app!
-            version: 1.0.0
+            title: Symfony JWT App
+            version: 0.0.1
+        securityDefinitions:
+            Bearer:
+                type: apiKey
+                description: 'Authorization: Bearer {jwt}'
+                name: Authorization
+                in: header
+                scheme: Bearer
+        security:
+            - Bearer: []
     areas:
         path_patterns:
-            - ^/api(?!/doc$)
+            - ^/api(?!/doc$)

config/packages/nelmio_api_doc.yaml

@@ -25,3 +25,15 @@ services:
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
+
+    api_exceptions_subscriber:
+        class: App\EventListener\ApiExceptionsSubscriber
+        arguments: []
+        tags:
+            - { name: kernel.event_subscriber }
+
+    attach_user_id_on_success_listener:
+        class: App\EventListener\AttachUserIdOnSuccessListener
+        arguments: []
+        tags:
+            - { name: kernel.event_listener, event: lexik_jwt_authentication.on_authentication_success, method: attachUserId }

config/services.yaml

@@ -3,8 +3,9 @@
 namespace App\ArgumentResolver;
 
 use App\DTO\PaginateConditions;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Generator;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
@@ -13,12 +14,12 @@
 class PaginateConditionsResolver implements ArgumentValueResolverInterface
 {
     /**
-     * @param Request          $request
+     * @param Request $request
      * @param ArgumentMetadata $argument
      *
      * @return bool
      */
-    public function supports(Request $request, ArgumentMetadata $argument)
+    public function supports(Request $request, ArgumentMetadata $argument): bool
     {
         if (null === $argument->getType()) {
             return false;
@@ -32,12 +33,12 @@ public function supports(Request $request, ArgumentMetadata $argument)
     }
 
     /**
-     * @param Request          $request
+     * @param Request $request
      * @param ArgumentMetadata $argument
      *
-     * @return \Generator
+     * @return Generator
      */
-    public function resolve(Request $request, ArgumentMetadata $argument)
+    public function resolve(Request $request, ArgumentMetadata $argument): Generator
     {
         $order = $request->get('order');
         $start = $request->get('start');
@@ -60,8 +61,6 @@ public function resolve(Request $request, ArgumentMetadata $argument)
         $start = is_numeric($start) ? intval($start) : 0;
         $limit = is_numeric($limit) ? intval($limit) : 100;
 
-        $dto = new PaginateConditions($order, $start, $limit);
-
-        yield $dto;
+        yield new PaginateConditions($start, $limit, $order);
     }
 }