[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 13a3fb: Revert "Temporarily deactivate these tests (almost...

Michal Čihař michal at cihar.com
Mon Jun 22 15:14:55 CEST 2015


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 13a3fb0635cf2f849a1c1daaed70ae6f787c2ab5
      https://github.com/phpmyadmin/phpmyadmin/commit/13a3fb0635cf2f849a1c1daaed70ae6f787c2ab5
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_Util_test.php

  Log Message:
  -----------
  Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)"

This reverts commit 9403921e4e689be0e62ccc23e9634039e94792ea.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal at cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php


  Commit: 67c858265d00602dec82c63375e43fdaf5690f75
      https://github.com/phpmyadmin/phpmyadmin/commit/67c858265d00602dec82c63375e43fdaf5690f75
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Add error checking

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 52ea1026adf67ccb04b6b3d09f7feb89e27aa346
      https://github.com/phpmyadmin/phpmyadmin/commit/52ea1026adf67ccb04b6b3d09f7feb89e27aa346
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Remove type annotation

It seems to be broken on some PHP versions:

Argument 1 passed to PMA_Util::configureCurl() must be an instance of
resource, resource given, called in libraries/Config.class.php on line
774 and defined

Seen this on my workstation with PHP 5.6.1 and Google shows some hits of
this as well.

Signed-off-by: Michal Čihař <michal at cihar.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/14e630f6aa9b...52ea1026adf6


More information about the Git mailing list