Skip to content

Commit e6cd40d

Browse files
Merge pull request #18270 from kamil-tekiela/Fix-failing-transformation-tests-on-ARM
Fix failing transformation tests on 32 bit
2 parents cff126e + 2b92201 commit e6cd40d

29 files changed

Lines changed: 57 additions & 84 deletions

libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static function getInfo(): string
3535
* @param array $options transformation options
3636
* @param FieldMetadata|null $meta meta information
3737
*/
38-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
38+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
3939
{
4040
$cfg = $GLOBALS['cfg'];
4141
$options = $this->getOptions($options, $cfg['DefaultTransformations']['Bool2Text']);

libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ abstract class CodeMirrorEditorTransformationPlugin extends IOTransformationsPlu
2525
* @param array $options transformation options
2626
* @param FieldMetadata|null $meta meta information
2727
*/
28-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
28+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
2929
{
3030
return $buffer;
3131
}

libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ public static function getInfo(): string
5555
* @param array $options transformation options
5656
* @param FieldMetadata|null $meta meta information
5757
*/
58-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
58+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
5959
{
60-
$buffer = (string) $buffer;
6160
// possibly use a global transform and feed it with special options
6261
$cfg = $GLOBALS['cfg'];
6362
$options = $this->getOptions($options, $cfg['DefaultTransformations']['DateFormat']);

libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static function getInfo(): string
4141
* @param array $options transformation options
4242
* @param FieldMetadata|null $meta meta information
4343
*/
44-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
44+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
4545
{
4646
$GLOBALS['row'] ??= null;
4747
$GLOBALS['fields_meta'] ??= null;

libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function applyTransformationNoWrap(array $options = []): bool
7777
* @param array $options transformation options
7878
* @param FieldMetadata|null $meta meta information
7979
*/
80-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
80+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
8181
{
8282
// possibly use a global transform and feed it with special options
8383

libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function getInfo(): string
3737
* @param array $options transformation options
3838
* @param FieldMetadata|null $meta meta information
3939
*/
40-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
40+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
4141
{
4242
return '<iframe srcdoc="'
4343
. strtr($buffer, '"', '\'')

libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function getInfo(): string
3939
* @param array $options transformation options
4040
* @param FieldMetadata|null $meta meta information
4141
*/
42-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
42+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
4343
{
4444
// possibly use a global transform and feed it with special options
4545
$cfg = $GLOBALS['cfg'];

libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static function getInfo(): string
3434
* @param array $options transformation options
3535
* @param FieldMetadata|null $meta meta information
3636
*/
37-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
37+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
3838
{
3939
// must disable the page loader, see
4040
// https://wiki.phpmyadmin.net/pma/Page_loader#Bypassing_the_page_loader

libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function getInfo(): string
3939
* @param array $options transformation options
4040
* @param FieldMetadata|null $meta meta information
4141
*/
42-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
42+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
4343
{
4444
return $buffer;
4545
}

libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function getInfo(): string
3838
* @param array $options transformation options
3939
* @param FieldMetadata|null $meta meta information
4040
*/
41-
public function applyTransformation($buffer, array $options = [], FieldMetadata|null $meta = null): string
41+
public function applyTransformation(string $buffer, array $options = [], FieldMetadata|null $meta = null): string
4242
{
4343
$cfg = $GLOBALS['cfg'];
4444
$options = $this->getOptions($options, $cfg['DefaultTransformations']['Inline']);

0 commit comments

Comments
 (0)