Skip to content

Commit e00937b

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.4' into 8.0
* 7.4: skip legacy extractor test with symfony/property-info 8.0+ chore: heredoc indentation as of PHP 7.3 [Actions] remove dead code from integration-test We can always revisit later if needed.From 2021 its there and not in use
2 parents 22024ab + dd232b1 commit e00937b

35 files changed

+3097
-3097
lines changed

‎Caster/FFICaster.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ private static function castFFIStringValue(CData $data): string|CutStub
116116
{
117117
$result = [];
118118
$ffi = \FFI::cdef(<<<C
119-
size_t zend_get_page_size(void);
120-
C);
119+
size_t zend_get_page_size(void);
120+
C);
121121

122122
$pageSize = $ffi->zend_get_page_size();
123123

‎Command/Descriptor/HtmlDescriptor.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,24 @@ public function describe(OutputInterface $output, Data $data, array $context, in
7070
]);
7171

7272
$output->writeln(<<<HTML
73-
<article data-dedup-id="$dedupIdentifier">
74-
<header>
75-
<div class="row">
76-
<h2 class="col">$title</h2>
77-
<time class="col text-small" title="$isoDate" datetime="$isoDate">
78-
{$this->extractDate($context)}
79-
</time>
80-
</div>
81-
{$this->renderTags($tags)}
82-
</header>
83-
<section class="body">
84-
<p class="text-small">
85-
$sourceDescription
86-
</p>
87-
{$this->dumper->dump($data, true)}
88-
</section>
89-
</article>
90-
HTML
73+
<article data-dedup-id="$dedupIdentifier">
74+
<header>
75+
<div class="row">
76+
<h2 class="col">$title</h2>
77+
<time class="col text-small" title="$isoDate" datetime="$isoDate">
78+
{$this->extractDate($context)}
79+
</time>
80+
</div>
81+
{$this->renderTags($tags)}
82+
</header>
83+
<section class="body">
84+
<p class="text-small">
85+
$sourceDescription
86+
</p>
87+
{$this->dumper->dump($data, true)}
88+
</section>
89+
</article>
90+
HTML
9191
);
9292
}
9393

@@ -108,11 +108,11 @@ private function renderTags(array $tags): string
108108
}
109109

110110
return <<<HTML
111-
<div class="row">
112-
<ul class="tags">
113-
$renderedTags
114-
</ul>
115-
</div>
116-
HTML;
111+
<div class="row">
112+
<ul class="tags">
113+
$renderedTags
114+
</ul>
115+
</div>
116+
HTML;
117117
}
118118
}

‎Command/ServerDumpCommand.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ protected function configure(): void
5858
$this
5959
->addOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format (%s)', implode(', ', $this->getAvailableFormats())), 'cli')
6060
->setHelp(<<<'EOF'
61-
<info>%command.name%</info> starts a dump server that collects and displays
62-
dumps in a single place for debugging you application:
61+
<info>%command.name%</info> starts a dump server that collects and displays
62+
dumps in a single place for debugging you application:
6363
64-
<info>php %command.full_name%</info>
64+
<info>php %command.full_name%</info>
6565
66-
You can consult dumped data in HTML format in your browser by providing the <comment>--format=html</comment> option
67-
and redirecting the output to a file:
66+
You can consult dumped data in HTML format in your browser by providing the <comment>--format=html</comment> option
67+
and redirecting the output to a file:
6868
69-
<info>php %command.full_name% --format="html" > dump.html</info>
69+
<info>php %command.full_name% --format="html" > dump.html</info>
7070

71-
EOF
71+
EOF
7272
)
7373
;
7474
}

0 commit comments

Comments
 (0)