gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,667 Commits 12 Branches 481 Tags 2.4 GiB
ea5640fd9c
Commit Graph

1495 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
1b9d125d3e Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-20 00:14:06 -03:00
Michal Čihař
8643692d75 Merge branch 'QA_4_7' 2017-03-30 14:31:50 +02:00
Michal Čihař
13d3398ec9 Adjust tests to make them output neutral 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:31:46 +02:00
Maurício Meneghini Fauth
5366c507a5 Fix coding standard errors using vendor/bin/phpcbf 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-21 23:16:32 -03:00
Michal Čihař
562d37a351 Merge branch 'QA_4_7' 2017-03-13 09:18:42 +01:00
Raghuram
ebc935a915 Fixes retrieving tables names from nested $table_list array in tracking 
Fixes #13029

Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:18:31 +01:00
Michal Čihař
0a8490f711 Merge remote-tracking branch 'origin/pull/12987' 2017-03-01 16:16:43 +01:00
Michal Čihař
2c55ecc450 Merge branch 'QA_4_7' 2017-03-01 15:57:24 +01:00
Michal Čihař
b7a87ce156 Adjust tests to new column selection code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:18 +01:00
Michal Čihař
12f7f6a785 Merge branch 'QA_4_7' 2017-03-01 10:54:44 +01:00
Michal Čihař
bb95ecf852 Extend Dummy driver to be able to inject expected queries results 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:52:37 +01:00
Michal Čihař
3fea1bd5ab Merge pull request #12937 from poush/fix12006 
templating getRadioFields(), getDropDown() in Util.php
 2017-02-27 11:15:09 +01:00
Joshua Atkins
68f107786c Typographical quotes for table comments 
Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-23 12:01:02 +01:00
Shreyas Sinha
1dfce55965 Incorrect protocol number at 401/303 headers (#12920) 
Shared code for handling HTTP response codes and correctly
set it based on PHP SAPI.

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-02-14 13:20:13 +01:00
Michal Čihař
87a2953b78 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:59:36 +01:00
Joshua Atkins
b79194377c Typographical quotes for Jump to db link title 
Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-11 17:09:21 +01:00
Piyush Agrawal
b575f7ef1b db_central_columns: new column collapsing issue 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-06 13:25:05 +01:00
Piyush Agrawal
d25eeb4587 templating getRadioFields(), getDropDown() in Util.php 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-01-31 01:39:59 +05:30
Michal Čihař
20aa51f601 Merge branch 'master-security' 2017-01-24 09:49:49 +01:00
Michal Čihař
75ad097c36 Replace Util::whichCrlf() with PHP_EOL 
It's available since PHP 5.0.2 so it's really time to use it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 15:59:52 +01:00
Michal Čihař
f5f496a8c1 Merge branch 'master' into master-security 2017-01-23 14:27:00 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Michal Čihař
be4eaf5243 Merge branch 'master' into master-security 2017-01-21 16:46:12 +01:00
Michal Čihař
ce9f84e477 Use shared mock for response without any header 
Fixes #12079

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 16:05:32 +01:00
Michal Čihař
ffb28560c7 Merge pull request #12879 from ragnerok/patch 
use shared response mock
 2017-01-18 10:03:39 +01:00
Michal Čihař
9503e0f6aa Store query data in data attribute instead of HTML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:35:54 +01:00
Michal Čihař
9b4642af62 Merge remote-tracking branch 'origin/pull/12823' 2017-01-18 09:33:08 +01:00
Michal Čihař
cbd2c17a1d Merge branch 'master' into master-security 2017-01-17 13:37:08 +01:00
osaid
cef6c51375 calling mockResponse() properly 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-08 19:43:25 +05:30
osaid
f98832c691 remove tab and unused code 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-08 19:21:47 +05:30
osaid
528d702e6b use shared response mock 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-08 19:04:03 +05:30
Michal Čihař
71a2f600e7 Merge pull request #12852 from ragnerok/patch 
Removed PMA_TEST_HEADERS checking as they have been defined
 2017-01-08 10:28:11 +01:00
Cristiano Lancelotti
d3d973f782 Merge branch 'master' into issue_12262 2017-01-08 05:44:15 -02:00
osaid
fd6a02b215 moved tearDown method to PMATestCase 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-08 13:03:28 +05:30
osaid
887b661690 added tearDown method for header tests 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-07 16:11:32 +05:30
Michal Čihař
1dd22f4dea Merge branch 'QA_4_6-security' into master-security 2017-01-07 11:02:01 +01:00
Michal Čihař
14b6e3b10b Merge branch 'master' into master-security 2017-01-07 11:01:06 +01:00
Michal Čihař
cbcf740adb Merge branch 'QA_4_6' into QA_4_6-security 2017-01-07 11:00:58 +01:00
osaid
0f3b55c81a made mock before testing function 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-05 21:08:43 +05:30
osaid
f1863bf6ac calling class method using 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-04 15:21:02 +05:30
osaid
1616ecb79b headerlocation_test inherits from PMATestCase 
Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-01-04 10:59:07 +05:30
osaid
2a62427b67 added mockResponse function for sharing code and used it in headerlocationtest Signed-Off-By: Osaid <osaid.nasir@gmail.com> 2017-01-03 22:23:40 +05:30
Michal Čihař
8edc20b023 Merge branch 'QA_4_6' 2017-01-02 17:06:36 +01:00
osaid
eb54c43fb6 Removed PMA_TEST_HEADERS checking as they have been defined 2016-12-24 22:31:38 +05:30
Critiano Lancelotti
059a43b101 Adjust the test to new output 
Signed-off-by: Critiano Lancelotti <lancelot.info@gmail.com>
 2016-12-24 07:04:11 -02:00
Isaac Bennetch
63eaa362e9 Fix incorrect comma in message string 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-21 19:02:28 -05:00
Michal Čihař
c962ee4287 Remove setup download/load/delete features 
This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:34:42 +01:00
Michal Čihař
3f4487f985 Merge branch 'master' into master-security 2016-12-21 11:11:25 +01:00
Osaid Rehman Nasir
73c6a7eb9f Use Header class for headers manipulation 
* Added mocking of response object
* Rectified mistake of calling method once
* implemented mock properly
* replaced header with response header 

Issue #12079

Signed-off-by: Osaid osaid.nasir@gmail.com
 2016-12-20 16:37:11 +01:00