Merge pull request #795 from LearningLocker/develop

v1.12.1

Author: ht2

VERSION

@@ -1 +1 @@
-1.12.0
+1.12.1

app/controllers/api/Exports.php

@@ -30,6 +30,7 @@ public function showJson($id) {
     $model = $this->repo->show($id, $opts);
 
     return IlluminateResponse::stream(function () use ($model, $opts) {
+      if (ob_get_level() == 0) ob_start();
       echo '[';
       $this->repo->export($model, array_merge($opts, [
         'next' => function () {
@@ -56,6 +57,7 @@ public function showCsv($id) {
     $model = $this->repo->show($id, $opts);
 
     return IlluminateResponse::stream(function () use ($model, $opts) {
+      if (ob_get_level() == 0) ob_start();
       // Outputs the field names (column headers).
       echo implode(',', array_map(function ($field) {
         return $field['to'];

app/controllers/xapi/DocumentController.php

@@ -240,6 +240,7 @@ public function documentResponse($data) {
           default:
             $stream = FileFactory::create()->stream($document->getFilePath(), []);
             return \Response::stream(function () use ($stream) {
+              if (ob_get_level() == 0) ob_start();
               while (!feof($stream)) {
                 echo fread($stream, 8192); flush();ob_flush();
               }

app/controllers/xapi/StatementIndexController.php

@@ -7,7 +7,6 @@
 
 class StatementIndexController {
 
-  const BOUNDARY = 'abcABC0123\'()+_,-./:=?';
   const EOL = "\r\n";
 
   /**
@@ -48,7 +47,7 @@ public function index($options) {
 
     // Defines the content type and body of the response.
     if ($opts['attachments'] === true) {
-      $content_type = 'multipart/mixed; boundary='.static::BOUNDARY;
+      $content_type = Helpers::mixedMultipartContentType();
       $body = function () use ($statements, $count, $opts) {
         return $this->makeAttachmentsResult($statements, $count, $opts);
       };
@@ -97,9 +96,8 @@ private function makeStatementsResult(array $statements, $count, array $opts) {
    * @return \stdClass
    */
   private function makeAttachmentsResult(array $statements, $count, array $opts) {
-    $boundary = static::BOUNDARY;
+    $boundary = Helpers::MULTIPART_BOUNDARY;
     $eol = static::EOL;
-    $content_type = 'multipart/mixed; boundary='.$boundary;
 
     $this->emit("--$boundary$eol");
     $this->emit("Content-Type:application/json$eol$eol");
@@ -128,6 +126,7 @@ private function makeAttachmentsResult(array $statements, $count, array $opts) {
   }
 
   private function emit($value) {
+    if (ob_get_level() == 0) ob_start();
     echo $value;
     flush();
     ob_flush();

app/locker/helpers/Attachments.php

@@ -76,7 +76,7 @@ private static function getHeaders($raw_headers, $delim) {
    * @return String
    */
   private static function getBoundary($content_type) {
-    preg_match('/boundary=(.*)$/', $content_type, $matches);
+    preg_match('/boundary="?(.+?)"?$/', $content_type, $matches);
     if (!isset($matches[1])) throw new Exceptions\Exception(
       'You need to set a boundary if submitting attachments.'
     );

app/locker/helpers/Helpers.php

@@ -13,6 +13,8 @@
 
 class Helpers {
 
+  const MULTIPART_BOUNDARY = 'abcABC0123\'()+_,-./:=?';
+
   /*
   |----------------------------------------------------------------------------
   | scan array and replace &46; with . (This is a result of . being
@@ -252,4 +254,9 @@ public static function convertIds( $models = [] ) {
       return $model;
     }, $models);
   }
+
+  public static function mixedMultipartContentType( $boundary = null ){
+    $boundary = $boundary ?: static::MULTIPART_BOUNDARY;
+    return 'multipart/mixed; boundary="' . $boundary . '"';
+  }
 }

app/locker/repository/Statement/Options.php

@@ -29,7 +29,7 @@ public function getOpt($opt) {
    */
   protected function validate($opts) {
     foreach ($opts as $key => $value) {
-      if ($value !== null && $this->types[$key] !== null) {
+      if ($value !== null && isset($this->types[$key]) && $this->types[$key] !== null) {
         if (is_array($this->types[$key])) {
           $class = '\Locker\XApi\\'.$this->types[$key][0];
           if (!is_array($value)) {

app/tests/routes/StatementAttachmentTest.php

@@ -4,10 +4,11 @@
 
 class StatementAttachmentTest extends StatementsTestCase {
   use RouteTestTrait;
-  protected $boundary = 'abcABC0123\'()+_,-./:=?';
+  protected $boundary;
 
   public function setup() {
     parent::setup();
+    $this->boundary = Helpers::MULTIPART_BOUNDARY;
     $this->statements[0]->delete();
   }
 
@@ -58,10 +59,11 @@ private function storeAttachments() {
     $attachment = $this->getAttachment($attachment_location);
     $statement = $this->generateStatementWithAttachment($attachment);
     $request_content = $this->generateContent(json_encode($statement), $attachment);
+    $content_type = Helpers::mixedMultipartContentType();
 
     // Sends request.
     $response = $this->requestStatements('POST', [], [
-      'CONTENT_TYPE' => "multipart/mixed; boundary=$this->boundary"
+      'CONTENT_TYPE' => $content_type
     ], $request_content);
 
     // Checks that the response is correct.

composer.json

@@ -35,6 +35,9 @@
       "url": "https://github.com/LearningLocker/laravel-mongodb"
     }
   ],
+  "config":{
+    "secure-http": false
+  },
   "require": {
     "php": ">=5.5.0",
     "ext-mongo": "*",