Erikmitk / kitodo-presentation

Classes/Middleware/Embedded3DViewer.php

Spacing +8 added lines, -8 removed lines

@@ -69,7 +69,7 @@ 
         $modelInfo = PathUtility::pathinfo($parameters['model']);
         $modelFormat = $modelInfo["extension"];
         if (empty($modelFormat)) {
-            return $this->warningResponse('Model path "' . $parameters['model'] . '" has no extension format', $request);
+            return $this->warningResponse('Model path "'.$parameters['model'].'" has no extension format', $request);
         }
 
         if (empty($parameters['viewer'])) {
@@ -88,30 +88,30 @@ 
         $defaultStorage = $storageRepository->getDefaultStorage();
 
         if (!$defaultStorage->hasFolder(self::VIEWER_FOLDER)) {
-            return $this->errorResponse('Required folder "' . self::VIEWER_FOLDER . '" was not found in the default storage "' . $defaultStorage->getName() . '"', $request);
+            return $this->errorResponse('Required folder "'.self::VIEWER_FOLDER.'" was not found in the default storage "'.$defaultStorage->getName().'"', $request);
         }
 
         $viewerModules = $defaultStorage->getFolder(self::VIEWER_FOLDER);
         if (!$viewerModules->hasFolder($viewer)) {
-            return $this->errorResponse('Viewer folder "' . $viewer . '" was not found under the folder "' . self::VIEWER_FOLDER . '"', $request);
+            return $this->errorResponse('Viewer folder "'.$viewer.'" was not found under the folder "'.self::VIEWER_FOLDER.'"', $request);
         }
 
         $viewerFolder = $viewerModules->getSubfolder($viewer);
         if (!$viewerFolder->hasFile(self::VIEWER_CONFIG_YML)) {
-            return $this->errorResponse('Viewer folder "' . $viewer . '" does not contain a file named "' . self::VIEWER_CONFIG_YML . '"', $request);
+            return $this->errorResponse('Viewer folder "'.$viewer.'" does not contain a file named "'.self::VIEWER_CONFIG_YML.'"', $request);
         }
 
         /** @var YamlFileLoader $yamlFileLoader */
         $yamlFileLoader = GeneralUtility::makeInstance(YamlFileLoader::class);
-        $viewerConfigPath = $defaultStorage->getName() . "/" . self::VIEWER_FOLDER . "/" . $viewer . "/";
-        $config = $yamlFileLoader->load($viewerConfigPath . self::VIEWER_CONFIG_YML)["viewer"];
+        $viewerConfigPath = $defaultStorage->getName()."/".self::VIEWER_FOLDER."/".$viewer."/";
+        $config = $yamlFileLoader->load($viewerConfigPath.self::VIEWER_CONFIG_YML)["viewer"];
 
         if (!isset($config["supportedModelFormats"]) || empty($config["supportedModelFormats"])) {
-            return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "' . self::VIEWER_CONFIG_YML . '" of viewer "' . $viewer . '" or has no value', $request);
+            return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "'.self::VIEWER_CONFIG_YML.'" of viewer "'.$viewer.'" or has no value', $request);
         }
 
         if (array_search(strtolower($modelFormat), array_map('strtolower', $config["supportedModelFormats"])) === false) {
-            return $this->warningResponse('Viewer "' . $viewer . '" does not support the model format "' . $modelFormat . '"', $request);
+            return $this->warningResponse('Viewer "'.$viewer.'" does not support the model format "'.$modelFormat.'"', $request);
         }
 
         $html = $this->getViewerHtml($config, $viewerConfigPath, $viewerFolder, $parameters['model'], $modelInfo);

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
  * @subpackage dlf
  * @access public
  */
-class Embedded3DViewer implements MiddlewareInterface
-{
+class Embedded3DViewer implements MiddlewareInterface {
     use LoggerAwareTrait;
 
     const VIEWER_FOLDER = "dlf_3d_viewers";

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
             return $this->errorResponse('Required key "supportedModelFormats" does not exist in the file "' . self::VIEWER_CONFIG_YML . '" of viewer "' . $viewer . '" or has no value', $request);
         }
 
-        if (array_search(strtolower($modelFormat), array_map('strtolower', $config["supportedModelFormats"])) === false) {
+        if (array_search(strtolower($modelFormat), array_map('strtolower', $config["supportedModelFormats"])) === FALSE) {
             return $this->warningResponse('Viewer "' . $viewer . '" does not support the model format "' . $modelFormat . '"', $request);
         }