Merge pull request 'Release/v1.0.1' from develop into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/docs-integration-sdk-php/pulls/12
ONLYOFFICE · Oct 16, 2024 · 6f63b25 · 6f63b25
2 parents 17d3e9c + 4c7b373
commit 6f63b25
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.0.1
+- minor fixes
+- fix settings check
+
 ## 1.0.0
 - common interfaces
 - list supported formats

diff --git a/src/Manager/Formats/FormatsManager.php b/src/Manager/Formats/FormatsManager.php
@@ -48,7 +48,7 @@ public function __construct($nameAssoc = false)
         }
     }
 
-    protected function buildDefaultFormatsArray(array $formats)
+    protected static function buildDefaultFormatsArray(array $formats)
     {
         $formatsList = [];
         foreach ($formats as $format) {
@@ -63,7 +63,7 @@ protected function buildDefaultFormatsArray(array $formats)
         return $formatsList;
     }
 
-    protected function buildNamedFormatsArray(array $formats)
+    protected static function buildNamedFormatsArray(array $formats)
     {
         $formatsList = [];
         foreach ($formats as $format) {
@@ -79,7 +79,7 @@ protected function buildNamedFormatsArray(array $formats)
         return $formatsList;
     }
 
-    private function getFormats()
+    private static function getFormats()
     {
         $formats = file_get_contents(dirname(dirname(dirname(__DIR__))).
         DIRECTORY_SEPARATOR.

diff --git a/src/Service/Request/RequestService.php b/src/Service/Request/RequestService.php
@@ -392,8 +392,8 @@ public function checkDocServiceUrl()
         }
 
         try {
-            if (isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on" || $_SERVER["HTTPS"] == 1)
-            || isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && $_SERVER["HTTP_X_FORWARDED_PROTO"] == "https"
+            if ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on" || $_SERVER["HTTPS"] == 1)
+            || isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && $_SERVER["HTTP_X_FORWARDED_PROTO"] == "https")
             && preg_match('/^http:\/\//i', $documentServerUrl)) {
                 throw new \Exception(CommonError::message(CommonError::MIXED_CONTENT));
             }