move resolvers into File namespace
This commit is contained in:
parent
b469737aef
commit
2cd6cc0aee
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
namespace tests\inc\Utils;
|
||||
namespace tests\inc\File;
|
||||
|
||||
use dokuwiki\Utils\PageResolver;
|
||||
use dokuwiki\File\PageResolver;
|
||||
|
||||
/**
|
||||
* @todo tests that make use of revisions might be wanted
|
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
|
||||
use dokuwiki\Utf8\Sort;
|
||||
use dokuwiki\Utils\PageResolver;
|
||||
use dokuwiki\File\PageResolver;
|
||||
use splitbrain\phpcli\CLI;
|
||||
use splitbrain\phpcli\Options;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace dokuwiki\Utils;
|
||||
namespace dokuwiki\File;
|
||||
|
||||
/**
|
||||
* Creates an absolute media ID from a relative one
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace dokuwiki\Utils;
|
||||
namespace dokuwiki\File;
|
||||
|
||||
/**
|
||||
* Creates an absolute page ID from a relative one
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace dokuwiki\Utils;
|
||||
namespace dokuwiki\File;
|
||||
|
||||
/**
|
||||
* Resolving relative IDs to absolute ones
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
use dokuwiki\ChangeLog\MediaChangeLog;
|
||||
use dokuwiki\ChangeLog\PageChangeLog;
|
||||
use dokuwiki\Utils\MediaResolver;
|
||||
use dokuwiki\Utils\PageResolver;
|
||||
use dokuwiki\File\MediaResolver;
|
||||
use dokuwiki\File\PageResolver;
|
||||
|
||||
/**
|
||||
* Fetch the an ID from request
|
||||
|
@ -481,7 +481,7 @@ function localeFN($id,$ext='txt'){
|
|||
*/
|
||||
function resolve_id($ns,$id,$clean=true){
|
||||
global $conf;
|
||||
dbg_deprecated(\dokuwiki\Utils\Resolver::class.' and its children');
|
||||
dbg_deprecated(\dokuwiki\File\Resolver::class.' and its children');
|
||||
|
||||
// some pre cleaning for useslash:
|
||||
if($conf['useslash']) $id = str_replace('/',':',$id);
|
||||
|
|
|
@ -477,7 +477,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
|
|||
$default = $this->_simpleTitle($id);
|
||||
|
||||
// first resolve and clean up the $id
|
||||
$resolver = new \dokuwiki\Utils\PageResolver($ID);
|
||||
$resolver = new \dokuwiki\File\PageResolver($ID);
|
||||
$id = $resolver->resolveId($id);
|
||||
@list($page) = explode('#', $id, 2);
|
||||
|
||||
|
@ -722,7 +722,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
|
|||
|
||||
list($src) = explode('#', $src, 2);
|
||||
if (!media_isexternal($src)) {
|
||||
$src = (new \dokuwiki\Utils\MediaResolver($ID))->resolveId($src);
|
||||
$src = (new \dokuwiki\File\MediaResolver($ID))->resolveId($src);
|
||||
}
|
||||
if (preg_match('/.(jpe?g|gif|png)$/i', $src)) {
|
||||
$this->firstimage = $src;
|
||||
|
@ -742,7 +742,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
|
|||
if (media_isexternal($src)) {
|
||||
return;
|
||||
}
|
||||
$src = (new \dokuwiki\Utils\MediaResolver($ID))->resolveId($src);
|
||||
$src = (new \dokuwiki\File\MediaResolver($ID))->resolveId($src);
|
||||
$file = mediaFN($src);
|
||||
$this->meta['relation']['media'][$src] = file_exists($file);
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
|
||||
use dokuwiki\ChangeLog\MediaChangeLog;
|
||||
use dokuwiki\Utils\MediaResolver;
|
||||
use dokuwiki\Utils\PageResolver;
|
||||
use dokuwiki\File\MediaResolver;
|
||||
use dokuwiki\File\PageResolver;
|
||||
|
||||
/**
|
||||
* Renderer for XHTML output
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
use dokuwiki\Extension\AdminPlugin;
|
||||
use dokuwiki\Extension\Event;
|
||||
use dokuwiki\Utils\PageResolver;
|
||||
use dokuwiki\File\PageResolver;
|
||||
|
||||
/**
|
||||
* Access a template file
|
||||
|
|
Loading…
Reference in New Issue