gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-04-20 12:13:27 +02:00
commit 1fb71b38ab
7 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/plugins/IOTransformationsPlugin.class.php
View File

@ -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
*/

6
libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php
View File

@ -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
*/

6
libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php
View File

@ -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
*/

6
libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php
View File

@ -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
*/

6
libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php
View File

@ -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
*/

22
test/classes/plugin/transformations/Transformation_Plugins_test.php
View File

@ -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

4
test/libraries/PMA_transformation_test.php
View File

@ -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',