Reduce number of calls to storage

Author: Jamie Snape

core/controllers/components/ApihelperComponent.php

@@ -71,11 +71,7 @@ public function validateParams($args, $requiredList)
      */
     public function getApiSetup()
     {
-        $apiSetup = array();
-        $apiSetup['testing'] = Zend_Registry::get('configGlobal')->environment == 'testing';
-        $apiSetup['tmpDirectory'] = UtilityComponent::getTempDirectory();
-
-        return $apiSetup;
+        return array();
     }
 
     /**

core/controllers/components/ApisystemComponent.php

@@ -435,7 +435,7 @@ public function uploadGeneratetoken($args)
         /** @var HttpuploadComponent $uploadComponent */
         $uploadComponent = MidasLoader::loadComponent('Httpupload');
         $apiSetup = $apihelperComponent->getApiSetup();
-        $uploadComponent->setTestingMode($apiSetup['testing']);
+        $uploadComponent->setTestingMode(Zend_Registry::get('configGlobal')->environment === 'testing');
 
         return $uploadComponent->generateToken($args, $userDao->getKey().'/'.$item->getKey());
     }
@@ -513,12 +513,12 @@ public function uploadPerform($args)
         /** @var HttpuploadComponent $httpUploadComponent */
         $httpUploadComponent = MidasLoader::loadComponent('Httpupload');
         $apiSetup = $apihelperComponent->getApiSetup();
-        $httpUploadComponent->setTestingMode($apiSetup['testing']);
+        $httpUploadComponent->setTestingMode(Zend_Registry::get('configGlobal')->environment === 'testing');
 
         if (array_key_exists('testingmode', $args)) {
             $httpUploadComponent->setTestingMode(true);
             if (!array_key_exists('localinput', $args)) {
-                $args['localinput'] = $apiSetup['tmpDirectory'].'/'.$args['filename'];
+                $args['localinput'] = UtilityComponent::getTempDirectory().'/'.$args['filename'];
             }
         }
 
@@ -617,7 +617,7 @@ public function uploadGetoffset($args)
         /** @var ApihelperComponent $apihelperComponent */
         $apihelperComponent = MidasLoader::loadComponent('Apihelper');
         $apiSetup = $apihelperComponent->getApiSetup();
-        $uploadComponent->setTestingMode($apiSetup['testing']);
+        $uploadComponent->setTestingMode(Zend_Registry::get('configGlobal')->environment === 'testing');
 
         return $uploadComponent->getOffset($args);
     }

core/controllers/components/HttpuploadComponent.php

@@ -76,8 +76,10 @@ public function generateToken($args, $dirname = '')
         if (!array_key_exists('filename', $args)) {
             throw new Exception('Parameter filename is not defined', MIDAS_HTTPUPLOAD_FILENAME_PARAM_UNDEFINED);
         }
+
+        $tempDirectory = UtilityComponent::getTempDirectory();
         $dir = $dirname === '' ? '' : '/'.$dirname;
-        $dir = UtilityComponent::getTempDirectory().$dir;
+        $dir = $tempDirectory.$dir;
 
         if (!file_exists($dir)) {
             if (!mkdir($dir, 0777, true)) {
@@ -91,7 +93,7 @@ public function generateToken($args, $dirname = '')
             $uniqueIdentifier = $dirname.'/'.$uniqueIdentifier;
         }
 
-        $path = UtilityComponent::getTempDirectory().'/'.$uniqueIdentifier;
+        $path = $tempDirectory.'/'.$uniqueIdentifier;
         if (file_exists($path)) {
             throw new Exception('Failed to generate upload token', MIDAS_HTTPUPLOAD_UPLOAD_TOKEN_GENERATION_FAILED);
         }

modules/api/controllers/IndexController.php

@@ -41,8 +41,6 @@ public function preDispatch()
         $this->apiEnable = true;
 
         // define api parameters
-        $this->apiSetup['testing'] = Zend_Registry::get('configGlobal')->environment == 'testing';
-        $this->apiSetup['tmpDirectory'] = $this->getTempDirectory();
         $this->apiSetup['apiMethodPrefix'] = $this->Setting->getValueByName(API_METHOD_PREFIX_KEY, $this->moduleName);
 
         $this->action = $actionName = Zend_Controller_Front::getInstance()->getRequest()->getActionName();