diff --git a/libraries/plugins/IOTransformationsPlugin.class.php b/libraries/plugins/IOTransformationsPlugin.class.php index 97ad01b4cd..e976ba9c44 100644 --- a/libraries/plugins/IOTransformationsPlugin.class.php +++ b/libraries/plugins/IOTransformationsPlugin.class.php @@ -37,9 +37,9 @@ abstract class IOTransformationsPlugin extends TransformationsPlugin * @param array $options transformation options * @param string $value Current field value * @param string $text_dir text direction - * @param integer $tabindex tab index - * @param integer $tabindex_for_value offset for the values tabindex - * @param integer $idindex id index + * @param int $tabindex tab index + * @param int $tabindex_for_value offset for the values tabindex + * @param int $idindex id index * * @return string the html for input field */ diff --git a/libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php b/libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php index 8fa841ef2b..68d304b3bd 100644 --- a/libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php +++ b/libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php @@ -43,9 +43,9 @@ abstract class CodeMirrorEditorTransformationsPlugin extends IOTransformationsPl * @param array $options transformation options * @param string $value Current field value * @param string $text_dir text direction - * @param integer $tabindex tab index - * @param integer $tabindex_for_value offset for the values tabindex - * @param integer $idindex id index + * @param int $tabindex tab index + * @param int $tabindex_for_value offset for the values tabindex + * @param int $idindex id index * * @return string the html for input field */ diff --git a/libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php index 1a2a6dc393..bb5e32f09a 100644 --- a/libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php @@ -58,9 +58,9 @@ abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin * @param array $options transformation options * @param string $value Current field value * @param string $text_dir text direction - * @param integer $tabindex tab index - * @param integer $tabindex_for_value offset for the values tabindex - * @param integer $idindex id index + * @param int $tabindex tab index + * @param int $tabindex_for_value offset for the values tabindex + * @param int $idindex id index * * @return string the html for input field */ diff --git a/libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php index 7fcc1d67ab..49d0fa98a5 100644 --- a/libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php @@ -59,9 +59,9 @@ abstract class TextFileUploadTransformationsPlugin extends IOTransformationsPlug * @param array $options transformation options * @param string $value Current field value * @param string $text_dir text direction - * @param integer $tabindex tab index - * @param integer $tabindex_for_value offset for the values tabindex - * @param integer $idindex id index + * @param int $tabindex tab index + * @param int $tabindex_for_value offset for the values tabindex + * @param int $idindex id index * * @return string the html for input field */ diff --git a/libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php b/libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php index 623250785f..b5557bbfb6 100644 --- a/libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php +++ b/libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php @@ -63,9 +63,9 @@ class Text_Plain_IPToBinary extends IOTransformationsPlugin * @param array $options transformation options * @param string $value Current field value * @param string $text_dir text direction - * @param integer $tabindex tab index - * @param integer $tabindex_for_value offset for the values tabindex - * @param integer $idindex id index + * @param int $tabindex tab index + * @param int $tabindex_for_value offset for the values tabindex + * @param int $idindex id index * * @return string the html for input field */ diff --git a/test/classes/plugin/transformations/Transformation_Plugins_test.php b/test/classes/plugin/transformations/Transformation_Plugins_test.php index ce231893ea..ddd33ebc21 100644 --- a/test/classes/plugin/transformations/Transformation_Plugins_test.php +++ b/test/classes/plugin/transformations/Transformation_Plugins_test.php @@ -129,7 +129,10 @@ class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase 'test', array('150'), '', - 'ltr' + 'ltr', + 0, + 0, + 0 ) ), array( @@ -150,7 +153,10 @@ class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase 'wrapper_link' => '?table=a' ), 'something', - 'ltr' + 'ltr', + 0, + 0, + 0 ) ), // Test data for Text_Plain_Fileupload plugin @@ -190,7 +196,10 @@ class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase 'test', array(), '', - 'ltr' + 'ltr', + 0, + 0, + 0 ) ), array( @@ -206,7 +215,10 @@ class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase '2ndtest', array(), 'something', - 'ltr' + 'ltr', + 0, + 0, + 0 ) ), // Test data for Text_Plain_Regexvalidation plugin @@ -237,7 +249,7 @@ class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase 'getInputHtml', '', array( - array(), 0, '', array(), '', 'ltr' + array(), 0, '', array(), '', 'ltr', 0, 0, 0 ) ), // Test data for Application_Octetstream_Download plugin diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php index 1e9ae3ae2a..b71194d87d 100644 --- a/test/libraries/PMA_transformation_test.php +++ b/test/libraries/PMA_transformation_test.php @@ -145,8 +145,8 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase ), 'input_transformation' => array( 'Image/JPEG: Upload', - 'Text/Plain: BinaryToIP', 'Text/Plain: Fileupload', + 'Text/Plain: IPToBinary', 'Text/Plain: JsonEditor', 'Text/Plain: Regexvalidation', 'Text/Plain: SqlEditor', @@ -158,8 +158,8 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase ), 'input_transformation_file' => array( 'input/Image_JPEG_Upload.class.php', - 'input/Text_Plain_BinaryToIP.class.php', 'input/Text_Plain_Fileupload.class.php', + 'input/Text_Plain_IPToBinary.class.php', 'input/Text_Plain_JsonEditor.class.php', 'input/Text_Plain_Regexvalidation.class.php', 'input/Text_Plain_SqlEditor.class.php',