From dd77198c16f767d616d84c89bf8c760f47cf6a99 Mon Sep 17 00:00:00 2001
From: mgrauer <michael.grauer@kitware.com>
Date: Wed, 2 Mar 2016 15:19:41 +0000
Subject: [PATCH 1/2] Allow unsecure http composer downloads

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 7332c48d0..6723f334b 100644
--- a/composer.json
+++ b/composer.json
@@ -68,5 +68,8 @@
             "/log/**",
             "/tmp/**"
         ]
+    },
+    "config": {
+        "secure-http": false
     }
 }

From 8558aca6c9d424b694516dbc5ca48e50befd7895 Mon Sep 17 00:00:00 2001
From: mgrauer <michael.grauer@kitware.com>
Date: Wed, 2 Mar 2016 19:06:16 +0000
Subject: [PATCH 2/2] Add docblock strings to empty docblocks

---
 core/controllers/AdminController.php    | 1 +
 core/controllers/InstallController.php  | 4 ++++
 core/models/pdo/ActivedownloadModel.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/core/controllers/AdminController.php b/core/controllers/AdminController.php
index 2c5ad6268..420c7e3e5 100644
--- a/core/controllers/AdminController.php
+++ b/core/controllers/AdminController.php
@@ -384,6 +384,7 @@ public function serversidefilechooserAction()
     }
 
     /**
+     * Called to migrate a midas 2 instance.
      */
     public function migratemidas2Action()
     {
diff --git a/core/controllers/InstallController.php b/core/controllers/InstallController.php
index 7500b4143..057755c48 100644
--- a/core/controllers/InstallController.php
+++ b/core/controllers/InstallController.php
@@ -27,6 +27,7 @@ class InstallController extends AppController
     public $_forms = array('Install');
 
     /**
+     * init method.
      */
     public function init()
     {
@@ -39,6 +40,7 @@ public function init()
     }
 
     /**
+     * Default action for install controller, step 1.
      */
     public function indexAction()
     {
@@ -57,6 +59,7 @@ public function indexAction()
     }
 
     /**
+     * Step 2 action for install controller.
      */
     public function step2Action()
     {
@@ -221,6 +224,7 @@ public function step2Action()
     }
 
     /**
+     * Step 3 action for install controller.
      */
     public function step3Action()
     {
diff --git a/core/models/pdo/ActivedownloadModel.php b/core/models/pdo/ActivedownloadModel.php
index c09ea65a1..935d87410 100644
--- a/core/models/pdo/ActivedownloadModel.php
+++ b/core/models/pdo/ActivedownloadModel.php
@@ -21,6 +21,7 @@
 require_once BASE_PATH.'/core/models/base/ActivedownloadModelBase.php';
 
 /**
+ * ActivedownloadModel Class.
  */
 class ActivedownloadModel extends ActivedownloadModelBase
 {