D3Public
/
daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

More cleanup

This commit is contained in:
Stéphane Goetz 2017-11-07 22:54:31 +01:00
parent c0016c759a
commit 52ce3714cf
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/Format/Confluence/Api.php
View File

@ -269,7 +269,7 @@ class Api
}
}
private function putAttachment($url, $id, $attachment)
private function putAttachment($url, $attachment)
{
$contents = array_key_exists('file', $attachment) ? fopen($attachment['file']->getPath(), 'r') : $attachment['content'];
@ -322,6 +322,6 @@ class Api
$url .= "/{$result['results'][0]['id']}/data";
}
$this->putAttachment($url, $id, $attachment);
$this->putAttachment($url, $attachment);
}
}

2
libs/Format/Confluence/ContentPage.php
View File

@ -28,6 +28,8 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
} else if ($file instanceof ComputedRaw) {
$filename = $file->getUri();
$this->attachments[$filename] = ['filename' => $filename, 'content' => $file->getContent()];
} else {
throw new \RuntimeException("Cannot embed image as we don't understand its type.");
}
return $this->createImageTag($filename, $attributes);

3
libs/Format/Confluence/Publisher.php
View File

@ -36,8 +36,6 @@ class Publisher
$this->client = new Api($confluence['base_url'], $confluence['user'], $confluence['pass']);
$this->client->setSpace($confluence['space_id']);
$this->deletable = [];
}
public function run($title, $closure)
@ -82,7 +80,6 @@ class Publisher
{
if (array_key_exists('ancestor_id', $this->confluence)) {
$pages = $this->client->getList($this->confluence['ancestor_id']);
$published = null;
foreach ($pages as $page) {
if ($page['title'] == $tree['title']) {
return $page;

3
libs/Format/Confluence/PublisherDelete.php
View File

@ -27,6 +27,9 @@ class PublisherDelete
$this->output = $output;
$this->delete = $delete;
$this->client = $client;
$this->deletable = [];
}
protected function listDeletable($published, $prefix = '')

2
libs/Format/HTML/Config.php
View File

@ -14,7 +14,7 @@ class Config extends BaseConfig
];
}
function getEditOn()
public function getEditOn()
{
if (array_key_exists('edit_on', $this)) {
if (is_string($this['edit_on'])) {

7
libs/Server/Server.php
View File

@ -18,6 +18,11 @@ class Server
private $params;
private $base_url;
/**
* @var Request
*/
private $request;
/**
* Serve the documentation
*
@ -65,7 +70,7 @@ class Server
* @param string $postfix
* @return string
*/
function getTemporaryFile($postfix) {
private function getTemporaryFile($postfix) {
$sysFileName = tempnam(sys_get_temp_dir(), 'daux');
if ($sysFileName === false) {
throw new \RuntimeException("Could not create temporary file");