';
+ return '
';
}
if ($hasAnnotations) {
@@ -862,9 +930,11 @@ public function format_container_chunk_top($open, $name, $attrs, $props) {
$toc = $this->createTOC($id, $name, $props);
}
- return $toc."
";
+ return $toc . "
';
+ return '
';
}
$toc = '
';
@@ -904,10 +976,14 @@ public function format_container_chunk_below($open, $name, $attrs, $props) {
$this->notify(Render::CHUNK, Render::CLOSE);
return $toc . '
';
}
- public function format_exception_chunk($open, $name, $attrs, $props) {
+
+ public function format_exception_chunk($open, $name, $attrs, $props)
+ {
return $this->format_container_chunk_below($open, "reference", $attrs, $props);
}
- public function format_section_chunk($open, $name, $attrs, $props) {
+
+ public function format_section_chunk($open, $name, $attrs, $props)
+ {
if ($open) {
if (!isset($attrs[Reader::XMLNS_XML]["id"])) {
$this->isSectionChunk[] = false;
@@ -921,10 +997,12 @@ public function format_section_chunk($open, $name, $attrs, $props) {
}
return $this->transformFromMap($open, "div", $name, $attrs, $props);
}
- public function format_chunk($open, $name, $attrs, $props) {
+
+ public function format_chunk($open, $name, $attrs, $props)
+ {
if ($open) {
$this->cchunk = $this->dchunk;
- if(isset($attrs[Reader::XMLNS_XML]["id"])) {
+ if (isset($attrs[Reader::XMLNS_XML]["id"])) {
$id = $attrs[Reader::XMLNS_XML]["id"];
} else {
$id = uniqid("phd");
@@ -936,64 +1014,68 @@ public function format_chunk($open, $name, $attrs, $props) {
}
$this->CURRENT_CHUNK = $id;
- $this->CURRENT_LANG = $props["lang"];
+ $this->CURRENT_LANG = $props["lang"];
$this->notify(Render::CHUNK, Render::OPEN);
- return '
';
+ return '
';
}
$this->notify(Render::CHUNK, Render::CLOSE);
$str = "";
foreach ($this->cchunk["footnote"] as $k => $note) {
$str .= '\n";
}
$this->cchunk = $this->dchunk;
- return $str. "
";
+ return $str . "
";
}
- public function format_refsect1_para($open, $name, $attrs, $props) {
+
+ public function format_refsect1_para($open, $name, $attrs, $props)
+ {
if ($open) {
switch ($props["sibling"]) {
- case "methodsynopsis":
- case "constructorsynopsis":
- case "destructorsynopsis":
- return '
';
+ default:
+ return '
';
}
}
return '
';
}
- public function format_refsect($open, $name, $attrs) {
+
+ public function format_refsect($open, $name, $attrs)
+ {
static $role = 0;
if ($open) {
- if(!isset($attrs[Reader::XMLNS_DOCBOOK]["role"])) {
+ if (!isset($attrs[Reader::XMLNS_DOCBOOK]["role"])) {
$attrs[Reader::XMLNS_DOCBOOK]["role"] = "unknown-" . ++$role;
}
$this->pushRole($attrs[Reader::XMLNS_DOCBOOK]["role"]);
if (isset($attrs[Reader::XMLNS_XML]["id"])) {
$id = $attrs[Reader::XMLNS_XML]["id"];
- }
- else {
- $id = $name. "-" . $this->CURRENT_CHUNK . "-" . $this->getRole();
+ } else {
+ $id = $name . "-" . $this->CURRENT_CHUNK . "-" . $this->getRole();
}
- return '
';
+ return '
';
}
$this->popRole();
return "
\n";
}
/** Legacy rendering functions for class synopsis tags that wraps the definition in a class synopsis info tag */
- public function format_classsynopsisinfo_oointerface($open, $name, $attrs) {
+ public function format_classsynopsisinfo_oointerface($open, $name, $attrs)
+ {
if ($open) {
if ($this->cchunk["classsynopsisinfo"]["ooclass"] === false) {
return '
';
@@ -1002,13 +1084,13 @@ public function format_classsynopsisinfo_oointerface($open, $name, $attrs) {
if ($this->cchunk["classsynopsisinfo"]["implements"] === false) {
$this->cchunk["classsynopsisinfo"]["implements"] = true;
if ($this->cchunk["classsynopsis"]["interface"]) {
- return 'extends ';
+ return 'extends ';
}
- return 'implements ';
+ return 'implements ';
}
- return ', ';
+ return ', ';
}
return "";
@@ -1059,10 +1141,10 @@ public function format_classsynopsisinfo($open, $name, $attrs)
$this->cchunk["classsynopsisinfo"] = $this->dchunk["classsynopsisinfo"];
if ($open) {
if (isset($attrs[Reader::XMLNS_DOCBOOK]["role"]) && $attrs[Reader::XMLNS_DOCBOOK]["role"] == "comment") {
- return '
{
"; return "
{
"; - } - } - if (isset($attrs[Reader::XMLNS_DOCBOOK]["choice"]) && $attrs[Reader::XMLNS_DOCBOOK]["choice"] == "opt") { - $this->params["opt"] = true; - } else { - $this->params["opt"] = false; - } - if ($this->params["count"]) { - $content .= ","; - if ($this->params["paramCount"] > 3) { - $content .= "
"; - } else { - $content .= " "; - } + if ($this->params["count"] === 0) { + $content .= "("; + if ($this->params["paramCount"] > 3) { + $content .= "
"; } - $content .= ''; - ++$this->params["count"]; - if (isset($attrs[Reader::XMLNS_DOCBOOK]["rep"]) && $attrs[Reader::XMLNS_DOCBOOK]["rep"] == "repeat") { - $this->params["ellipsis"] = '...'; + } + if (isset($attrs[Reader::XMLNS_DOCBOOK]["choice"]) && $attrs[Reader::XMLNS_DOCBOOK]["choice"] == "opt") { + $this->params["opt"] = true; + } else { + $this->params["opt"] = false; + } + if ($this->params["count"]) { + $content .= ","; + if ($this->params["paramCount"] > 3) { + $content .= "
"; } else { - $this->params["ellipsis"] = ''; + $content .= " "; } - return $content; + } + $content .= ''; + ++$this->params["count"]; + if (isset($attrs[Reader::XMLNS_DOCBOOK]["rep"]) && $attrs[Reader::XMLNS_DOCBOOK]["rep"] == "repeat") { + $this->params["ellipsis"] = '...'; + } else { + $this->params["ellipsis"] = ''; + } + return $content; } if ($this->params["opt"] && !$this->params["init"]) { return ' = ?'; @@ -1474,42 +1581,49 @@ public function format_methodparam($open, $name, $attrs) { return ""; } - public function format_methodname($open, $name, $attr) { + public function format_methodname($open, $name, $attr) + { if ($open) { - return ' '; + return ' '; } return ''; } - public function format_varname($open, $name, $attrs) { + public function format_varname($open, $name, $attrs) + { if ($open) { - return '$'; + return '$'; } return ""; } - public function format_fieldsynopsis_varname($open, $name, $attrs) { + + public function format_fieldsynopsis_varname($open, $name, $attrs) + { if ($open) { if ($this->cchunk["fieldsynopsis"]["modifier"] === "const") { return ''; } - return '$'; + return '$'; } return ''; } - public function format_footnoteref($open, $name, $attrs, $props) { + public function format_footnoteref($open, $name, $attrs, $props) + { if ($open) { $linkend = $attrs[Reader::XMLNS_DOCBOOK]["linkend"]; - foreach($this->cchunk["footnote"] as $k => $note) { + foreach ($this->cchunk["footnote"] as $k => $note) { if ($note["id"] === $linkend) { - return '[' .($k + 1). ']'; + return '[' . ($k + 1) . ']'; } } trigger_error("footnoteref ID '$linkend' not found", E_USER_WARNING); return ""; } } - public function format_footnote($open, $name, $attrs, $props) { + + public function format_footnote($open, $name, $attrs, $props) + { if ($open) { $count = count($this->cchunk["footnote"]); $noteid = isset($attrs[Reader::XMLNS_XML]["id"]) ? $attrs[Reader::XMLNS_XML]["id"] : $count + 1; @@ -1518,23 +1632,28 @@ public function format_footnote($open, $name, $attrs, $props) { if ($this->cchunk["table"]) { $this->cchunk["tablefootnotes"][$count] = $noteid; } - return '[' .($count + 1). ']'; + return '[' . ($count + 1) . ']'; } return ""; } /* {{{ FIXME: These are crazy workarounds :( */ - public function format_footnote_constant($open, $name, $attrs, $props) { + public function format_footnote_constant($open, $name, $attrs, $props) + { $k = count($this->cchunk["footnote"]) - 1; $this->cchunk["footnote"][$k]["str"] .= self::format_constant($open, $name, $attrs, $props); return ""; } - public function format_footnote_constant_text($value, $tag) { + + public function format_footnote_constant_text($value, $tag) + { $k = count($this->cchunk["footnote"]) - 1; $this->cchunk["footnote"][$k]["str"] .= $value; return ""; } - public function format_footnote_para($open, $name, $attrs, $props) { + + public function format_footnote_para($open, $name, $attrs, $props) + { $k = count($this->cchunk["footnote"]) - 1; if ($open) { $this->cchunk["footnote"][$k]["str"] .= ''; @@ -1544,7 +1663,9 @@ public function format_footnote_para($open, $name, $attrs, $props) { $this->cchunk["footnote"][$k]["str"] .= ""; return ""; } - public function format_footnote_para_text($value, $tag) { + + public function format_footnote_para_text($value, $tag) + { $k = count($this->cchunk["footnote"]) - 1; $this->cchunk["footnote"][$k]["str"] .= $value; return ""; @@ -1552,53 +1673,65 @@ public function format_footnote_para_text($value, $tag) { /* }}} */ - public function format_co($open, $name, $attrs, $props) { + public function format_co($open, $name, $attrs, $props) + { if (($open || $props["empty"]) && isset($attrs[Reader::XMLNS_XML]["id"])) { $co = ++$this->cchunk["co"]; - return '' .str_repeat("*", $co) .''; + return '' . str_repeat("*", $co) . ''; } /* Suppress closing tag if any */ return ""; } - public function format_calloutlist($open, $name, $attrs) { + + public function format_calloutlist($open, $name, $attrs) + { if ($open) { $this->cchunk["callouts"] = 0; return '
'; + return '
'; } - return ''; + return ''; } return ""; } - public function format_trademark($open, $name, $attrs, $props) { + + public function format_trademark($open, $name, $attrs, $props) + { if ($open) { - return ''; + return ''; } return '®'; } - public function format_userinput($open, $name, $attrs) { + + public function format_userinput($open, $name, $attrs) + { if ($open) { - return '
'; + return ''; } return ""; } - public function format_systemitem($open, $name, $attrs) { + + public function format_systemitem($open, $name, $attrs) + { if ($open) { $val = isset($attrs[Reader::XMLNS_DOCBOOK]["role"]) ? $attrs[Reader::XMLNS_DOCBOOK]["role"] : null; - switch($val) { - case "directive": - /* FIXME: Different roles should probably be handled differently */ - default: - return ''; + switch ($val) { + case "directive": + /* FIXME: Different roles should probably be handled differently */ + default: + return ''; } } return ""; } - public function format_example_content($open, $name, $attrs) { + + public function format_example_content($open, $name, $attrs) + { if ($open) { return ''; } return "
'; + return '
'; } - return '
" . ($this->autogen('example', $props['lang']) - . (isset($this->cchunk["examples"]) ? ++$this->cchunk["examples"] : "")) . " "; + . (isset($this->cchunk["examples"]) ? ++$this->cchunk["examples"] : "")) . " "; } return "
"; } + public function format_table_title($open, $name, $attrs, $props) { if ($props["empty"]) { @@ -1968,34 +2152,41 @@ public function format_table_title($open, $name, $attrs, $props) } return ""; } - public function format_variablelist_title($open, $name, $attrs, $props) { + + public function format_variablelist_title($open, $name, $attrs, $props) + { if ($open) { return ($this->getRole() === 'constant_list') ? "'; - foreach($questions as $node) { + foreach ($questions as $node) { $id = $xp->evaluate("ancestor::db:qandaentry", $node)->item(0)->getAttributeNs(Reader::XMLNS_XML, "id"); /* FIXME: No ID? How can we create an anchor for it then? */ @@ -2211,34 +2410,40 @@ public function format_qandaset($open, $name, $attrs, $props) { $id = uniqid("phd"); } - $retval .= '- '.htmlentities($node->textContent, ENT_QUOTES, "UTF-8").'
';
+ $retval .= '- ' . htmlentities($node->textContent, ENT_QUOTES, "UTF-8") . '
';
}
$retval .= "
' . $arFixes[$class][0]; } - public function format_dl($open, $name, $attrs, $props) { + public function format_dl($open, $name, $attrs, $props) + { if ($open) { return ''; } return '
'; } - public function format_itemizedlist($open, $name, $attrs, $props) { + public function format_itemizedlist($open, $name, $attrs, $props) + { if ($open) { return ''; } return '
'; } - public function format_simplelist($open, $name, $attrs, $props) { + public function format_simplelist($open, $name, $attrs, $props) + { if ($open) { $this->cchunk["simplelist"]["type"] = $attrs[Reader::XMLNS_DOCBOOK]["type"] ?? ""; $this->cchunk["simplelist"]["columns"] = $attrs[Reader::XMLNS_DOCBOOK]["columns"] ?? 1; @@ -2354,13 +2566,13 @@ public function format_simplelist($open, $name, $attrs, $props) { $list = match ($this->cchunk["simplelist"]["type"]) { "inline" => $this->simplelist_format_inline(), - "horiz" => $this->simplelist_format_horizontal($props["depth"]) - . $this->indent($props["depth"] + 1) . "'; + return '' : ' ';
}
public function getGeneratedExampleID($index)
{
$originalId = parent::getGeneratedExampleID($index);
- if (! $this->exampleCounterIsPerPage) {
+ if (!$this->exampleCounterIsPerPage) {
return $originalId;
}
if (preg_match('/^example\-[0-9]+$/', $originalId)) {
diff --git a/phpdotnet/phd/Package/IDE/API.php b/phpdotnet/phd/Package/IDE/API.php
index 97f6543f..e513eaef 100644
--- a/phpdotnet/phd/Package/IDE/API.php
+++ b/phpdotnet/phd/Package/IDE/API.php
@@ -35,14 +35,14 @@ class Package_IDE_API
*
* @var string
*/
- const FUNCTIONS_DIR = 'ide-xml';
+ public const FUNCTIONS_DIR = 'ide-xml';
/**
* Output file of the funclist format in the IDE Package.
*
* @var string
*/
- const FUNCLIST_FILE = 'ide-funclist.txt';
+ public const FUNCLIST_FILE = 'ide-funclist.txt';
/**
* PhD output directory.
diff --git a/phpdotnet/phd/Package/IDE/Base.php b/phpdotnet/phd/Package/IDE/Base.php
index f1992040..83edbbec 100644
--- a/phpdotnet/phd/Package/IDE/Base.php
+++ b/phpdotnet/phd/Package/IDE/Base.php
@@ -1,55 +1,56 @@
'format_notes',
- 'entry' => 'format_changelog_entry',
- 'function' => 'format_seealso_entry',
- 'listitem' => 'format_parameter_desc',
- 'methodparam' => 'format_methodparam',
- 'methodname' => 'format_seealso_entry',
- 'member' => 'format_member',
- 'note' => 'format_notes',
- 'refentry' => 'format_refentry',
- 'refpurpose' => 'format_refpurpose',
- 'refnamediv' => 'format_suppressed_tags',
- 'refsect1' => 'format_refsect1',
- 'row' => 'format_changelog_row',
- 'set' => 'format_set',
- 'tbody' => 'format_changelog_tbody',
- 'tip' => 'format_notes',
- 'warning' => 'format_notes',
+ 'caution' => 'format_notes',
+ 'entry' => 'format_changelog_entry',
+ 'function' => 'format_seealso_entry',
+ 'listitem' => 'format_parameter_desc',
+ 'methodparam' => 'format_methodparam',
+ 'methodname' => 'format_seealso_entry',
+ 'member' => 'format_member',
+ 'note' => 'format_notes',
+ 'refentry' => 'format_refentry',
+ 'refpurpose' => 'format_refpurpose',
+ 'refnamediv' => 'format_suppressed_tags',
+ 'refsect1' => 'format_refsect1',
+ 'row' => 'format_changelog_row',
+ 'set' => 'format_set',
+ 'tbody' => 'format_changelog_tbody',
+ 'tip' => 'format_notes',
+ 'warning' => 'format_notes',
);
- protected $textmap = array(
- 'function' => 'format_seealso_entry_text',
- 'initializer' => 'format_initializer_text',
- 'methodname' => 'format_seealso_entry_text',
- 'parameter' => 'format_parameter_text',
- 'refname' => 'format_refname_text',
- 'title' => 'format_suppressed_text',
- 'type' => 'format_type_text',
+ protected $textmap = array(
+ 'function' => 'format_seealso_entry_text',
+ 'initializer' => 'format_initializer_text',
+ 'methodname' => 'format_seealso_entry_text',
+ 'parameter' => 'format_parameter_text',
+ 'refname' => 'format_refname_text',
+ 'title' => 'format_suppressed_text',
+ 'type' => 'format_type_text',
);
protected $cchunk = array();
protected $dchunk = array(
- 'function' => array(),
- 'methodparam' => false,
- 'param' => array(
- 'name' => false,
- 'type' => false,
- 'description' => false,
- 'opt' => false,
- 'initializer' => false,
+ 'function' => array(),
+ 'methodparam' => false,
+ 'param' => array(
+ 'name' => false,
+ 'type' => false,
+ 'description' => false,
+ 'opt' => false,
+ 'initializer' => false,
),
- 'seealso' => array(
- 'name' => false,
- 'type' => false,
- 'description' => false,
+ 'seealso' => array(
+ 'name' => false,
+ 'type' => false,
+ 'description' => false,
),
- 'changelog' => array(
- 'entry' => false,
- 'version' => false,
- 'change' => false,
+ 'changelog' => array(
+ 'entry' => false,
+ 'version' => false,
+ 'change' => false,
),
);
@@ -58,45 +59,64 @@ abstract class Package_IDE_Base extends Format {
protected $role = false;
protected $versions;
- protected $function = array();
+ protected $function = array();
protected $dfunction = array(
- 'name' => null,
- 'purpose' => null,
- 'manualid' => null,
- 'version' => null,
- 'params' => array(),
- 'currentParam' => null,
- 'return' => array(
- 'type' => null,
- 'description' => null,
+ 'name' => null,
+ 'purpose' => null,
+ 'manualid' => null,
+ 'version' => null,
+ 'params' => array(),
+ 'currentParam' => null,
+ 'return' => array(
+ 'type' => null,
+ 'description' => null,
),
- 'errors' => null,
- 'notes' => array(),
- 'changelog' => array(),
- 'seealso' => array(),
+ 'errors' => null,
+ 'notes' => array(),
+ 'changelog' => array(),
+ 'seealso' => array(),
);
-
+
private array $chunkFlags = [];
public function __construct(
- Config $config,
+ Config $config,
OutputHandler $outputHandler
- ) {
+ )
+ {
parent::__construct($config, $outputHandler);
}
- public function createLink($for, &$desc = null, $type = Format::SDESC) {}
- public function UNDEF($open, $name, $attrs, $props) {}
- public function TEXT($value) {}
- public function CDATA($value) {}
- public function transformFromMap($open, $tag, $name, $attrs, $props) {}
- public function appendData($data) {}
+ public function createLink($for, &$desc = null, $type = Format::SDESC)
+ {
+ }
+
+ public function UNDEF($open, $name, $attrs, $props)
+ {
+ }
+
+ public function TEXT($value)
+ {
+ }
+
+ public function CDATA($value)
+ {
+ }
+
+ public function transformFromMap($open, $tag, $name, $attrs, $props)
+ {
+ }
+
+ public function appendData($data)
+ {
+ }
- public abstract function parseFunction();
+ abstract public function parseFunction();
- function writeChunk() {
+ public function writeChunk()
+ {
if (!isset($this->cchunk['funcname'][0])) {
- return;
+ return;
}
if (false !== strpos($this->cchunk['funcname'][0], ' ')) {
return;
@@ -109,7 +129,7 @@ function writeChunk() {
file_put_contents($filename, $data);
$index = 0;
- while(isset($this->cchunk['funcname'][++$index])) {
+ while (isset($this->cchunk['funcname'][++$index])) {
$filename = $this->getOutputDir() . $this->cchunk['funcname'][$index] . $this->getExt();
// Replace the default function name by the alternative one
$content = preg_replace('/' . $this->cchunk['funcname'][0] . '/',
@@ -118,7 +138,8 @@ function writeChunk() {
}
}
- public function renderHTML() {
+ public function renderHTML()
+ {
static $format = null;
if ($format == null) {
$format = new Package_Generic_ChunkedXHTML(
@@ -129,63 +150,70 @@ public function renderHTML() {
return $format->parse(trim(ReaderKeeper::getReader()->readInnerXML()));
}
- public function CHUNK($value) {
+ public function CHUNK($value)
+ {
$this->chunkFlags = $value;
}
- public function STANDALONE($value) {
+ public function STANDALONE($value)
+ {
$this->registerElementMap($this->elementmap);
$this->registerTextMap($this->textmap);
}
- public function INIT($value) {
+ public function INIT($value)
+ {
$this->loadVersionInfo();
$this->createOutputDirectory();
}
- public function FINALIZE($value) {
+ public function FINALIZE($value)
+ {
}
- public function VERBOSE($value) {
+ public function VERBOSE($value)
+ {
$this->outputHandler->v('Starting %s rendering', $this->getFormatName(), VERBOSE_FORMAT_RENDERING);
}
- public function update($event, $value = null) {
- switch($event) {
- case Render::CHUNK:
- $this->CHUNK($value);
- break;
- case Render::STANDALONE:
- $this->STANDALONE($value);
- break;
- case Render::INIT:
- $this->INIT($value);
- break;
- case Render::FINALIZE:
- $this->FINALIZE($value);
- break;
- case Render::VERBOSE:
- $this->VERBOSE($value);
- break;
- }
- }
-
- public static function generateVersionInfo($filename) {
+ public function update($event, $value = null)
+ {
+ switch ($event) {
+ case Render::CHUNK:
+ $this->CHUNK($value);
+ break;
+ case Render::STANDALONE:
+ $this->STANDALONE($value);
+ break;
+ case Render::INIT:
+ $this->INIT($value);
+ break;
+ case Render::FINALIZE:
+ $this->FINALIZE($value);
+ break;
+ case Render::VERBOSE:
+ $this->VERBOSE($value);
+ break;
+ }
+ }
+
+ public static function generateVersionInfo($filename)
+ {
static $info;
if ($info) {
return $info;
}
- $r = new \XMLReader;
+ $r = new \XMLReader();
if (!$r->open($filename)) {
- throw new \Exception;
+ throw new \Exception();
}
$versions = array();
- while($r->read()) {
+ while ($r->read()) {
if (
$r->moveToAttribute('name')
&& ($funcname = str_replace(
array('::', '->', '__', '_', '$'),
- array('-', '-', '-', '-', ''),
+ array('-', '-', '-', '-', ''),
$r->value))
&& $r->moveToAttribute('from')
&& ($from = $r->value)
@@ -199,19 +227,21 @@ public static function generateVersionInfo($filename) {
return $versions;
}
- public function versionInfo($funcname) {
+ public function versionInfo($funcname)
+ {
$funcname = str_replace(
- array('.', '::', '->', '->', '__', '_', '$', '()'),
- array('-', '-', '-', '-', '-', '-', '', ''),
- strtolower($funcname));
- if(isset($this->versions[$funcname])) {
- return $this->versions[$funcname];
+ array('.', '::', '->', '->', '__', '_', '$', '()'),
+ array('-', '-', '-', '-', '-', '-', '', ''),
+ strtolower($funcname));
+ if (isset($this->versions[$funcname])) {
+ return $this->versions[$funcname];
}
$this->outputHandler->v('No version info for %s', $funcname, VERBOSE_NOVERSION);
return false;
}
- public function loadVersionInfo() {
+ public function loadVersionInfo()
+ {
if (file_exists($this->config->phpwebVersionFilename)) {
$this->versions = self::generateVersionInfo($this->config->phpwebVersionFilename);
} else {
@@ -219,34 +249,37 @@ public function loadVersionInfo() {
}
}
- public function createOutputDirectory() {
+ public function createOutputDirectory()
+ {
$this->setOutputDir($this->config->outputDir . strtolower($this->getFormatName()) . '/');
if (file_exists($this->getOutputDir())) {
if (!is_dir($this->getOutputDir())) {
trigger_error("Output directory is a file?", E_USER_ERROR);
}
- } else {
- if (!mkdir($this->getOutputDir(), 0777, true)) {
- trigger_error("Can't create output directory", E_USER_ERROR);
- }
+ } elseif (!mkdir($this->getOutputDir(), 0777, true)) {
+ trigger_error("Can't create output directory", E_USER_ERROR);
}
}
- public function format_suppressed_tags($open, $name, $attrs, $props) {
+ public function format_suppressed_tags($open, $name, $attrs, $props)
+ {
return '';
}
- public function format_suppressed_text($value, $tag) {
+ public function format_suppressed_text($value, $tag)
+ {
return '';
}
- public function format_set($open, $name, $attrs, $props) {
+ public function format_set($open, $name, $attrs, $props)
+ {
if (isset($attrs[Reader::XMLNS_XML]['id']) && $attrs[Reader::XMLNS_XML]['id'] == 'funcref') {
$this->isFunctionRefSet = $open;
}
}
- public function format_refentry($open, $name, $attrs, $props) {
+ public function format_refentry($open, $name, $attrs, $props)
+ {
if (!$this->isFunctionRefSet) {
return;
}
@@ -254,25 +287,28 @@ public function format_refentry($open, $name, $attrs, $props) {
$this->function = $this->dfunction;
$this->cchunk = $this->dchunk;
- $this->function['manualid'] = $attrs[Reader::XMLNS_XML]['id'];
+ $this->function['manualid'] = $attrs[Reader::XMLNS_XML]['id'];
return;
}
$this->writeChunk();
}
- public function format_refname_text($value, $tag) {
+ public function format_refname_text($value, $tag)
+ {
if ($this->isFunctionRefSet) {
$this->cchunk['funcname'][] = $this->toValidName(trim($value));
}
}
- public function format_refpurpose($open, $name, $attrs, $props) {
+ public function format_refpurpose($open, $name, $attrs, $props)
+ {
if ($this->isFunctionRefSet && $open) {
$this->function['purpose'] = str_replace("\n", '', trim(ReaderKeeper::getReader()->readString()));
}
}
- public function format_refsect1($open, $name, $attrs, $props) {
+ public function format_refsect1($open, $name, $attrs, $props)
+ {
if (!$this->isFunctionRefSet) {
return;
}
@@ -292,7 +328,8 @@ public function format_refsect1($open, $name, $attrs, $props) {
}
}
- public function format_type_text($value, $tag) {
+ public function format_type_text($value, $tag)
+ {
if (!$this->isFunctionRefSet) {
return;
}
@@ -305,8 +342,9 @@ public function format_type_text($value, $tag) {
}
}
- public function format_methodparam($open, $name, $attrs, $props) {
- if ($this->role != 'description' || !$this->isFunctionRefSet ) {
+ public function format_methodparam($open, $name, $attrs, $props)
+ {
+ if ($this->role != 'description' || !$this->isFunctionRefSet) {
return;
}
if ($open) {
@@ -329,7 +367,8 @@ public function format_methodparam($open, $name, $attrs, $props) {
$this->function['params'][$param['name']] = $param;
}
- public function format_parameter_text($value, $tag) {
+ public function format_parameter_text($value, $tag)
+ {
if (!$this->isFunctionRefSet) {
return;
}
@@ -341,7 +380,8 @@ public function format_parameter_text($value, $tag) {
}
}
- public function format_parameter_desc($open, $name, $attrs, $props) {
+ public function format_parameter_desc($open, $name, $attrs, $props)
+ {
if ($this->role != 'parameters') {
return;
}
@@ -354,7 +394,8 @@ public function format_parameter_desc($open, $name, $attrs, $props) {
}
}
- public function format_initializer_text($value, $tag) {
+ public function format_initializer_text($value, $tag)
+ {
if (!$this->isFunctionRefSet) {
return;
}
@@ -364,7 +405,8 @@ public function format_initializer_text($value, $tag) {
$this->cchunk['param']['initializer'] = $value;
}
- public function format_return($open, $name, $attrs, $props) {
+ public function format_return($open, $name, $attrs, $props)
+ {
if ($open) {
//Read the description
$content = $this->renderHTML();
@@ -374,7 +416,8 @@ public function format_return($open, $name, $attrs, $props) {
}
}
- public function format_notes($open, $name, $attrs, $props) {
+ public function format_notes($open, $name, $attrs, $props)
+ {
if ($this->role != 'notes' || !$this->isFunctionRefSet) {
return;
}
@@ -388,7 +431,8 @@ public function format_notes($open, $name, $attrs, $props) {
}
}
- public function format_errors($open, $name, $attrs, $props) {
+ public function format_errors($open, $name, $attrs, $props)
+ {
if ($open) {
//Read the description
$content = $this->renderHTML();
@@ -398,13 +442,15 @@ public function format_errors($open, $name, $attrs, $props) {
}
}
- public function format_changelog_tbody($open, $name, $attrs, $props) {
+ public function format_changelog_tbody($open, $name, $attrs, $props)
+ {
if ($this->role == 'changelog' && $this->isFunctionRefSet) {
$this->isChangelogRow = $open;
}
}
- public function format_changelog_row($open, $name, $attrs, $props) {
+ public function format_changelog_row($open, $name, $attrs, $props)
+ {
if ($this->isChangelogRow) {
if ($open) {
$this->cchunk['changelog'] = $this->dchunk['changelog'];
@@ -416,23 +462,26 @@ public function format_changelog_row($open, $name, $attrs, $props) {
}
}
- public function format_changelog_entry($open, $name, $attrs, $props) {
+ public function format_changelog_entry($open, $name, $attrs, $props)
+ {
if ($this->isChangelogRow && $open) {
$entryType = ($this->cchunk['changelog']['entry'] == 'version')
- ? 'change'
- : 'version';
+ ? 'change'
+ : 'version';
$this->cchunk['changelog'][$entryType] = trim(ReaderKeeper::getReader()->readString());
$this->cchunk['changelog']['entry'] = $entryType;
}
}
- public function format_changelog_entry_text($value, $tag) {
+ public function format_changelog_entry_text($value, $tag)
+ {
if ($this->isChangelogRow) {
$this->cchunk['changelog'][$this->cchunk['changelog']['entry']] = $value;
}
}
- public function format_member($open, $name, $attrs, $props) {
+ public function format_member($open, $name, $attrs, $props)
+ {
if ($this->role == 'seealso' && $this->isFunctionRefSet) {
if ($open) {
$this->cchunk['seealso'] = $this->dchunk['seealso'];
@@ -449,19 +498,22 @@ public function format_member($open, $name, $attrs, $props) {
}
}
- public function format_seealso_entry($open, $name, $attrs, $props) {
+ public function format_seealso_entry($open, $name, $attrs, $props)
+ {
if ($this->role == 'seealso' && $this->isFunctionRefSet) {
$this->cchunk['seealso']['type'] = $name;
}
}
- public function format_seealso_entry_text($value, $tag) {
+ public function format_seealso_entry_text($value, $tag)
+ {
if ($this->role == 'seealso' && $this->isFunctionRefSet) {
$this->cchunk['seealso']['name'] = $value;
}
}
- public function toValidName($functionName) {
+ public function toValidName($functionName)
+ {
return str_replace(array('::', '->', '()'), array('.', '.', ''), $functionName);
}
diff --git a/phpdotnet/phd/Package/IDE/demo.php b/phpdotnet/phd/Package/IDE/demo.php
index fd7601cd..e0e7cfaa 100644
--- a/phpdotnet/phd/Package/IDE/demo.php
+++ b/phpdotnet/phd/Package/IDE/demo.php
@@ -11,7 +11,7 @@
spl_autoload_register(array("phpdotnet\\phd\\Autoloader", "autoload"));
//FIXME Remove this call to Config
-$config = new PhD\Config;
+$config = new PhD\Config();
$config->init(array());
function usage()
diff --git a/phpdotnet/phd/Package/PEAR/CHM.php b/phpdotnet/phd/Package/PEAR/CHM.php
index d016be5b..c7ab69e1 100755
--- a/phpdotnet/phd/Package/PEAR/CHM.php
+++ b/phpdotnet/phd/Package/PEAR/CHM.php
@@ -2,8 +2,8 @@
namespace phpdotnet\phd;
class Package_PEAR_CHM extends Package_PEAR_ChunkedXHTML {
- const DEFAULT_FONT = "Arial,10,0";
- const DEFAULT_TITLE = "PEAR Manual";
+ public const DEFAULT_FONT = "Arial,10,0";
+ public const DEFAULT_TITLE = "PEAR Manual";
// Array to manual code -> HTML Help Code conversion
// Code list: http://www.helpware.net/htmlhelp/hh_info.htm
diff --git a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
index 8a8383b5..bd4eeeca 100755
--- a/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
+++ b/phpdotnet/phd/Package/PEAR/ChunkedXHTML.php
@@ -82,10 +82,8 @@ public function update($event, $value = null) {
if (!is_dir($this->getOutputDir())) {
trigger_error("Output directory is a file?", E_USER_ERROR);
}
- } else {
- if (!mkdir($this->getOutputDir(), 0777, true)) {
- trigger_error("Can't create output directory", E_USER_ERROR);
- }
+ } elseif (!mkdir($this->getOutputDir(), 0777, true)) {
+ trigger_error("Can't create output directory", E_USER_ERROR);
}
if ($this->config->css) {
$this->fetchStylesheet();
diff --git a/phpdotnet/phd/Package/PEAR/XHTML.php b/phpdotnet/phd/Package/PEAR/XHTML.php
index dcbc8cd7..a6b3fa43 100755
--- a/phpdotnet/phd/Package/PEAR/XHTML.php
+++ b/phpdotnet/phd/Package/PEAR/XHTML.php
@@ -348,7 +348,7 @@ abstract class Package_PEAR_XHTML extends Package_Generic_XHTML {
* If whitespace should be trimmed.
* Helpful for programlistings that are encapsulated in
'; } return '
'; } /* Support for key inputs is coded like junk */ - public function format_keycap($open, $name, $attrs, $props) { + public function format_keycap($open, $name, $attrs, $props) + { if ($open) { $content = ''; if ($props['sibling']) { @@ -2486,7 +2706,8 @@ public function format_keycap($open, $name, $attrs, $props) { return ''; } - public function format_keycombo($open, $name, $attrs, $props) { + public function format_keycombo($open, $name, $attrs, $props) + { if (isset($attrs[Reader::XMLNS_DOCBOOK]["action"])) { if ($attrs[Reader::XMLNS_DOCBOOK]["action"] !== "simul") { @@ -2499,12 +2720,13 @@ public function format_keycombo($open, $name, $attrs, $props) { return ''; } - public function format_whitespace($whitespace, $elementStack, $currentDepth) { + public function format_whitespace($whitespace, $elementStack, $currentDepth) + { /* The following if is to skip unnecessary whitespaces in the parameter list */ if ( in_array($elementStack[$currentDepth - 1], ['methodsynopsis', 'constructorsynopsis', 'destructorsynopsis'], true) && (in_array($elementStack[$currentDepth] ?? "", ["methodname", "methodparam", "type", "void"], true) - || count($elementStack) === $currentDepth) + || count($elementStack) === $currentDepth) ) { return false; } @@ -2530,7 +2752,7 @@ public function format_whitespace($whitespace, $elementStack, $currentDepth) { && ($this->cchunk["simplelist"]["type"] === "inline" || $this->cchunk["simplelist"]["type"] === "vert" || $this->cchunk["simplelist"]["type"] === "horiz") - ) { + ) { return false; } @@ -2545,14 +2767,15 @@ public function format_whitespace($whitespace, $elementStack, $currentDepth) { return $whitespace; } - public function format_caption($open, $name, $attrs, $props) { + public function format_caption($open, $name, $attrs, $props) + { return $open ? 'tags * - * @var boolean + * @var bool * * @see CDATA() */ @@ -643,7 +643,7 @@ public function format_phd_pearapi($open, $name, $attrs, $props) if (count($arLinkend) == 1) { //link to class $linktpl = '{$package}/docs/latest/{$package}/{$class}.html'; - } else if ($arLinkend[1]{0} == '$') { + } elseif ($arLinkend[1]{0} == '$') { //link to class variable $variable = $arLinkend[1]; $linktpl = '{$package}/docs/latest/{$package}/{$class}.html#var{$variable}'; diff --git a/phpdotnet/phd/Package/PHP/CHM.php b/phpdotnet/phd/Package/PHP/CHM.php index 86d9c445..3d36b79a 100644 --- a/phpdotnet/phd/Package/PHP/CHM.php +++ b/phpdotnet/phd/Package/PHP/CHM.php @@ -3,8 +3,8 @@ class Package_PHP_CHM extends Package_PHP_ChunkedXHTML { - const DEFAULT_FONT = "Arial,10,0"; - const DEFAULT_TITLE = "PHP Manual"; + public const DEFAULT_FONT = "Arial,10,0"; + public const DEFAULT_TITLE = "PHP Manual"; // Array to manual code -> HTML Help Code conversion // Code list: http://www.helpware.net/htmlhelp/hh_info.htm diff --git a/phpdotnet/phd/Package/PHP/HowTo.php b/phpdotnet/phd/Package/PHP/HowTo.php index 20db365e..b6983608 100644 --- a/phpdotnet/phd/Package/PHP/HowTo.php +++ b/phpdotnet/phd/Package/PHP/HowTo.php @@ -30,10 +30,8 @@ public function update($event, $value = null) { if (!is_dir($this->getOutputDir())) { trigger_error("Output directory is a file?", E_USER_ERROR); } - } else { - if (!mkdir($this->getOutputDir(), 0777, true)) { - trigger_error("Can't create output directory", E_USER_ERROR); - } + } elseif (!mkdir($this->getOutputDir(), 0777, true)) { + trigger_error("Can't create output directory", E_USER_ERROR); } break; } diff --git a/phpdotnet/phd/Package/PHP/KDevelop.php b/phpdotnet/phd/Package/PHP/KDevelop.php index 5783e898..5fc5927b 100644 --- a/phpdotnet/phd/Package/PHP/KDevelop.php +++ b/phpdotnet/phd/Package/PHP/KDevelop.php @@ -2,7 +2,7 @@ namespace phpdotnet\phd; class Package_PHP_KDevelop extends Format { - const DEFAULT_HREF = "http://www.php.net/manual/en/"; + public const DEFAULT_HREF = "http://www.php.net/manual/en/"; protected $elementmap = array( 'book' => 'format_tocsect1', @@ -132,10 +132,8 @@ public function format_tocsect1($open, $name, $attrs) { $name = htmlspecialchars(Format::getShortDescription($id), ENT_QUOTES, 'UTF-8'); $url = (Format::getFilename($id) ? Format::getFilename($id) : $id) . $this->getExt(); fwrite($this->getFileStream(), "\n");
- } else {
- if ($hasChild)
- fwrite($this->getFileStream(), " \n");
- }
+ } elseif ($hasChild)
+ fwrite($this->getFileStream(), "\n");
return "";
}
diff --git a/phpdotnet/phd/Package/PHP/Web.php b/phpdotnet/phd/Package/PHP/Web.php
index ad36b7cf..f136b8ef 100644
--- a/phpdotnet/phd/Package/PHP/Web.php
+++ b/phpdotnet/phd/Package/PHP/Web.php
@@ -91,10 +91,8 @@ public function update($event, $value = null) {
if (!is_dir($this->getOutputDir())) {
trigger_error("Output directory is a file?", E_USER_ERROR);
}
- } else {
- if (!mkdir($this->getOutputDir(), 0777, true)) {
- trigger_error("Can't create output directory", E_USER_ERROR);
- }
+ } elseif (!mkdir($this->getOutputDir(), 0777, true)) {
+ trigger_error("Can't create output directory", E_USER_ERROR);
}
if ($this->getFormatName() == "PHP-Web") {
if (!$this->config->noToc && is_dir($this->getOutputDir() . 'toc')) {
@@ -409,7 +407,7 @@ public static function generateSourcesInfo($filename) {
return array();
}
- $r = new \XMLReader;
+ $r = new \XMLReader();
if (!$r->open($filename)) {
trigger_error(vsprintf("Can't open the sources file (%s)", [$filename]), E_USER_ERROR);
return array();
diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
index 1109038e..e33f97d2 100644
--- a/phpdotnet/phd/Package/PHP/XHTML.php
+++ b/phpdotnet/phd/Package/PHP/XHTML.php
@@ -261,7 +261,7 @@ public static function generateVersionInfo($filename) {
return array();
}
- $r = new \XMLReader;
+ $r = new \XMLReader();
if (!$r->open($filename)) {
trigger_error(vsprintf("Can't open the version info file (%s)", [$filename]), E_USER_ERROR);
}
@@ -298,7 +298,7 @@ protected static function generateDeprecatedInfo($filename) {
return array();
}
- $r = new \XMLReader;
+ $r = new \XMLReader();
if (!$r->open($filename)) {
trigger_error(vsprintf("Can't open the version info file (%s)", [$filename]), E_USER_ERROR);
}
@@ -332,7 +332,7 @@ public static function generateAcronymInfo($filename) {
return array();
}
- $r = new \XMLReader;
+ $r = new \XMLReader();
if (!$r->open($filename)) {
trigger_error(vsprintf("Could not open file for accessing acronym information (%s)", [$filename]), E_USER_ERROR);
}
@@ -347,7 +347,7 @@ public static function generateAcronymInfo($filename) {
$r->read();
$k = $r->value;
$acronyms[$k] = "";
- } else if ($r->name == "simpara") {
+ } elseif ($r->name == "simpara") {
$r->read();
$acronyms[$k] = $r->value;
}
@@ -425,15 +425,13 @@ public function format_methodsynopsis_type($open, $tag, $attrs) {
"intersection" => "&",
};
}
- } else {
- if (
- isset($attrs[Reader::XMLNS_DOCBOOK]["class"])
- && ($attrs[Reader::XMLNS_DOCBOOK]["class"] === "union"
- || $attrs[Reader::XMLNS_DOCBOOK]["class"] === "intersection")
- ) {
- $lastSeparator = array_pop($this->cchunk["methodsynopsis"]["type_separator_stack"]);
- $this->cchunk["methodsynopsis"]["type_separator"][count($this->cchunk["methodsynopsis"]["type_separator"]) - 1] = end($this->cchunk["methodsynopsis"]["type_separator_stack"]) ?: $lastSeparator;
- }
+ } elseif (
+ isset($attrs[Reader::XMLNS_DOCBOOK]["class"])
+ && ($attrs[Reader::XMLNS_DOCBOOK]["class"] === "union"
+ || $attrs[Reader::XMLNS_DOCBOOK]["class"] === "intersection")
+ ) {
+ $lastSeparator = array_pop($this->cchunk["methodsynopsis"]["type_separator_stack"]);
+ $this->cchunk["methodsynopsis"]["type_separator"][count($this->cchunk["methodsynopsis"]["type_separator"]) - 1] = end($this->cchunk["methodsynopsis"]["type_separator_stack"]) ?: $lastSeparator;
}
return "";
@@ -541,7 +539,7 @@ public function format_methodsynopsis($open, $name, $attrs, $props) {
$content = "";
if ($this->params["paramCount"] > 3) {
$content .= ""; - } else if ($this->params["paramCount"] === 0) { + } elseif ($this->params["paramCount"] === 0) { $content .= "("; } @@ -652,15 +650,13 @@ public function format_type_methodparam($open, $tag, $attrs) { "intersection" => "&", }; } - } else { - if ( - isset($attrs[Reader::XMLNS_DOCBOOK]["class"]) - && ($attrs[Reader::XMLNS_DOCBOOK]["class"] === "union" - || $attrs[Reader::XMLNS_DOCBOOK]["class"] === "intersection") - ) { - $lastSeparator = array_pop($this->cchunk["methodparam"]["type_separator_stack"]); - $this->cchunk["methodparam"]["type_separator"][count($this->cchunk["methodparam"]["type_separator"]) - 1] = end($this->cchunk["methodparam"]["type_separator_stack"]) ?: $lastSeparator; - } + } elseif ( + isset($attrs[Reader::XMLNS_DOCBOOK]["class"]) + && ($attrs[Reader::XMLNS_DOCBOOK]["class"] === "union" + || $attrs[Reader::XMLNS_DOCBOOK]["class"] === "intersection") + ) { + $lastSeparator = array_pop($this->cchunk["methodparam"]["type_separator_stack"]); + $this->cchunk["methodparam"]["type_separator"][count($this->cchunk["methodparam"]["type_separator"]) - 1] = end($this->cchunk["methodparam"]["type_separator_stack"]) ?: $lastSeparator; } return ""; @@ -757,7 +753,7 @@ public function configureVerInfoAttribute($attrs) { /* TODO This should be migrated to the annotations attribute */ if (isset($attrs[Reader::XMLNS_DOCBOOK]["annotations"])) { $this->cchunk["verinfo"] = !str_contains($attrs[Reader::XMLNS_DOCBOOK]["annotations"], 'verify_info:false'); - } else if (isset($attrs[Reader::XMLNS_DOCBOOK]["role"])) { + } elseif (isset($attrs[Reader::XMLNS_DOCBOOK]["role"])) { $this->cchunk["verinfo"] = !($attrs[Reader::XMLNS_DOCBOOK]["role"] == "noversion"); } else { $this->cchunk["verinfo"] = true; diff --git a/phpdotnet/phd/Reader.php b/phpdotnet/phd/Reader.php index 796a2d71..864fda77 100644 --- a/phpdotnet/phd/Reader.php +++ b/phpdotnet/phd/Reader.php @@ -3,10 +3,10 @@ class Reader extends \XMLReader { - const XMLNS_XML = "http://www.w3.org/XML/1998/namespace"; - const XMLNS_XLINK = "http://www.w3.org/1999/xlink"; - const XMLNS_PHD = "http://www.php.net/ns/phd"; - const XMLNS_DOCBOOK = "http://docbook.org/ns/docbook"; + public const XMLNS_XML = "http://www.w3.org/XML/1998/namespace"; + public const XMLNS_XLINK = "http://www.w3.org/1999/xlink"; + public const XMLNS_PHD = "http://www.php.net/ns/phd"; + public const XMLNS_DOCBOOK = "http://docbook.org/ns/docbook"; protected OutputHandler $outputHandler; diff --git a/phpdotnet/phd/Reader/Partial.php b/phpdotnet/phd/Reader/Partial.php index 6ff1d631..9ed188ba 100644 --- a/phpdotnet/phd/Reader/Partial.php +++ b/phpdotnet/phd/Reader/Partial.php @@ -78,15 +78,13 @@ public function read(): bool { return $ret; } elseif (empty($this->partial)) { return false; - } else { + } elseif ($id && $this->parents) { // If we are used by the indexer then we have no clue about the // parents :) - if ($id && $this->parents) { - // If this id isn't one of our ancestors we can jump - // completely over it - if (!in_array($id, $this->parents)) { - parent::next(); - } + // If this id isn't one of our ancestors we can jump + // completely over it + if (!in_array($id, $this->parents)) { + parent::next(); } } } diff --git a/phpdotnet/phd/Render.php b/phpdotnet/phd/Render.php index 5e4201cd..62a53237 100644 --- a/phpdotnet/phd/Render.php +++ b/phpdotnet/phd/Render.php @@ -3,13 +3,13 @@ class Render extends ObjectStorage { - const CHUNK = 0x001; - const OPEN = 0x002; - const CLOSE = 0x004; - const STANDALONE = 0x008; - const INIT = 0x010; - const FINALIZE = 0x020; - const VERBOSE = 0x040; + public const CHUNK = 0x001; + public const OPEN = 0x002; + public const CLOSE = 0x004; + public const STANDALONE = 0x008; + public const INIT = 0x010; + public const FINALIZE = 0x020; + public const VERBOSE = 0x040; private $STACK = array(); diff --git a/render.php b/render.php index f7b3e3e3..7a37fcdd 100644 --- a/render.php +++ b/render.php @@ -8,7 +8,7 @@ spl_autoload_register(array(__NAMESPACE__ . "\\Autoloader", "autoload")); -$config = new Config; +$config = new Config(); $outputHandler = new OutputHandler($config); @@ -34,7 +34,7 @@ } } $optionsParser = new Options_Parser( - new Options_Handler($config, new Package_Generic_Factory, $outputHandler), + new Options_Handler($config, new Package_Generic_Factory(), $outputHandler), ...$packageHandlers ); $commandLineOptions = $optionsParser->getopt(); diff --git a/tests/setup.php b/tests/setup.php index 37ebb2de..11fb7c6e 100644 --- a/tests/setup.php +++ b/tests/setup.php @@ -7,7 +7,7 @@ Autoloader::setPackageDirs([__INSTALLDIR__]); spl_autoload_register(["phpdotnet\\phd\\Autoloader", "autoload"]); -$config = new Config; +$config = new Config(); $outputHandler = new OutputHandler($config);