Skip to content

Commit 0775550

Browse files
committed
Fixes for compat with phpBB4
1 parent a0f3290 commit 0775550

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"require": {
1313
"php": ">=7.2",
1414
"ext-json": "*",
15-
"symfony/yaml": "^3.0 || ^4.0 || ^5.0 || ^6.0",
16-
"symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0",
17-
"symfony/finder": "^3.0 || ^4.0 || ^5.0 || ^6.0",
18-
"symfony/process": "^3.0 || ^4.0 || ^5.0 || ^6.0",
19-
"nikic/php-parser": "^4.0",
15+
"symfony/yaml": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
16+
"symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
17+
"symfony/finder": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
18+
"symfony/process": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
19+
"nikic/php-parser": "^4.0 || ^5.0",
2020
"gitonomy/gitlib": "^1.3.0",
2121
"sensiolabs/ansi-to-html": "~1.1",
2222
"composer/composer": "^1.5 || ^2.0"

src/Command/ValidateCommand.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Phpbb\Epv\Tests\Exception\TestException;
1515
use Phpbb\Epv\Tests\TestStartup;
1616
use Symfony\Component\Console\Command\Command;
17-
use Symfony\Component\Console\Input\InputArgument;
1817
use Symfony\Component\Console\Input\InputInterface;
1918
use Symfony\Component\Console\Input\InputOption;
2019
use Symfony\Component\Console\Output\OutputInterface;
@@ -23,7 +22,7 @@
2322
class ValidateCommand extends Command
2423
{
2524

26-
protected function configure()
25+
protected function configure(): void
2726
{
2827
$this
2928
->setName('run')
@@ -37,7 +36,7 @@ protected function configure()
3736
->addOption('debug', null, InputOption::VALUE_NONE, "Run in debug");
3837
}
3938

40-
protected function execute(InputInterface $input, OutputInterface $output)
39+
protected function execute(InputInterface $input, OutputInterface $output): int
4140
{
4241
$dir = $input->getOption("dir");
4342
$git = $input->getOption('git');

src/Events/recursive_event_filter_iterator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public function __construct(\RecursiveIterator $iterator, $root_path)
3636
*
3737
* @return recursive_event_filter_iterator
3838
*/
39-
public function getChildren()
39+
public function getChildren(): recursive_event_filter_iterator
4040
{
4141
return new self($this->getInnerIterator()->getChildren(), $this->root_path);
4242
}
4343

4444
/**
4545
* {@inheritDoc}
4646
*/
47-
public function accept()
47+
public function accept(): bool
4848
{
4949
$relative_path = str_replace(DIRECTORY_SEPARATOR, '/', $this->current());
5050
$filename = $this->current()->getFilename();

src/Files/Type/YmlFile.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function __construct($debug, $filename, $rundir)
7777
*
7878
* @return array
7979
*/
80-
public function getYaml()
80+
public function getYaml(): array
8181
{
8282
return $this->yamlFile;
8383
}
@@ -86,7 +86,7 @@ public function getYaml()
8686
* Get the file type for the specific file.
8787
* @return int
8888
*/
89-
function getFileType()
89+
function getFileType(): int
9090
{
9191
return Type::TYPE_YML;
9292
}

0 commit comments

Comments
 (0)