From aef1a783b342e290fb7a04a9ea6b03995f1945e4 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 16 Jul 2024 18:38:43 +0200 Subject: [PATCH] Test Symfony 7 branch --- Command/ArticleExportCommand.php | 4 ++-- Command/ArticleImportCommand.php | 4 ++-- Command/ReindexCommand.php | 4 ++-- composer.json | 8 +++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Command/ArticleExportCommand.php b/Command/ArticleExportCommand.php index 10a30ed8..ba69b08c 100644 --- a/Command/ArticleExportCommand.php +++ b/Command/ArticleExportCommand.php @@ -35,7 +35,7 @@ public function __construct(ArticleExportInterface $articleExporter) $this->articleExporter = $articleExporter; } - protected function configure() + protected function configure(): void { $this->addArgument('target', InputArgument::REQUIRED, 'export.xliff') ->addArgument('locale', InputArgument::REQUIRED) @@ -43,7 +43,7 @@ protected function configure() ->setDescription('Export article translations from given language into xliff file for translating into a new language.'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $target = $input->getArgument('target'); if (0 === !\strpos($target, '/')) { diff --git a/Command/ArticleImportCommand.php b/Command/ArticleImportCommand.php index 6275a675..7e52b41b 100644 --- a/Command/ArticleImportCommand.php +++ b/Command/ArticleImportCommand.php @@ -45,7 +45,7 @@ public function __construct(ArticleImportInterface $articleImporter, ?LoggerInte $this->logger = $logger ?: new NullLogger(); } - protected function configure() + protected function configure(): void { $this->addArgument('file', InputArgument::REQUIRED, 'export.xliff') ->addArgument('locale', InputArgument::REQUIRED) @@ -55,7 +55,7 @@ protected function configure() ->setDescription('Import article translations from xliff file into a specific language.'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $filePath = $input->getArgument('file'); if (0 === !\strpos($filePath, '/')) { diff --git a/Command/ReindexCommand.php b/Command/ReindexCommand.php index 67598f61..57a94a91 100644 --- a/Command/ReindexCommand.php +++ b/Command/ReindexCommand.php @@ -77,7 +77,7 @@ public function __construct( $this->suluContext = $suluContext; } - public function configure() + public function configure(): void { $this->setDescription('Rebuild elastic-search index for articles'); $this->setHelp('This command will load all articles and index them to elastic-search indexes.'); @@ -85,7 +85,7 @@ public function configure() $this->addOption('clear', null, InputOption::VALUE_NONE, 'Clear all articles of index before reindex'); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $startTime = \microtime(true); diff --git a/composer.json b/composer.json index 2ea55856..6db56a34 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,17 @@ "homepage": "https://github.com/sulu/SuluArticleBundle/contributors" } ], + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:alexander-schranz/ElasticsearchBundle.git" + } + ], "require": { "php": "^7.3 || ^8.0", "ext-json": "*", "elasticsearch/elasticsearch": "^5.0 || ^6.0 || ^7.0", - "handcraftedinthealps/elasticsearch-bundle": "^5.2.6.4", + "handcraftedinthealps/elasticsearch-bundle": "dev-feature/symfony-7-upgrade as 5.999", "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1 || ^6.2.0.1 || ^7.2.0.1", "jms/serializer": "^3.3", "jms/serializer-bundle": "^3.3 || ^4.0 || ^5.0",