Skip to content

Commit 3921d65

Browse files
dbudbu
committed
test with symfony 7 and php 8.3
1 parent 0117929 commit 3921d65

19 files changed

+43
-127
lines changed

‎.github/workflows/test-application.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- php-version: '7.3'
2323
- php-version: '7.4'
2424
- php-version: '8.0'
25-
- php-version: '8.0'
26-
dev-dependencies: true
2725
- php-version: '8.1'
2826
- php-version: '8.2'
27+
- php-version: '8.3'
28+
- php-version: '8.3'
2929

3030
steps:
3131
- name: Checkout project

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Changelog
22
=========
33

4+
2.x
5+
---
6+
7+
2.0.0 (unreleased)
8+
------------------
9+
10+
* Support Symfony 7
11+
* Test with PHP 8.3
12+
* Adjusted commands to have the return type declarations.
13+
414
1.x
515
---
616

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"require": {
3030
"php": "^7.2 || ^8.0",
3131
"phpcr/phpcr": "~2.1.0",
32-
"symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
32+
"symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
3333
},
3434
"require-dev": {
3535
"ramsey/uuid": "^3.5",

‎src/PHPCR/Util/Console/Command/NodeDumpCommand.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@
2323
*/
2424
class NodeDumpCommand extends BaseCommand
2525
{
26-
/**
27-
* {@inheritdoc}
28-
*
29-
* @throws InvalidArgumentException
30-
*/
31-
protected function configure()
26+
protected function configure(): void
3227
{
3328
$this
3429
->setName('phpcr:node:dump')
@@ -56,13 +51,11 @@ protected function configure()
5651
}
5752

5853
/**
59-
* {@inheritdoc}
60-
*
6154
* @throws InvalidArgumentException
6255
* @throws Exception
6356
* @throws RepositoryException
6457
*/
65-
protected function execute(InputInterface $input, OutputInterface $output)
58+
protected function execute(InputInterface $input, OutputInterface $output): int
6659
{
6760
$session = $this->getPhpcrSession();
6861
$dumperHelper = $this->getPhpcrConsoleDumperHelper();

‎src/PHPCR/Util/Console/Command/NodeMoveCommand.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717
*/
1818
class NodeMoveCommand extends BaseCommand
1919
{
20-
/**
21-
* {@inheritdoc}
22-
*
23-
* @throws InvalidArgumentException
24-
*/
25-
protected function configure()
20+
protected function configure(): void
2621
{
2722
$this
2823
->setName('phpcr:node:move')
@@ -43,11 +38,9 @@ protected function configure()
4338
}
4439

4540
/**
46-
* {@inheritdoc}
47-
*
4841
* @throws InvalidArgumentException
4942
*/
50-
protected function execute(InputInterface $input, OutputInterface $output)
43+
protected function execute(InputInterface $input, OutputInterface $output): int
5144
{
5245
$session = $this->getPhpcrSession();
5346

‎src/PHPCR/Util/Console/Command/NodeRemoveCommand.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
*/
2222
class NodeRemoveCommand extends BaseCommand
2323
{
24-
/**
25-
* {@inheritdoc}
26-
*
27-
* @throws CliInvalidArgumentException
28-
*/
29-
protected function configure()
24+
protected function configure(): void
3025
{
3126
parent::configure();
3227

@@ -53,12 +48,10 @@ protected function configure()
5348
}
5449

5550
/**
56-
* {@inheritdoc}
57-
*
5851
* @throws CliInvalidArgumentException
5952
* @throws InvalidArgumentException
6053
*/
61-
protected function execute(InputInterface $input, OutputInterface $output)
54+
protected function execute(InputInterface $input, OutputInterface $output): int
6255
{
6356
$session = $this->getPhpcrSession();
6457

‎src/PHPCR/Util/Console/Command/NodeTouchCommand.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
*/
2222
class NodeTouchCommand extends BaseNodeManipulationCommand
2323
{
24-
/**
25-
* {@inheritdoc}
26-
*
27-
* @throws InvalidArgumentException
28-
*/
29-
protected function configure()
24+
protected function configure(): void
3025
{
3126
parent::configure();
3227

@@ -73,11 +68,9 @@ protected function configure()
7368
}
7469

7570
/**
76-
* {@inheritdoc}
77-
*
7871
* @throws InvalidArgumentException
7972
*/
80-
protected function execute(InputInterface $input, OutputInterface $output)
73+
protected function execute(InputInterface $input, OutputInterface $output): int
8174
{
8275
$helper = $this->getPhpcrHelper();
8376
$session = $this->getPhpcrSession();

‎src/PHPCR/Util/Console/Command/NodeTypeListCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
*/
1616
class NodeTypeListCommand extends BaseCommand
1717
{
18-
/**
19-
* {@inheritdoc}
20-
*/
21-
protected function configure()
18+
protected function configure(): void
2219
{
2320
$this
2421
->setName('phpcr:node-type:list')
@@ -31,10 +28,7 @@ protected function configure()
3128
);
3229
}
3330

34-
/**
35-
* {@inheritdoc}
36-
*/
37-
protected function execute(InputInterface $input, OutputInterface $output)
31+
protected function execute(InputInterface $input, OutputInterface $output): int
3832
{
3933
$session = $this->getPhpcrSession();
4034
$ntm = $session->getWorkspace()->getNodeTypeManager();

‎src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php

+2-7
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@
2626
*/
2727
class NodeTypeRegisterCommand extends BaseCommand
2828
{
29-
/**
30-
* {@inheritdoc}
31-
*/
32-
protected function configure()
29+
protected function configure(): void
3330
{
3431
$this
3532
->setName('phpcr:node-type:register')
@@ -62,11 +59,9 @@ protected function configure()
6259
}
6360

6461
/**
65-
* {@inheritdoc}
66-
*
6762
* @throws InvalidArgumentException
6863
*/
69-
protected function execute(InputInterface $input, OutputInterface $output)
64+
protected function execute(InputInterface $input, OutputInterface $output): int
7065
{
7166
$definitions = $input->getArgument('cnd-file');
7267

‎src/PHPCR/Util/Console/Command/NodesUpdateCommand.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@
2020
*/
2121
class NodesUpdateCommand extends BaseNodeManipulationCommand
2222
{
23-
/**
24-
* {@inheritdoc}
25-
*
26-
* @throws CliInvalidArgumentException
27-
*/
28-
protected function configure()
23+
protected function configure(): void
2924
{
3025
parent::configure();
3126

@@ -85,12 +80,10 @@ protected function configure()
8580
}
8681

8782
/**
88-
* {@inheritdoc}
89-
*
9083
* @throws CliInvalidArgumentException
9184
* @throws InvalidArgumentException
9285
*/
93-
protected function execute(InputInterface $input, OutputInterface $output)
86+
protected function execute(InputInterface $input, OutputInterface $output): int
9487
{
9588
$query = $input->getOption('query');
9689
$queryLanguage = strtoupper($input->getOption('query-language'));

‎src/PHPCR/Util/Console/Command/WorkspaceCreateCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
*/
1919
class WorkspaceCreateCommand extends BaseCommand
2020
{
21-
/**
22-
* {@inheritdoc}
23-
*/
24-
protected function configure()
21+
protected function configure(): void
2522
{
2623
$this
2724
->setName('phpcr:workspace:create')
@@ -42,10 +39,7 @@ protected function configure()
4239
);
4340
}
4441

45-
/**
46-
* {@inheritdoc}
47-
*/
48-
protected function execute(InputInterface $input, OutputInterface $output)
42+
protected function execute(InputInterface $input, OutputInterface $output): int
4943
{
5044
$session = $this->getPhpcrSession();
5145

‎src/PHPCR/Util/Console/Command/WorkspaceDeleteCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
*/
1818
class WorkspaceDeleteCommand extends BaseCommand
1919
{
20-
/**
21-
* {@inheritdoc}
22-
*/
23-
protected function configure()
20+
protected function configure(): void
2421
{
2522
$this
2623
->setName('phpcr:workspace:delete')
@@ -37,10 +34,7 @@ protected function configure()
3734
);
3835
}
3936

40-
/**
41-
* {@inheritdoc}
42-
*/
43-
protected function execute(InputInterface $input, OutputInterface $output)
37+
protected function execute(InputInterface $input, OutputInterface $output): int
4438
{
4539
$session = $this->getPhpcrSession();
4640

‎src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
*/
1818
class WorkspaceExportCommand extends BaseCommand
1919
{
20-
/**
21-
* {@inheritdoc}
22-
*/
23-
protected function configure()
20+
protected function configure(): void
2421
{
2522
parent::configure();
2623

@@ -42,10 +39,7 @@ protected function configure()
4239
);
4340
}
4441

45-
/**
46-
* {@inheritdoc}
47-
*/
48-
protected function execute(InputInterface $input, OutputInterface $output)
42+
protected function execute(InputInterface $input, OutputInterface $output): int
4943
{
5044
$session = $this->getPhpcrSession();
5145
$repo = $session->getRepository();

‎src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ class WorkspaceImportCommand extends BaseCommand
2424
'throw' => ImportUUIDBehaviorInterface::IMPORT_UUID_COLLISION_THROW,
2525
];
2626

27-
/**
28-
* {@inheritdoc}
29-
*/
30-
protected function configure()
27+
protected function configure(): void
3128
{
3229
parent::configure();
3330

@@ -62,10 +59,7 @@ protected function configure()
6259
);
6360
}
6461

65-
/**
66-
* {@inheritdoc}
67-
*/
68-
protected function execute(InputInterface $input, OutputInterface $output)
62+
protected function execute(InputInterface $input, OutputInterface $output): int
6963
{
7064
$filename = $input->getArgument('filename');
7165
$parentPath = $input->getOption('parentpath');

‎src/PHPCR/Util/Console/Command/WorkspaceListCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
*/
1515
class WorkspaceListCommand extends BaseCommand
1616
{
17-
/**
18-
* {@inheritdoc}
19-
*/
20-
protected function configure()
17+
protected function configure(): void
2118
{
2219
$this
2320
->setName('phpcr:workspace:list')
@@ -29,10 +26,7 @@ protected function configure()
2926
);
3027
}
3128

32-
/**
33-
* {@inheritdoc}
34-
*/
35-
protected function execute(InputInterface $input, OutputInterface $output)
29+
protected function execute(InputInterface $input, OutputInterface $output): int
3630
{
3731
$session = $this->getPhpcrSession();
3832

‎src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
*/
1818
class WorkspacePurgeCommand extends BaseCommand
1919
{
20-
/**
21-
* {@inheritdoc}
22-
*/
23-
protected function configure()
20+
protected function configure(): void
2421
{
2522
parent::configure();
2623

@@ -36,10 +33,7 @@ protected function configure()
3633
);
3734
}
3835

39-
/**
40-
* {@inheritdoc}
41-
*/
42-
protected function execute(InputInterface $input, OutputInterface $output)
36+
protected function execute(InputInterface $input, OutputInterface $output): int
4337
{
4438
$session = $this->getPhpcrSession();
4539
$force = $input->getOption('force');

‎src/PHPCR/Util/Console/Command/WorkspaceQueryCommand.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
*/
1919
class WorkspaceQueryCommand extends BaseCommand
2020
{
21-
/**
22-
* {@inheritdoc}
23-
*/
24-
protected function configure()
21+
protected function configure(): void
2522
{
2623
parent::configure();
2724

@@ -34,10 +31,7 @@ protected function configure()
3431
->setHelp('The <info>query</info> command executes a JCR query statement on the content repository');
3532
}
3633

37-
/**
38-
* {@inheritdoc}
39-
*/
40-
protected function execute(InputInterface $input, OutputInterface $output)
34+
protected function execute(InputInterface $input, OutputInterface $output): int
4135
{
4236
$sql = $input->getArgument('query');
4337
$language = $input->getOption('language');

0 commit comments

Comments
 (0)