danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Update config key to be more accurate ref #85

Browse Source
This commit is contained in:
Matthew Brown 2017-02-01 10:13:37 -05:00
parent d3abc0011d
commit a0711de023
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.xsd
View File

@ -23,7 +23,7 @@
<xs:attribute name="allowFileIncludes" type="xs:string" />
<xs:attribute name="totallyTyped" type="xs:string" />
<xs:attribute name="strictBinaryOperands" type="xs:string" />
<xs:attribute name="addVoidDocblockReturnType" type="xs:string" />
<xs:attribute name="requireVoidReturnType" type="xs:string" />
<xs:attribute name="useAssertForType" type="xs:string" />
</xs:complexType>

4
src/Psalm/Config.php
View File

@ -297,8 +297,8 @@ class Config
$config->strict_binary_operands = $attribute_text === 'true' || $attribute_text === '1';
}
if (isset($config_xml['addVoidDocblockReturnType'])) {
$attribute_text = (string) $config_xml['addVoidDocblockReturnType'];
if (isset($config_xml['requireVoidReturnType'])) {
$attribute_text = (string) $config_xml['requireVoidReturnType'];
$config->add_void_docblocks = $attribute_text === 'true' || $attribute_text === '1';
}

56
tests/ConfigTest.php
View File

@ -305,4 +305,60 @@ class ConfigTest extends PHPUnit_Framework_TestCase
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage MissingReturnType
* @return void
*/
public function testRequireVoidReturnTypeExists()
{
$this->project_checker->setConfig(
TestConfig::loadFromXML(
'psalm.xml',
'<?xml version="1.0"?>
<psalm
requireVoidReturnType="true">
<projectFiles>
<directory name="src" />
</projectFiles>
</psalm>'
)
);
$stmts = self::$parser->parse('<?php
function foo() {}
');
$file_checker = new FileChecker(getcwd() . '/src/somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @return void
*/
public function testDoNotRequireVoidReturnTypeExists()
{
$this->project_checker->setConfig(
TestConfig::loadFromXML(
'psalm.xml',
'<?xml version="1.0"?>
<psalm
requireVoidReturnType="false">
<projectFiles>
<directory name="src" />
</projectFiles>
</psalm>'
)
);
$stmts = self::$parser->parse('<?php
function foo() {}
');
$file_checker = new FileChecker(getcwd() . '/src/somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
}