refactorings

Author: a6software

app/AppKernel.php

@@ -23,7 +23,6 @@ public function registerBundles()
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
             new Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle(),
-            new Csa\Bundle\GuzzleBundle\CsaGuzzleBundle(),
 
             new AppBundle\AppBundle(),
         ];
@@ -33,6 +32,8 @@ public function registerBundles()
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+
+            $bundles[] = new Csa\Bundle\GuzzleBundle\CsaGuzzleBundle();
         }
 
         return $bundles;

app/config/config.yml

@@ -106,26 +106,24 @@ nelmio_api_doc:
 # FOS REST Bundle
 fos_rest:
     body_listener: true
-    format_listener:  true
     param_fetcher_listener: force
     view:
         view_response_listener: 'force'
         formats:
-            jsonp: true
             json: true
             xml: false
             rss: false
         mime_types:
             json: ['application/json', 'application/x-json']
             jpg: ['image/jpeg']
             png: ['image/png']
-        jsonp_handler: ~
     routing_loader:
         default_format:  json
         include_format:  false
     format_listener:
+        enabled: true
         rules:
-            - { path: ^/, priorities: [ json, jsonp ], fallback_format: ~, prefer_extension: true }
+            - { path: ^/, priorities: [ json ], fallback_format: json, prefer_extension: true }
     exception:
         enabled: true
 #    versioning:

behat.yml

@@ -9,8 +9,6 @@ default:
             doctrine: "@doctrine"
         - AppBundle\Features\Context\RestApiContext:
             client: "@csa_guzzle.client.local_test_api"
-        - AppBundle\Features\Context\MysqlDatabaseContext:
-            em: "@doctrine.orm.entity_manager"
         - AppBundle\Features\Context\UserSetupContext:
             userManager: "@fos_user.user_manager"
             em: "@doctrine.orm.entity_manager"

features/bootstrap/FeatureContext.php

@@ -1,19 +1,17 @@
 <?php
 
 use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
 
 /**
  * Defines application features from the specific context.
  */
-class FeatureContext implements Context, SnippetAcceptingContext
+class FeatureContext implements Context
 {
     private $doctrine;
     private $manager;
     private $schemaTool;
     private $classes;
+
     /**
      * Initializes context.
      *
@@ -28,6 +26,7 @@ public function __construct(\Doctrine\Common\Persistence\ManagerRegistry $doctri
         $this->schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->manager);
         $this->classes = $this->manager->getMetadataFactory()->getAllMetadata();
     }
+
     /**
      * @BeforeScenario
      */

src/AppBundle/Controller/RestRegistrationController.php

@@ -64,9 +64,16 @@ public function registerAction(Request $request)
 
         $userManager->updateUser($user);
 
+        $jwtManager = $this->get('lexik_jwt_authentication.jwt_manager');
+
+        $jwt = $jwtManager->create($user);
+
         if (null === $response = $event->getResponse()) {
             return new JsonResponse(
-                $this->get('translator')->trans('registration.flash.user_created', [], 'FOSUserBundle'),
+                [
+                    'msg' => $this->get('translator')->trans('registration.flash.user_created', [], 'FOSUserBundle'),
+                    'token' => $jwt,
+                ],
                 Response::HTTP_CREATED
             );
         }

src/AppBundle/Event/Listener/JWTCreatedListener.php

@@ -29,11 +29,11 @@ public function __construct( TokenStorageInterface $tokenStorage)
      */
     public function onJWTCreated(JWTCreatedEvent $event)
     {
-        $payload = $event->getData();
-
-        // add new data
-        $payload['userId'] = $this->tokenStorage->getToken()->getUser()->getId();
-
-        $event->setData($payload);
+//        $payload = $event->getData();
+//
+//        // add new data
+//        $payload['userId'] = $this->tokenStorage->getToken()->getUser()->getId();
+//
+//        $event->setData($payload);
     }
 }

src/AppBundle/Features/Context/MysqlDatabaseContext.php

@@ -7,7 +7,6 @@
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserManagerInterface;
-use PhpSpec\Exception\Example\PendingException;
 
 class UserSetupContext implements Context, SnippetAcceptingContext
 {
@@ -20,6 +19,12 @@ class UserSetupContext implements Context, SnippetAcceptingContext
      */
     private $em;
 
+    /**
+     * UserSetupContext constructor.
+     *
+     * @param UserManagerInterface   $userManager
+     * @param EntityManagerInterface $em
+     */
     public function __construct(UserManagerInterface $userManager, EntityManagerInterface $em)
     {
         $this->userManager = $userManager;

src/AppBundle/Features/Context/UserSetupContext.php

@@ -7,13 +7,13 @@
 //umask(0000);
 // This check prevents access to debug front controllers that are deployed by accident to production servers.
 // Feel free to remove this, extend it, or make something more sophisticated.
-//if (isset($_SERVER['HTTP_CLIENT_IP'])
-//    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-//    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
-//) {
-//    header('HTTP/1.0 403 Forbidden');
-//    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
-//}
+if (isset($_SERVER['HTTP_CLIENT_IP'])
+    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
+) {
+    header('HTTP/1.0 403 Forbidden');
+    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+}
 /**
  * @var Composer\Autoload\ClassLoader $loader
  */