Dev Testable version of participant import.

LimeSurvey · Jun 2, 2015 · 30118e9 · 30118e9
1 parent 5697023
commit 30118e9
Show file tree

Hide file tree

Showing 8 changed files with 998 additions and 88 deletions.
diff --git a/application/components/Batch.php b/application/components/Batch.php
@@ -12,6 +12,7 @@ class Batch {
 
     protected $defaultCategory;
     public $batchSize;
+    public $commitCount = 0;
     protected $data = [];
 
     public function __construct(Closure $callback, $batchSize = 5000, $defaultCategory = 'default') {
@@ -41,8 +42,10 @@ public function add($elements, $category = null) {
     }
 
     public function commitCategory($category) {
+
         $callback = $this->callback;
         $callback($this->data[$category], $category);
+        $this->commitCount++;
         unset($this->data[$category]);
     }
     public function commit() {

diff --git a/application/controllers/Controller.php b/application/controllers/Controller.php
@@ -188,7 +188,7 @@ protected function loadModel($id) {
 
     public function getActionParams()
     {
-        return array_merge($_GET, $_POST);
+        return App()->request->psr7->getParsedBody();
     }