Update to v4.1.0 (#31)

* BUGFIX: Obj echo issue fix - added json_encode * PRE_RELEASE: Increment Version Number * REVERT: Version Number * PR: Remove BraintreeException #23 * PR: Add PHP version and extension requirementss #24 * PR: Correct URL for other regions #27 * Update to v4.1.0 --------- Co-authored-by: Vivek <[email protected]>
froala · Jul 12, 2023 · a35ec45 · a35ec45
1 parent ed14cb2
commit a35ec45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "froala/wysiwyg-editor-php-sdk",
-  "version": "4.0.19",
+  "version": "4.1.0",
   "description": "PHP SDK for Froala WYSIWYG Editor",
   "type": "php-plugin",
   "keywords": [
@@ -28,7 +28,11 @@
       "role": "Maintainer"
     }
   ],
-  "require": {},
+  "require": {
+    "php": ">=5.4.0",
+    "ext-fileinfo": "*",
+    "ext-imagick": "*"
+  },
   "autoload": {
     "psr-0": {
         "FroalaEditor": "lib/"

diff --git a/lib/FroalaEditor.php b/lib/FroalaEditor.php
@@ -8,7 +8,7 @@
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'autoload.php');
 
 if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-    throw new Braintree_Exception('PHP version >= 5.4.0 required');
+    throw new Exception('PHP version >= 5.4.0 required');
 }
 
 function requireDependencies() {

diff --git a/lib/FroalaEditor/S3.php b/lib/FroalaEditor/S3.php
@@ -92,7 +92,7 @@ public static function getHash($config) {
     // Prepare response.
     $response = new \StdClass;
     $response->bucket = $bucket;
-    $response->region = $region != 'us-east-1' ? 's3-' . $region : 's3';
+    $response->region = $region != 'us-east-1' ? 's3.' . $region : 's3';
     $response->keyStart = $keyStart;
 
     // Prepare params.
@@ -113,7 +113,7 @@ public static function getHash($config) {
     // Set params in response.
     $response->params = $params;
 
-    return $response;
+    return json_encode($response);
   }
 }