Updated the method that adds user- and project- ids to the request and renamed it

Author: fpapadopou

Symfony/src/Codebender/BuilderBundle/Controller/DefaultController.php

@@ -87,7 +87,7 @@ protected function compile($contents)
     {
         $apiHandler = $this->get('codebender_builder.handler');
 
-        $contents = $this->checkForUserIdProjectId($contents);
+        $contents = $this->addUserIdProjectIdIfNotInRequest($contents);
 
         $files = $contents["files"];
 
@@ -210,17 +210,10 @@ protected function returnProvidedAndFetchedLibraries($projectFiles, $userLibrari
       * @param array $requestContents
       * @return array
       */
-    protected function checkForUserIdProjectId($requestContents)
+    protected function addUserIdProjectIdIfNotInRequest($requestContents)
     {
-        if (!array_key_exists('userId', $requestContents)) {
-            $requestContents['userId'] = 'null';
-        }
-
-        if (!array_key_exists('projectId', $requestContents)) {
-            $requestContents['projectId'] = 'null';
-        }
-
-        return $requestContents;
+        $nullDefaults = ['userId' => 'null', 'projectId' => 'null'];
+        return array_merge($nullDefaults, (array)$requestContents);
     }
 }
 

Symfony/src/Codebender/BuilderBundle/Tests/Controller/DefaultControllerUnitTest.php

@@ -158,7 +158,7 @@ public function testCompileNonJsonCompilerResponse() {
         // Override previous controller mock. More class member functions need to get mocked.
         $controller = $this->getMockBuilder('Codebender\BuilderBundle\Controller\DefaultController')
             ->disableOriginalConstructor()
-            ->setMethods(['get', 'getRequest', 'checkForUserIdProjectId', 'returnProvidedAndFetchedLibraries'])
+            ->setMethods(['get', 'getRequest', 'addUserIdProjectIdIfNotInRequest', 'returnProvidedAndFetchedLibraries'])
             ->getMock();
 
         $controller->setContainer($container);
@@ -170,7 +170,7 @@ public function testCompileNonJsonCompilerResponse() {
 
         $controller->expects($this->at(0))->method('get')->with('codebender_builder.handler')
             ->willReturn($apiHandler);
-        $controller->expects($this->at(1))->method('checkForUserIdProjectId')->with(['files' => []])
+        $controller->expects($this->at(1))->method('addUserIdProjectIdIfNotInRequest')->with(['files' => []])
             ->willReturn(['files' => []]);
         $controller->expects($this->at(2))->method('returnProvidedAndFetchedLibraries')->with([])
             ->willReturn(['libraries' => []]);
@@ -191,7 +191,7 @@ public function testCompileFalseCompilationWithoutStepIncluded() {
         // Override previous controller mock. More class member functions need to get mocked.
         $controller = $this->getMockBuilder('Codebender\BuilderBundle\Controller\DefaultController')
             ->disableOriginalConstructor()
-            ->setMethods(['get', 'getRequest', 'checkForUserIdProjectId', 'returnProvidedAndFetchedLibraries'])
+            ->setMethods(['get', 'getRequest', 'addUserIdProjectIdIfNotInRequest', 'returnProvidedAndFetchedLibraries'])
             ->getMock();
 
         $controller->setContainer($container);
@@ -203,7 +203,7 @@ public function testCompileFalseCompilationWithoutStepIncluded() {
 
         $controller->expects($this->at(0))->method('get')->with('codebender_builder.handler')
             ->willReturn($apiHandler);
-        $controller->expects($this->at(1))->method('checkForUserIdProjectId')->with(['files' => []])
+        $controller->expects($this->at(1))->method('addUserIdProjectIdIfNotInRequest')->with(['files' => []])
             ->willReturn(['files' => []]);
         $controller->expects($this->at(2))->method('returnProvidedAndFetchedLibraries')->with([])
             ->willReturn(['libraries' => []]);
@@ -228,7 +228,7 @@ public function testCompileFalseCompilationWithStepIncluded() {
         // Override previous controller mock. More class member functions need to get mocked.
         $controller = $this->getMockBuilder('Codebender\BuilderBundle\Controller\DefaultController')
             ->disableOriginalConstructor()
-            ->setMethods(['get', 'getRequest', 'checkForUserIdProjectId', 'returnProvidedAndFetchedLibraries'])
+            ->setMethods(['get', 'getRequest', 'addUserIdProjectIdIfNotInRequest', 'returnProvidedAndFetchedLibraries'])
             ->getMock();
 
         $controller->setContainer($container);
@@ -240,7 +240,7 @@ public function testCompileFalseCompilationWithStepIncluded() {
 
         $controller->expects($this->at(0))->method('get')->with('codebender_builder.handler')
             ->willReturn($apiHandler);
-        $controller->expects($this->at(1))->method('checkForUserIdProjectId')->with(['files' => []])
+        $controller->expects($this->at(1))->method('addUserIdProjectIdIfNotInRequest')->with(['files' => []])
             ->willReturn(['files' => []]);
         $controller->expects($this->at(2))->method('returnProvidedAndFetchedLibraries')->with([])
             ->willReturn(['libraries' => []]);
@@ -435,7 +435,7 @@ public function testcheckUserIdProjectIdHasNone() {
         /*
          * Use ReflectionMethod class to make compile protected function accessible from current context
          */
-        $function = $this->getMethod('checkForUserIdProjectId');
+        $function = $this->getMethod('addUserIdProjectIdIfNotInRequest');
 
         $requestContent = ['files' => [['filename' => 'project.ino', 'content' =>'']]];
 
@@ -451,7 +451,7 @@ public function testcheckUserIdProjectIdHasOnlyUserId() {
         /*
          * Use ReflectionMethod class to make compile protected function accessible from current context
          */
-        $function = $this->getMethod('checkForUserIdProjectId');
+        $function = $this->getMethod('addUserIdProjectIdIfNotInRequest');
 
         $requestContent = ['userId' => 1, 'files' => [['filename' => 'project.ino', 'content' =>'']]];
 
@@ -467,7 +467,7 @@ public function testcheckUserIdProjectIdHasOnlyProjectId() {
         /*
          * Use ReflectionMethod class to make compile protected function accessible from current context
          */
-        $function = $this->getMethod('checkForUserIdProjectId');
+        $function = $this->getMethod('addUserIdProjectIdIfNotInRequest');
 
         $projectFiles = ['projectId' => 1, 'files' => [['filename' => 'project.ino', 'content' =>'']]];