Browse Source

Improve test behaviour

tags/2018.09
Michael 1 year ago
parent
commit
69db696ab1
3 changed files with 28 additions and 19 deletions
  1. +2
    -0
      include/dba.php
  2. +9
    -3
      src/App.php
  3. +17
    -16
      src/Object/Image.php

+ 2
- 0
include/dba.php View File

@@ -955,6 +955,8 @@ class dba {
* @return boolean Was the command executed successfully?
*/
public static function rollback() {
$ret = false;

switch (self::$driver) {
case 'pdo':
if (!self::$db->inTransaction()) {


+ 9
- 3
src/App.php View File

@@ -412,11 +412,17 @@ class App
public function set_baseurl($url)
{
$parsed = @parse_url($url);
$hostname = '';

if (x($parsed)) {
$this->scheme = $parsed['scheme'];
if (!empty($parsed['scheme'])) {
$this->scheme = $parsed['scheme'];
}

if (!empty($parsed['host'])) {
$hostname = $parsed['host'];
}

$hostname = $parsed['host'];
if (x($parsed, 'port')) {
$hostname .= ':' . $parsed['port'];
}
@@ -432,7 +438,7 @@ class App
$this->hostname = Config::get('config', 'hostname');
}

if (!isset($this->hostname) || ( $this->hostname == '')) {
if (!isset($this->hostname) || ($this->hostname == '')) {
$this->hostname = $hostname;
}
}


+ 17
- 16
src/Object/Image.php View File

@@ -781,22 +781,23 @@ class Image
$img_str = Network::fetchUrl($url, true, $redirects, 4);
$filesize = strlen($img_str);

// The tests are failing with an read error. This can be caused by memory shortage
// See https://stackoverflow.com/questions/10175758/getimagesize-read-error
// So we use the alternate method instead
//if (function_exists("getimagesizefromstring")) {
// $data = getimagesizefromstring($img_str);
//} else {
$tempfile = tempnam(get_temppath(), "cache");

$a = get_app();
$stamp1 = microtime(true);
file_put_contents($tempfile, $img_str);
$a->save_timestamp($stamp1, "file");

$data = getimagesize($tempfile);
unlink($tempfile);
//}
try {
if (function_exists("getimagesizefromstring")) {
$data = getimagesizefromstring($img_str);
} else {
$tempfile = tempnam(get_temppath(), "cache");

$a = get_app();
$stamp1 = microtime(true);
file_put_contents($tempfile, $img_str);
$a->save_timestamp($stamp1, "file");

$data = getimagesize($tempfile);
unlink($tempfile);
}
} catch (Exception $e) {
return false;
}

if ($data) {
$data["size"] = $filesize;


Loading…
Cancel
Save