1
0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-16 13:04:13 +02:00

made passing behat

This commit is contained in:
Mikael Roos
2017-03-03 22:53:29 +01:00
parent 0f0d954e61
commit 026e01b2cd
15 changed files with 180 additions and 98 deletions

View File

@@ -8,6 +8,22 @@
*
*/
/**
* Custom exception handler.
*/
set_exception_handler(function ($exception) {
errorPage(
"<p><b>img.php: Uncaught exception:</b> <p>"
. $exception->getMessage()
. "</p><pre>"
. $exception->getTraceAsString()
. "</pre>",
500
);
});
/**
* Get configuration options from file, if the file exists, else use $config
* if its defined or create an empty $config.
@@ -198,7 +214,7 @@ verbose("referer host = $refererHost");
/**
* Create the class for the image.
*/
$CImage = getConfig('CImage', 'CImage');
$CImage = getConfig('CImage', '\Mos\CImage\CImage');
$img = new $CImage();
$img->setVerbose($verbose || $verboseFile);
@@ -207,7 +223,7 @@ $img->setVerbose($verbose || $verboseFile);
/**
* Get the cachepath from config.
*/
$CCache = getConfig('CCache', 'CCache');
$CCache = getConfig('CCache', '\Mos\CImage\CCache');
$cachePath = getConfig('cache_path', __DIR__ . '/../cache/');
$cache = new $CCache();
$cache->setDir($cachePath);
@@ -229,7 +245,7 @@ verbose("use cache = $useCache");
$fastTrackCache = "fasttrack";
$allowFastTrackCache = getConfig('fast_track_allow', false);
$CFastTrackCache = getConfig('CFastTrackCache', 'CFastTrackCache');
$CFastTrackCache = getConfig('CFastTrackCache', '\Mos\CImage\CFastTrackCache');
$ftc = new $CFastTrackCache();
$ftc->setCacheDir($cache->getPathToSubdir($fastTrackCache))
->enable($allowFastTrackCache)

View File

@@ -91,13 +91,13 @@ return [
* the codebase.
*
* Default values:
* CImage: CImage
* CCache: CCache
* CFastTrackCache: CFastTrackCache
* CImage: \Mos\CImage\CImage
* CCache: \Mos\CImage\CCache
* CFastTrackCache: \Mos\CImage\CFastTrackCache
*/
//'CImage' => 'CImage',
//'CCache' => 'CCache',
//'CFastTrackCache' => 'CFastTrackCache',
//'CImage' => '\Mos\CImage\CImage',
//'CCache' => '\Mos\CImage\CCache',
//'CFastTrackCache' => '\Mos\CImage\CFastTrackCache',