Skip to content

Commit

Permalink
Merge pull request #151 from doctrine/0.4.x
Browse files Browse the repository at this point in the history
Merge up 0.4.x into 0.5.x
  • Loading branch information
greg0ire authored May 13, 2021
2 parents 4e2516d + 4395342 commit 23a8c7a
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 2 deletions.
32 changes: 31 additions & 1 deletion .doctrine-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,41 @@
"slug": "latest",
"upcoming": true
},
{
"name": "0.5",
"branchName": "0.5.x",
"slug": "0.5",
"upcoming": true
},
{
"name": "0.4",
"branchName": "0.4.x",
"slug": "0.4",
"current": true
},
{
"name": "0.3",
"branchName": "0.3.x",
"slug": "0.3",
"maintained": false
},
{
"name": "0.2",
"branchName": "0.2.x",
"slug": "0.2",
"maintained": false
},
{
"name": "0.2",
"branchName": "0.2.x",
"slug": "0.2",
"maintained": false
},
{
"name": "0.1",
"branchName": "0.1.x",
"slug": "0.1",
"current": true
"maintained": false
}
]
}
23 changes: 22 additions & 1 deletion lib/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@

class Configuration
{
public const THEME_DEFAULT = 'default';
public const THEME_DEFAULT = 'default';
public const OUTPUT_FORMAT_CONSOLE = 'console';
public const OUTPUT_FORMAT_GITHUB = 'github';

/** @var string */
private $cacheDir;
Expand All @@ -53,6 +55,9 @@ class Configuration
/** @var bool */
private $warningsAsError = false;

/** @psalm-var self::OUTPUT_FORMAT_* */
private $outputFormat = self::OUTPUT_FORMAT_CONSOLE;

/** @var bool */
private $ignoreInvalidReferences = false;

Expand Down Expand Up @@ -227,6 +232,22 @@ public function isWarningsAsError(): bool
return $this->warningsAsError;
}

/**
* @psalm-return self::OUTPUT_FORMAT_*
*/
final public function getOutputFormat(): string
{
return $this->outputFormat;
}

/**
* @psalm-param self::OUTPUT_FORMAT_* $outputFormat
*/
final public function setOutputFormat(string $outputFormat): void
{
$this->outputFormat = $outputFormat;
}

public function getIgnoreInvalidReferences(): bool
{
return $this->ignoreInvalidReferences;
Expand Down

0 comments on commit 23a8c7a

Please sign in to comment.