Skip to content

Allow @Template to get nullable values #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 4 commits into from
Oct 8, 2019
Merged

Allow @Template to get nullable values #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90a4056
add highlight to bug report
TomasVotruba Oct 8, 2019
5e65ebe
add test reference
TomasVotruba Oct 8, 2019
76cf03b
add rector version to bug report
TomasVotruba Oct 8, 2019
a38b60b
make SensioTemlateTagValue open to nullable valubes
TomasVotruba Oct 8, 2019
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
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/1_Bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ about: Report errors and problems

| Subject | Details |
| :------------- | :----------------------------------------------------------- |
| Rector version | e.g. v0.5.15 (invoke `vendor/bin/rector --version`) |
| PHP version | e.g. PHP 7.3 (invoke `php -v`) |
| Full Command | e.g. vendor/bin/rector process /src --set dead-code --debug |

Expand All @@ -20,4 +21,10 @@ about: Report errors and problems
<!-- if possible, always run Rector on specfic file, that causes the error -->
<!-- e.g. vendor/bin/rector process /src/SpecificFile.php --set dead-code --debug -->

```php
<?php

// put file content here
```

## Expected Behaviour
14 changes: 7 additions & 7 deletions packages/BetterPhpDocParser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ final class SensioTemplateTagValueNode extends AbstractTagValueNode
private $template;

/**
* @var mixed[]
* @var mixed[]|null
*/
private $owner = [];
private $owner;

/**
* @var mixed[]
* @var mixed[]|null
*/
private $vars = [];
private $vars;

/**
* @param mixed[] $owner
* @param mixed[] $vars
* @param mixed[]|null $owner
* @param mixed[]|null $vars
*/
public function __construct(?string $template, array $owner, array $vars)
public function __construct(?string $template, ?array $owner = null, ?array $vars = null)
{
$this->template = $template;
$this->owner = $owner;
Expand Down
4 changes: 4 additions & 0 deletions packages/Sensio/src/Helper/TemplateGuesser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PhpParser\Node\Resolver\NameResolver;

/**
* @see \Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\TemplateAnnotationVersion3RectorTest
* @see \Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\TemplateAnnotationVersion5RectorTest
*/
final class TemplateGuesser
{
/**
Expand Down