Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: php
php: [ 7.1, 7.2, nightly ]
php: [ 7.1, 7.2, 7.3, nightly ]
sudo: false

env:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"phpDocumentor\\": [
"tests/component/",
"tests/unit/phpDocumentor",
"tests/mocks/"
"tests/bench/"
]
}
},
Expand All @@ -27,7 +27,7 @@
},
"require-dev": {
"mockery/mockery": "~1.0",
"mikey179/vfsStream": "~1.2"
"mikey179/vfsstream": "~1.2"
},
"extra": {
"branch-alias": {
Expand Down
141 changes: 99 additions & 42 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion phive.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpstan" version="^0.9.1" installed="0.10.7" location="./tools/phpstan" copy="true"/>
<phar name="phpunit" version="^6.0" installed="6.5.13" location="./tools/phpunit" copy="true"/>
<phar name="phpunit" version="^7.0" installed="7.5.7" location="./tools/phpunit" copy="true"/>
<phar name="phpbench" version="^0.16.9" installed="0.16.9" location="./tools/phpbench" copy="true"/>
</phive>
7 changes: 7 additions & 0 deletions phpbench.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"bootstrap": "vendor/autoload.php",
"path": "tests/bench",
"extensions": [
"PhpBench\\Extensions\\XDebug\\XDebugExtension"
]
}
21 changes: 11 additions & 10 deletions src/phpDocumentor/Reflection/Php/Factory/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use phpDocumentor\Reflection\Php\StrategyContainer;
use phpDocumentor\Reflection\Types\Context;
use phpDocumentor\Reflection\Types\ContextFactory;
use phpDocumentor\Reflection\Types\NamespaceNodeToContext;
use PhpParser\Comment\Doc;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_ as ClassNode;
Expand Down Expand Up @@ -98,10 +99,7 @@ private function createFile(CreateCommand $command)
$code = $file->getContents();
$nodes = $this->nodesFactory->create($code);

$contextFactory = new ContextFactory();
$context = $contextFactory->createForNamespace('\\', $code);

$docBlock = $this->createFileDocBlock(null, $command->getStrategies(), $context, $nodes);
$docBlock = $this->createFileDocBlock(null, $command->getStrategies(), null, $nodes);

$result = new FileElement(
$file->md5(),
Expand All @@ -110,18 +108,20 @@ private function createFile(CreateCommand $command)
$docBlock
);

$this->createElements(new Fqsen('\\'), $nodes, $result, $command->getStrategies());
$this->createElements($nodes, $result, $command->getStrategies(), null);

return $result;
}

/**
* @param Node[] $nodes
*/
private function createElements(Fqsen $namespace, array $nodes, FileElement $file, StrategyContainer $strategies): void
{
$contextFactory = new ContextFactory();
$context = $contextFactory->createForNamespace((string) $namespace, $file->getSource());
private function createElements(
array $nodes,
FileElement $file,
StrategyContainer $strategies,
?Context $context
): void {
foreach ($nodes as $node) {
switch (get_class($node)) {
case ClassNode::class:
Expand All @@ -140,8 +140,9 @@ private function createElements(Fqsen $namespace, array $nodes, FileElement $fil
$file->addInterface($interface);
break;
case NamespaceNode::class:
$context = (new NamespaceNodeToContext())($node);
$file->addNamespace($node->fqsen);
$this->createElements($node->fqsen, $node->stmts, $file, $strategies);
$this->createElements($node->stmts, $file, $strategies, $context);
break;
case TraitNode::class:
$strategy = $strategies->findMatching($node);
Expand Down
Loading