@@ -16,7 +16,7 @@ |
||
16 | 16 | |
17 | 17 | use Fab\Media\Tests\Functional\AbstractFunctionalTestCase; |
18 | 18 | |
19 | -require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php'; |
|
19 | +require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php'; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Test case for class \Fab\Media\Utility\Configuration. |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | use Fab\Media\Tests\Functional\AbstractFunctionalTestCase; |
18 | 18 | |
19 | -require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php'; |
|
19 | +require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php'; |
|
20 | 20 | |
21 | 21 | |
22 | 22 | /** |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $preset = 'image_large'; |
129 | 129 | $actualWidth = rand(10, 100); |
130 | 130 | $actualHeight = rand(10, 100); |
131 | - \Fab\Media\Utility\ConfigurationUtility::getInstance()->set('image_large', $actualWidth . 'x' . $actualHeight); |
|
131 | + \Fab\Media\Utility\ConfigurationUtility::getInstance()->set('image_large', $actualWidth.'x'.$actualHeight); |
|
132 | 132 | $this->assertSame($actualWidth, $this->fixture->preset($preset)->getWidth()); |
133 | 133 | $this->assertSame($actualHeight, $this->fixture->preset($preset)->getHeight()); |
134 | 134 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | use Fab\Media\Tests\Functional\AbstractFunctionalTestCase; |
18 | 18 | |
19 | -require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php'; |
|
19 | +require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php'; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * Test case for class \Fab\Media\Form\FileUpload. |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | $this->fixture = $this->getMock('Fab\Media\Form\FileUpload', array('addLanguage')); |
45 | 45 | $this->fakeName = uniqid('name'); |
46 | - $this->fakePrefix= uniqid('prefix'); |
|
46 | + $this->fakePrefix = uniqid('prefix'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | public function tearDown() { |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $method->setAccessible(TRUE); |
84 | 84 | |
85 | 85 | $basePart = uniqid(); |
86 | - $fakePrefix = $basePart . '[foo]'; |
|
86 | + $fakePrefix = $basePart.'[foo]'; |
|
87 | 87 | $actual = $method->invokeArgs($this->fixture, array($fakePrefix)); |
88 | 88 | $this->assertSame($basePart, $actual); |
89 | 89 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public function setUp() { |
38 | 38 | $this->fixture = new \Fab\Media\FileUpload\UploadManager(); |
39 | 39 | $this->fakeName = uniqid('name'); |
40 | - $this->fakePrefix= uniqid('prefix'); |
|
40 | + $this->fakePrefix = uniqid('prefix'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function tearDown() { |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * @dataProvider propertyProvider |
50 | 50 | */ |
51 | 51 | public function testProperty($propertyName, $value) { |
52 | - $setter = 'set' . ucfirst($propertyName); |
|
53 | - $getter = 'get' . ucfirst($propertyName); |
|
52 | + $setter = 'set'.ucfirst($propertyName); |
|
53 | + $getter = 'get'.ucfirst($propertyName); |
|
54 | 54 | call_user_func_array(array($this->fixture, $setter), array($value)); |
55 | 55 | $this->assertEquals($value, call_user_func(array($this->fixture, $getter))); |
56 | 56 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | return array( |
63 | 63 | array('uploadFolder', uniqid()), |
64 | 64 | array('inputName', uniqid()), |
65 | - array('sizeLimit', rand(10,100)), |
|
65 | + array('sizeLimit', rand(10, 100)), |
|
66 | 66 | ); |
67 | 67 | } |
68 | 68 |
@@ -40,9 +40,9 @@ |
||
40 | 40 | |
41 | 41 | $pageRenderer = $this->getPageRenderer(); |
42 | 42 | $pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) { |
43 | - MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()) . '\'; |
|
44 | - MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix() . '\'; |
|
45 | - MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')) . '; |
|
43 | + MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()).'\'; |
|
44 | + MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix().'\'; |
|
45 | + MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')).'; |
|
46 | 46 | }'); |
47 | 47 | } |
48 | 48 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | $tca = [ |
13 | 13 | 'types' => [ |
14 | - 0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ', |
|
14 | + 0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].', |
|
15 | 15 | |
16 | 16 | --div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.upload_settings, |
17 | 17 | maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5, |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $tcaForHiddenFolderTree = [ |
82 | 82 | |
83 | 83 | 'types' => [ |
84 | - 0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ', |
|
84 | + 0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].', |
|
85 | 85 | |
86 | 86 | --div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.media_mount_point, |
87 | 87 | mount_point_file_type_1, mount_point_file_type_2, mount_point_file_type_3, mount_point_file_type_4, mount_point_file_type_5, |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | { |
44 | 44 | |
45 | 45 | $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension')); |
46 | - $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath); |
|
46 | + $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/'.$relativePath); |
|
47 | 47 | if (!file_exists($fileNameAndPath)) { |
48 | 48 | $relativePath = 'Icons/UnknownMimeType.png'; |
49 | 49 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | return sprintf( |
69 | 69 | '<img src="%s%s" title="%s" alt="%s" %s/>', |
70 | 70 | $result, |
71 | - $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '', |
|
71 | + $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getFile()->getProperty('tstamp') : '', |
|
72 | 72 | $this->getTitle(), |
73 | 73 | $this->getTitle(), |
74 | 74 | $this->renderAttributes() |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | return sprintf( |
104 | 104 | '<a href="%s%s" target="%s" data-uid="%s">%s</a>', |
105 | 105 | $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true), |
106 | - $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '', |
|
106 | + $this->thumbnailService->getAppendTimeStamp() ? '?'.$file->getProperty('tstamp') : '', |
|
107 | 107 | $this->thumbnailService->getTarget(), |
108 | 108 | $file->getUid(), |
109 | 109 | $result |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public static function setOrientation($filename, $orientation) |
57 | 57 | { |
58 | - $exif_data = []; // Buffer |
|
58 | + $exif_data = []; // Buffer |
|
59 | 59 | $offsetJfif = 0; |
60 | 60 | |
61 | 61 | if (($fh = fopen($filename, 'rb+')) === false) { |
62 | - throw new \RuntimeException('Can\'t open ' . $filename, 1363533724); |
|
62 | + throw new \RuntimeException('Can\'t open '.$filename, 1363533724); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | // Read file head, check for JPEG SOI + JFIF/Exif APP1 |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | if ($exif_data[2] === 0xFF && $exif_data[3] === 0xE0) { |
74 | 74 | // Get the marker parameter length count |
75 | 75 | $length = self::read_2_bytes($fh); |
76 | - $offsetJfif = $length + 2; // "+ 2" to skip the 2 bytes introducing this additional segment |
|
76 | + $offsetJfif = $length + 2; // "+ 2" to skip the 2 bytes introducing this additional segment |
|
77 | 77 | // Length includes itself, so must be at least 2 |
78 | 78 | // Following JFIF data length must be at least 6 |
79 | 79 | if ($length < 8) { |
@@ -204,9 +204,9 @@ discard block |
||
204 | 204 | |
205 | 205 | // Set the Orientation value |
206 | 206 | if ($is_motorola) { |
207 | - $exif_data[$offset + 2] = 0; // Format = unsigned short (2 octets) |
|
207 | + $exif_data[$offset + 2] = 0; // Format = unsigned short (2 octets) |
|
208 | 208 | $exif_data[$offset + 3] = 3; |
209 | - $exif_data[$offset + 4] = 0; // Number of Components = 1 |
|
209 | + $exif_data[$offset + 4] = 0; // Number of Components = 1 |
|
210 | 210 | $exif_data[$offset + 5] = 0; |
211 | 211 | $exif_data[$offset + 6] = 0; |
212 | 212 | $exif_data[$offset + 7] = 1; |
@@ -215,9 +215,9 @@ discard block |
||
215 | 215 | $exif_data[$offset + 10] = 0; |
216 | 216 | $exif_data[$offset + 11] = 0; |
217 | 217 | } else { |
218 | - $exif_data[$offset + 2] = 3; // Format = unsigned short (2 octets) |
|
218 | + $exif_data[$offset + 2] = 3; // Format = unsigned short (2 octets) |
|
219 | 219 | $exif_data[$offset + 3] = 0; |
220 | - $exif_data[$offset + 4] = 1; // Number of Components = 1 |
|
220 | + $exif_data[$offset + 4] = 1; // Number of Components = 1 |
|
221 | 221 | $exif_data[$offset + 5] = 0; |
222 | 222 | $exif_data[$offset + 6] = 0; |
223 | 223 | $exif_data[$offset + 7] = 0; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | // Only add like condition if needed. |
48 | 48 | if ($folder->getStorage()->getRootLevelFolder() !== $folder) { |
49 | - $matcher->like('identifier', $folder->getIdentifier() . '%', $automaticallyAddWildCard = false); |
|
49 | + $matcher->like('identifier', $folder->getIdentifier().'%', $automaticallyAddWildCard = false); |
|
50 | 50 | } |
51 | 51 | } else { |
52 | 52 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $collectedFiles = []; |
72 | 72 | foreach ($fileMounts as $fileMount) { |
73 | 73 | |
74 | - $combinedIdentifier = $fileMount['base'] . ':' . $fileMount['path']; |
|
74 | + $combinedIdentifier = $fileMount['base'].':'.$fileMount['path']; |
|
75 | 75 | $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($combinedIdentifier); |
76 | 76 | |
77 | 77 | $files = $this->getFileUids($folder); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | if ($fileMountRecord['path']) { |
184 | 184 | $constraintsRespectingFileMounts[] = $query->like( |
185 | 185 | 'identifier', |
186 | - $fileMountRecord['path'] . '%' |
|
186 | + $fileMountRecord['path'].'%' |
|
187 | 187 | ); |
188 | 188 | } |
189 | 189 | } |