More review responses.

Author: cpatrick

modules/tracker/controllers/components/ApiComponent.php

@@ -266,7 +266,7 @@ public function scalarAdd($args)
         $submissionId = -1;
         if (isset($args['submissionId'])) {
             $submissionId = $args['submissionId'];
-        } else if (isset($args['submissionUuid'])) {
+        } elseif (isset($args['submissionUuid'])) {
             $uuid = $args['submissionUuid'];
             $submissionModel = MidasLoader::loadModel('Submission', 'tracker');
             $submissionDao = $submissionModel->getOrCreateSubmission($producer, $uuid);
@@ -646,7 +646,7 @@ private function _createOrFindByName($itemName, $community)
     }
 
     /**
-     * Create a new submission
+     * Create a new submission.
      *
      * @param uuid (Optional) A unique identifier for the submission
      * @param name (Optional) A name for the submission
@@ -655,6 +655,7 @@ private function _createOrFindByName($itemName, $community)
      */
     public function submissionAdd($args)
     {
+        /** @var Tracker_ApisubmissionComponent $newApi */
         $newApi = MidasLoader::loadComponent('Apisubmission',
                                              'tracker');
         return $newApi->post($args);

modules/tracker/controllers/components/ApisubmissionComponent.php

@@ -59,7 +59,7 @@ public function delete($args)
         $submissionDao = $submissionModel->load($submissionId);
 
         if (is_null($submissionDao) || $submissionDao === false) {
-            throw new Exception('A submission with id '. $submissionId.
+            throw new Exception('A submission with id '.$submissionId.
                                 ' does not exist.', MIDAS_NOT_FOUND);
         }
 
@@ -96,7 +96,7 @@ public function get($args)
         $submissionDao = $submissionModel->load($submissionId);
 
         if (is_null($submissionDao) || $submissionDao === false) {
-            throw new Exception('A submission with id '. $submissionId.
+            throw new Exception('A submission with id '.$submissionId.
                                 ' does not exist.', MIDAS_NOT_FOUND);
         }
 
@@ -216,7 +216,7 @@ public function put($args)
         $submissionDao = $submissionModel->load($submissionId);
 
         if (is_null($submissionDao) || $submissionDao === false) {
-            throw new Exception('A submission with id '. $submissionId.
+            throw new Exception('A submission with id '.$submissionId.
                                 ' does not exist.', MIDAS_NOT_FOUND);
         }
 

modules/tracker/models/base/SubmissionModelBase.php

@@ -58,15 +58,15 @@ public function __construct()
      * @param string $name the name of the submission (defaults to '')
      * @return Tracker_SubmissionDao
      */
-    public abstract function createSubmission($producerDao, $uuid, $name = '');
+    abstract public function createSubmission($producerDao, $uuid, $name = '');
 
     /**
      * Get a submission from its uuid.
      *
      * @param string $uuid the uuid of the submission
      * @return Tracker_SubmissionDao submission DAO
      */
-    public abstract function getSubmission($uuid);
+    abstract public function getSubmission($uuid);
 
     /**
      * Return the submission with the given uuid (creating one if necessary).
@@ -75,20 +75,20 @@ public abstract function getSubmission($uuid);
      * @param string $uuid the uuid of the submission
      * @return Tracker_SubmissionDao submission DAO
      */
-    public abstract function getOrCreateSubmission($producerDao, $uuid);
+    abstract public function getOrCreateSubmission($producerDao, $uuid);
 
     /**
      * Get submissions associated with a given producer.
      *
      * @param Tracker_ProducerDao $producerDao producer DAO
      * @return array submission DAOs
      */
-    public abstract function getSubmissionsByProducer($producerDao);
+    abstract public function getSubmissionsByProducer($producerDao);
 
     /**
      * Get the scalars associated with a submission.
      * @param Tracker_SubmissionDao $submissionDao submission DAO
      * @return array submission DAOs
      */
-    public abstract function getScalars($submissionDao);
+    abstract public function getScalars($submissionDao);
 }

modules/tracker/models/pdo/SubmissionModel.php

@@ -40,7 +40,7 @@ public function createSubmission($producerDao, $uuid, $name = '')
         $data = array(
             'producer_id' => $producerDao->getKey(),
             'uuid' => $uuid,
-            'name' => $name
+            'name' => $name,
         );
         $this->database->getDB()->insert('tracker_submission', $data);
     }
@@ -143,5 +143,4 @@ public function getOrCreateSubmission($producerDao, $uuid)
 
         return $submissionDao;
     }
-
 }