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

90667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
faac8f3115 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-15 07:16:40 -04:00
Marc Delisle
9b0ec2aaaf Merge pull request #1066 from ashutoshdhundhara/feature-#1512 
Feature request: #1512 Import doesn't do anything with no file name provided.
 2014-03-15 07:16:23 -04:00
Hugues Peccatte
889555e38d Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-03-15 11:54:48 +01:00
Hugues Peccatte
3f5f8eac71 Fix test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:54:32 +01:00
Weblate
5a84524da1 Merge remote-tracking branch 'origin/master' 2014-03-15 11:46:41 +01:00
Pl
20884176f0 Translated using Weblate (Bulgarian) 
Currently translated at 65.1% (1794 of 2754)
 2014-03-15 11:46:38 +01:00
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Michal Čihař
40f9df6fcc Merge pull request #1067 from jeffchan/fix-tests 
Fix unit test running individually by file
 2014-03-15 08:26:49 +01:00
Michal Čihař
bb280c8cc1 Merge pull request #1068 from jeffchan/fix-config-generator-test 
Cache date in ConfigGenerator unit test
 2014-03-15 08:26:31 +01:00
Hugues Peccatte
9b1f025fb7 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 23:06:46 +01:00
Hugues Peccatte
15afc7f9e6 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 22:47:29 +01:00
Jeff Chan
694daa01dd Cache date in ConfigGenerator unit test 
Occasionally we run into timing issues. For example, if the config
is generated at 12:00:59PM and the assertion is at 12:01:00PM, then
the test will fail. This should bring the expected $date closer to
when the config is generated.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 20:00:19 +00:00
Hugues Peccatte
9290c6857e PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 20:58:33 +01:00
Jeff Chan
3e65f88dee Fix AuthenticationCookieTest::testAuth to have proper includes 
Also change testAuthSetUserWithHeaders to have more flexible assertion

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 19:28:17 +00:00
Jeff Chan
719babd2c6 Import dependencies to make tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:18 +00:00
Jeff Chan
69e2f227ab Move slow tests in HHVM to medium group 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:13 +00:00
Jeff Chan
581f8e4d94 Define MYSQL_VERSION string constant if not already defined 
These tests were failing when run individually since the constant was
not defined. This patch defines the constant if it doesn't exist.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:07 +00:00
Hugues Peccatte
a5f396147b PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 19:23:56 +01:00
Ashutosh Dhundhara
2943a514b9 Feature request: #1512 Import doesn't do anything with no file name provided. 
https://sourceforge.net/p/phpmyadmin/feature-requests/1512/

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-14 23:21:21 +05:30
Marc Delisle
5641638897 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-14 12:32:49 -04:00
Michal Čihař
96daf9eea5 Use numerical value instead of possibly undefined constant 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:42:11 +01:00
Michal Čihař
98f01722f8 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-14 13:24:21 +01:00
Michal Čihař
9fbabd6202 Backport Advisor cleanups from master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:24:03 +01:00
Michal Čihař
b38215fd0b Merge remote-tracking branch 'origin/QA_4_1' 2014-03-14 13:07:34 +01:00
Michal Čihař
0de05db113 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-14 13:06:29 +01:00
Michal Čihař
7b3de5b566 Merge commit '199d560e8e5a74555939d2083322fe3435ca6a5e' 2014-03-14 13:06:21 +01:00
Weblate
99b7b74040 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-14 13:06:08 +01:00
Erik Hepsø
c8c77db608 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.8% (1837 of 2749)
 2014-03-14 13:06:04 +01:00
Michal Čihař
53cc186591 Fixed ob_start/eval problems in phpunit 
When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:55 +01:00
Michal Čihař
3d0f237031 Fix expected message to match code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:48 +01:00
Michal Čihař
3e83565cf2 Fix order of params to assertEquals 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 13:05:41 +01:00
Panagiotis Papazoglou
9dfe58cb3d Translated using Weblate (Greek) 
Currently translated at 100.0% (2754 of 2754)
 2014-03-14 12:14:04 +01:00
Michal Čihař
aadfc0dc23 Increase delay until we have better solution 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:56:46 +01:00
Michal Čihař
3c103a9543 Wait for CFP protection to run before trying to login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:55:58 +01:00
Michal Čihař
d3480422b8 Fix typo in attribute name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:53:55 +01:00
Michal Čihař
e2238b38da Better way of CFP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:50:32 +01:00
Michal Čihař
a2d84745d2 Drop List::getSingleItem as it is not used 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 07:29:15 +01:00
Michal Čihař
4d006c3717 Merge pull request #1061 from jeffchan/phpunit-hhvm 
Add HHVM-specific phpunit configuration
 2014-03-14 07:26:20 +01:00
Michal Čihař
498786109d Merge pull request #1063 from jeffchan/fix-test-dependencies 
Import dependencies to make unit tests friendlier to running independently
 2014-03-14 07:25:33 +01:00
Jeff Chan
c9948e9cde Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 04:45:08 +00:00
Jeff Chan
0bfb660ad5 Add HHVM-specific phpunit configuration 
- Up the timeout
- No selenium testing
- No coverage

Also update Travis and build.xml to support it

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 01:10:15 +00:00
Michal Čihař
ad931a1c05 Merge pull request #1060 from jeffchan/fix-tests 
Move slow test in HHVM to group medium
 2014-03-13 23:35:56 +01:00
Jeff Chan
013a9a3395 Move slow test in HHVM to group medium 
These tests were failing on HHVM because of the default 3 second timeout.
Yes, HHVM is supposed to be faster, but there's a "warmup" time for scripts
in JIT mode (which is on by default). I suspect that's why they're failing.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-13 20:52:13 +00:00
Weblate
4ac572dc31 Merge remote-tracking branch 'origin/master' 2014-03-13 21:41:09 +01:00
Stian Berg
95197b6b08 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.8% (1649 of 2754)
 2014-03-13 21:41:06 +01:00
Hugues Peccatte
db23a9bf8a PHPCS and PHPdoc updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-13 21:40:39 +01:00
Erik Hepsø
071b7f272d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.8% (1648 of 2754)
 2014-03-13 19:11:03 +01:00
Stian Berg
03f57c6b30 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.8% (1647 of 2754)
 2014-03-13 18:54:12 +01:00
Erik Hepsø
66c5aa080c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.7% (1646 of 2754)
 2014-03-13 18:53:01 +01:00
Nicholas Arnesen
199d560e8e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.5% (1829 of 2749)
 2014-03-13 18:38:40 +01:00