fabarea / media

Tests/Unit/Utility/PathTest.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
 	 */
 	public function canResolvesAPath() {
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::resolvePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);
-		$this->assertEquals(0, strpos(Environment::getPublicPath() . '/', $expected));
+		$this->assertEquals(0, strpos(Environment::getPublicPath().'/', $expected));
 	}
 
 	/**
@@ -45,11 +45,11 @@ 
 	public function canReturnsAPublicPath() {
 
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::getRelativePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);
-		$this->assertFalse(strpos(Environment::getPublicPath() . '/', $expected));
+		$this->assertFalse(strpos(Environment::getPublicPath().'/', $expected));
 	}
 
 	/**

Classes/View/Warning/ConfigurationWarning.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
         $connection->update(
             $tableName,
             $values,
-            [ 'uid' => $storage->getUid() ]
+            ['uid' => $storage->getUid()]
         );
     }
 
@@ -115,7 +115,7 @@ 
      */
     protected function getWarmUpSemaphoreFile()
     {
-        return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
+        return Environment::getPublicPath().'/typo3temp/.media_cache_warmed_up';
     }
 
     /**
@@ -258,7 +258,7 @@ 
         return $queryBuilder
             ->select('*')
             ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
+            ->where('uid = '.$identifier)
             ->execute()
             ->fetch();
     }

Classes/Utility/Path.php

Spacing +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@ 
     {
 
         // If file is not found, resolve the path
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath().'/'));
         }
 
-        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
+        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath().'/'.$resource)).PathUtility::basename($resource);
     }
 
     /**
@@ -49,8 +49,8 @@ 
     static public function resolvePath($resource)
     {
         $resource = self::canonicalPath($resource);
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = 'EXT:'.GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName).'/Resources/Public/'.$resource;
         }
         return GeneralUtility::getFileAbsFileName($resource);
     }

Classes/Tool/MissingFilesFinderTool.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 

Classes/Tool/DuplicateFilesFinderTool.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
         $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -108,7 +108,7 @@ 
 
                             foreach ($allowedMountPoints as $allowedMountPoint) {
 
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
+                                $pattern = '%^'.$allowedMountPoint.'%isU';
                                 if (preg_match($pattern, $file['identifier'])) {
                                     $filteredFiles[] = $file;
                                     break; // no need to further loop around, stop the loop.

Classes/Tool/ThumbnailGeneratorTool.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -81,7 +81,7 @@ 
                         $formattedResultSet[] = sprintf('* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                     }
 

Classes/Tool/CacheWarmUpTool.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -75,7 +75,7 @@ 
      */
     protected function getWarmUpSemaphorFile()
     {
-        return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
+        return Environment::getPublicPath().'/typo3temp/.media_cache_warmed_up';
     }
 
     /**

Classes/Tool/DuplicateRecordsFinderTool.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 

Classes/FileUpload/UploadManager.php

Spacing +5 added lines, -5 removed lines

@@ -129,8 +129,8 @@ 
         $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
 
         if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
-            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
-            $this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
+            $size = max(1, $this->sizeLimit / 1024 / 1024).'M';
+            $this->throwException('increase post_max_size and upload_max_filesize to '.$size);
         }
     }
 
@@ -198,7 +198,7 @@ 
         $isAllowed = $this->checkFileExtensionPermission($fileName);
         if (!$isAllowed) {
             $these = PermissionUtility::getInstance()->getAllowedExtensionList();
-            $this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
+            $this->throwException('File has an invalid extension, it should be one of '.$these.'.');
         }
     }
 
@@ -256,7 +256,7 @@ 
      */
     public function sanitizeFileName($fileName, $slug = '-', $extra = null)
     {
-        return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
+        return trim(preg_replace('~[^0-9a-z_'.preg_quote($extra, '~').']+~i', $slug, $this->unAccent($fileName)), $slug);
     }
 
     /**
@@ -294,7 +294,7 @@ 
      */
     protected function initializeUploadFolder()
     {
-        $this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
+        $this->uploadFolder = Environment::getPublicPath().'/'.self::UPLOAD_FOLDER;
 
         // Initialize the upload folder for file transfer and create it if not yet existing
         if (!file_exists($this->uploadFolder)) {