Applied fixes from StyleCI

midasplatform · Aug 5, 2015 · ec9d13e · ec9d13e
1 parent f7eb3bd
commit ec9d13e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/modules/tracker/controllers/api/SubmissionController.php b/modules/tracker/controllers/api/SubmissionController.php
@@ -20,8 +20,6 @@
 
 /**
  * API submission controller for the tracker module.
- *
- * @package Modules\Tracker\Controller
  */
 class Apitracker_SubmissionController extends ApiController
 {

diff --git a/modules/tracker/controllers/components/ApiComponent.php b/modules/tracker/controllers/components/ApiComponent.php
@@ -350,7 +350,6 @@ public function scalarAdd($args)
     public function resultsUploadJson($args)
     {
         /** Change this to add a submission id or uuid. */
-
         $submissionId = -1;
         /** @var CommunityModel $communityModel */
         $communityModel = MidasLoader::loadModel('Community');
@@ -658,6 +657,7 @@ public function submissionAdd($args)
         /** @var Tracker_ApisubmissionComponent $newApi */
         $newApi = MidasLoader::loadComponent('Apisubmission',
                                              'tracker');
+
         return $newApi->post($args);
     }
 }
diff --git a/modules/tracker/controllers/components/ApisubmissionComponent.php b/modules/tracker/controllers/components/ApisubmissionComponent.php
@@ -20,8 +20,6 @@
 
 /**
  * API submission component for the tracker module.
- *
- * @package Modules\Tracker\Component
  */
 class Tracker_ApisubmissionComponent extends AppComponent
 {

diff --git a/modules/tracker/database/upgrade/1.2.0.php b/modules/tracker/database/upgrade/1.2.0.php
@@ -20,32 +20,29 @@
 
 /**
  * Upgrade the tracker module to version 1.2.0.
- *
- * @package Modules\Tracker\Database
  */
 class Tracker_Upgrade_1_2_0 extends MIDASUpgrade
 {
-
     /** Upgrade a MySQL database. */
     public function mysql()
     {
         $this->db->query("ALTER TABLE `tracker_scalar` ADD COLUMN `submission_id` bigint(20) NOT NULL DEFAULT '-1';");
         $this->db->query(
-            "CREATE TABLE IF NOT EXISTS `tracker_submission` (" .
-            "    PRIMARY KEY (`submission_id`)," .
-            "    `submission_id` bigint(20) NOT NULL AUTO_INCREMENT,".
-            "    `producer_id` bigint(20) NOT NULL,".
+            'CREATE TABLE IF NOT EXISTS `tracker_submission` ('.
+            '    PRIMARY KEY (`submission_id`),'.
+            '    `submission_id` bigint(20) NOT NULL AUTO_INCREMENT,'.
+            '    `producer_id` bigint(20) NOT NULL,'.
             "    `name` varchar(255) NOT NULL DEFAULT '',".
             "    `uuid` varchar(255) NOT NULL DEFAULT '',".
-            "    `submit_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,".
-            "    UNIQUE KEY (`uuid`)".
-            ") DEFAULT CHARSET=utf8;");
+            '    `submit_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,'.
+            '    UNIQUE KEY (`uuid`)'.
+            ') DEFAULT CHARSET=utf8;');
     }
 
     /** Upgrade a PostgreSQL database. */
     public function pgsql()
     {
-        $this->db->query("ALTER TABLE tracker_scalar ADD COLUMN submission_id bigint NOT NULL DEFAULT -1::bigint;");
+        $this->db->query('ALTER TABLE tracker_scalar ADD COLUMN submission_id bigint NOT NULL DEFAULT -1::bigint;');
         $this->db->query(
             'CREATE TABLE IF NOT EXISTS "tracker_submission" ('.
             '    "submission_id" serial PRIMARY KEY,'.
@@ -57,5 +54,4 @@ public function pgsql()
         $this->db->query('CREATE UNIQUE INDEX "tracker_submission_uuid" ON "tracker_submission" ("uuid");');
         $this->db->query('CREATE INDEX "tracker_submission_submit_time" ON "tracker_submission" ("submit_time");');
     }
-
 }
diff --git a/modules/tracker/models/base/SubmissionModelBase.php b/modules/tracker/models/base/SubmissionModelBase.php
@@ -20,8 +20,6 @@
 
 /**
  * Submission base model class for the tracker module.
- *
- * @package Modules\Tracker\Model
  */
 abstract class Tracker_SubmissionModelBase extends Tracker_AppModel
 {

diff --git a/modules/tracker/models/dao/SubmissionDao.php b/modules/tracker/models/dao/SubmissionDao.php
@@ -31,7 +31,6 @@
  * @method string setUuid(string $uuid)
  * @method array getScalars()
  * @method void setScalars(array $scalarDaos)
- * @package Modules\Tracker\DAO
  */
 class Tracker_SubmissionDao extends Tracker_AppDao
 {

diff --git a/modules/tracker/models/pdo/SubmissionModel.php b/modules/tracker/models/pdo/SubmissionModel.php
@@ -22,8 +22,6 @@
 
 /**
  * Submission model for the tracker module.
- *
- * @package Modules\Tracker\Model
  */
 class Tracker_SubmissionModel extends Tracker_SubmissionModelBase
 {

diff --git a/modules/tracker/tests/controllers/ApiControllerTest.php b/modules/tracker/tests/controllers/ApiControllerTest.php
@@ -91,6 +91,7 @@ protected function _submitScalar($token, $uuid, $metric, $value)
         $this->params['submissionUuid'] = $uuid;
 
         $res = $this->_callJsonApi();
+
         return $res->data;
     }
 }