From 7dc7c045d4dba9cb5217be12659c82aa822cb8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= Date: Sat, 18 Jul 2015 21:23:02 +0200 Subject: [PATCH] Bugfixes --- daux.phar | Bin 713814 -> 712710 bytes generate.php => generate | 1 + libs/Compiler.php | 8 ++++---- libs/DauxHelper.php | 2 +- libs/Format/HTML/MarkdownPage.php | 10 +++++++--- libs/Generator/Helper.php | 4 ++-- libs/Server/Server.php | 1 - libs/Tree/Builder.php | 1 - libs/Tree/Entry.php | 11 ++++++----- libs/Tree/Root.php | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) rename generate.php => generate (99%) mode change 100644 => 100755 diff --git a/daux.phar b/daux.phar index f903c1b349c35f77e75574648f3f8505a9a6cbf0..d247e8bab9583e83df59e3f6b25d35de331c37df 100755 GIT binary patch delta 10989 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 z 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 diff --git a/generate.php b/generate old mode 100644 new mode 100755 similarity index 99% rename from generate.php rename to generate index 89cfdd2..146dd5b --- a/generate.php +++ b/generate @@ -1,3 +1,4 @@ +#!/usr/bin/env php addFromString('generate.php', $content); + $content = file_get_contents(__DIR__ . '/../generate'); + $content = preg_replace('{^#!/usr/bin/env php\s*}', '', $content); + $phar->addFromString('generate', $content); } /** @@ -166,7 +166,7 @@ define('PHAR_DIR', dirname(__FILE__)); Phar::mapPhar('daux.phar'); -require 'phar://daux.phar/generate.php'; +require 'phar://daux.phar/generate'; __HALT_COMPILER(); EOF; diff --git a/libs/DauxHelper.php b/libs/DauxHelper.php index a5b5623..49f0a59 100644 --- a/libs/DauxHelper.php +++ b/libs/DauxHelper.php @@ -98,7 +98,7 @@ class DauxHelper * * @param Directory $tree * @param string $request - * @return Tree\Entry|false + * @return Tree\Content|Tree\Raw */ public static function getFile($tree, $request) { diff --git a/libs/Format/HTML/MarkdownPage.php b/libs/Format/HTML/MarkdownPage.php index 3a43d25..fa0faef 100644 --- a/libs/Format/HTML/MarkdownPage.php +++ b/libs/Format/HTML/MarkdownPage.php @@ -20,12 +20,16 @@ class MarkdownPage extends \Todaymade\Daux\Format\Base\MarkdownPage $this->language = ''; if ($this->params['multilanguage'] && count($this->file->getParents())) { - reset($this->file->getParents()); - $language_dir = current($this->file->getParents()); - $this->language = $language_dir->name; + $language_dir = $this->file->getParents()[0]; + $this->language = $language_dir->getName(); } } + /** + * @param \Todaymade\Daux\Tree\Directory[] $parents + * @param bool $multilanguage + * @return array + */ private function getBreadcrumbTrail($parents, $multilanguage) { if ($multilanguage && !empty($parents)) { diff --git a/libs/Generator/Helper.php b/libs/Generator/Helper.php index cdda5e2..167dead 100644 --- a/libs/Generator/Helper.php +++ b/libs/Generator/Helper.php @@ -25,7 +25,7 @@ class Helper * * @param string $dir */ - private static function rmdir($dir) + protected static function rmdir($dir) { $it = new \RecursiveDirectoryIterator($dir); $files = new \RecursiveIteratorIterator($it, \RecursiveIteratorIterator::CHILD_FIRST); @@ -47,7 +47,7 @@ class Helper * @param string $source * @param string $destination */ - private static function copyRecursive($source, $destination) + protected static function copyRecursive($source, $destination) { if (!is_dir($destination)) { mkdir($destination); diff --git a/libs/Server/Server.php b/libs/Server/Server.php index 1469b69..5007182 100644 --- a/libs/Server/Server.php +++ b/libs/Server/Server.php @@ -5,7 +5,6 @@ use Todaymade\Daux\DauxHelper; use Todaymade\Daux\Exception; use Todaymade\Daux\Format\HTML\MarkdownPage; use Todaymade\Daux\Format\HTML\RawPage; -use Todaymade\Daux\Format\HTML\SimplePage; use Todaymade\Daux\Tree\Raw; class Server diff --git a/libs/Tree/Builder.php b/libs/Tree/Builder.php index 94713d5..e4f0225 100644 --- a/libs/Tree/Builder.php +++ b/libs/Tree/Builder.php @@ -38,7 +38,6 @@ class Builder continue; } - $entry = null; if (is_dir($path)) { $new = new Directory($node, static::getUriFromFilename(static::getFilename($path)), $path); $new->setName(DauxHelper::pathinfo($path)['filename']); diff --git a/libs/Tree/Entry.php b/libs/Tree/Entry.php index d922dc9..5c23919 100644 --- a/libs/Tree/Entry.php +++ b/libs/Tree/Entry.php @@ -37,11 +37,11 @@ abstract class Entry $this->setUri($uri); $this->setParent($parent); - if ($path) { + if ($path !== null) { $this->path = $path; } - if ($last_modified) { + if ($last_modified !== null) { $this->last_modified = $last_modified; } } @@ -118,7 +118,8 @@ abstract class Entry // First we try to find a real page foreach ($this->getEntries() as $node) { if ($node instanceof Content) { - if (!$node->getParent() && $node->title == 'index') { + // TODO :: this condition looks weird ... + if (!$node->getParent() && $node->getTitle() == 'index') { //the homepage should not count as first page continue; } @@ -174,7 +175,7 @@ abstract class Entry /** * Return all parents starting with the root * - * @return array + * @return Directory[] */ public function getParents() { @@ -231,7 +232,7 @@ abstract class Entry 'name' => $this->getName(), 'uri' => $this->getUri(), 'url' => $this->getUrl(), - 'index' => $this->getIndexPage()? $this->getIndexPage()->getUrl() : '', + 'index' => $this->getIndexPage() ? $this->getIndexPage()->getUrl() : '', 'first' => $this->getFirstPage() ? $this->getFirstPage()->getUrl() : '', 'path' => $this->path ]; diff --git a/libs/Tree/Root.php b/libs/Tree/Root.php index 6aae9d7..92eec5c 100644 --- a/libs/Tree/Root.php +++ b/libs/Tree/Root.php @@ -5,7 +5,7 @@ class Root extends Directory /** * The root doesn't have a parent * - * @param Directory $uri + * @param string $uri */ public function __construct($uri) {