Merge pull request #20 from flownative/task/cleanup

Modernize codebase, update CLI help

Author: kdambekalns

Classes/Command/TradosCommandController.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Flownative\Neos\Trados\Command;
 
 /*
@@ -23,7 +25,6 @@
  */
 class TradosCommandController extends CommandController
 {
-
     /**
      * @Flow\Inject
      * @var ExportService
@@ -37,21 +38,21 @@ class TradosCommandController extends CommandController
     protected $importService;
 
     /**
-     * Export sites content (e.g. trados:export --filename "acme.com.xml" --source-language "en" --target-language "cz")
+     * Export sites content (e.g. trados:export --filename acme.com.xml --target-language cz amecom en)
      *
      * This command exports a specific site including all content into an XML format.
      *
      * @param string $startingPoint The node with which to start the export: as identifier or the path relative to the site node.
      * @param string $sourceLanguage The language to use as base for the export.
      * @param string|null $targetLanguage The target language for the translation, optional.
      * @param string|null $filename Path and filename to the XML file to create.
-     * @param string|null $modifiedAfter
-     * @param boolean $ignoreHidden
-     * @param boolean $excludeChildDocuments
+     * @param string|null $modifiedAfter A date/time to filter for nodes by modification time; anything PHP can parse in the DateTime constructor.
+     * @param bool $ignoreHidden If set to false, hidden nodes will be exported, too.
+     * @param bool $excludeChildDocuments If set to true, child documents will not be exported; use to export a single document's content.
      * @return void
      * @throws \Exception
      */
-    public function exportCommand(string $startingPoint, string $sourceLanguage, string $targetLanguage = null, string $filename = null, string $modifiedAfter = null, bool $ignoreHidden = true, bool $excludeChildDocuments = false)
+    public function exportCommand(string $startingPoint, string $sourceLanguage, string $targetLanguage = null, string $filename = null, string $modifiedAfter = null, bool $ignoreHidden = true, bool $excludeChildDocuments = false): void
     {
         if ($modifiedAfter !== null) {
             $modifiedAfter = new \DateTime($modifiedAfter);
@@ -81,7 +82,7 @@ public function exportCommand(string $startingPoint, string $sourceLanguage, str
      * @param string|null $targetLanguage The target language for the translation, optional if included in XML.
      * @param string $workspace A workspace to import into, optional but recommended
      */
-    public function importCommand(string $filename, string $targetLanguage = null, string $workspace = 'live')
+    public function importCommand(string $filename, string $targetLanguage = null, string $workspace = 'live'): void
     {
         try {
             $importedLanguage = $this->importService->importFromFile($filename, $workspace, $targetLanguage);

Classes/Service/AbstractService.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Flownative\Neos\Trados\Service;
 
 /*
@@ -11,14 +13,15 @@
  * source code.
  */
 
+use Neos\ContentRepository\Domain\Repository\WorkspaceRepository;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Context as SecurityContext;
+use Neos\Neos\Domain\Repository\SiteRepository;
+use Neos\Neos\Domain\Service\ContentContextFactory;
 
 class AbstractService
 {
-    /**
-     * @var string
-     */
-    const SUPPORTED_FORMAT_VERSION = '1.0';
+    protected const SUPPORTED_FORMAT_VERSION = '1.0';
 
     /**
      * @Flow\InjectConfiguration(path = "languageDimension")
@@ -28,25 +31,25 @@ class AbstractService
 
     /**
      * @Flow\Inject
-     * @var \Neos\Neos\Domain\Service\ContentContextFactory
+     * @var ContentContextFactory
      */
     protected $contentContextFactory;
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Security\Context
+     * @var SecurityContext
      */
     protected $securityContext;
 
     /**
      * @Flow\Inject
-     * @var \Neos\Neos\Domain\Repository\SiteRepository
+     * @var SiteRepository
      */
     protected $siteRepository;
 
     /**
      * @Flow\Inject
-     * @var \Neos\ContentRepository\Domain\Repository\WorkspaceRepository
+     * @var WorkspaceRepository
      */
     protected $workspaceRepository;
 }