TASK: Further changes to make it Flow 6.0 compatible

sandstorm · Nov 4, 2019 · fbb9e51 · fbb9e51
1 parent 4cdf877
commit fbb9e51
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Classes/Command/CrudGeneratorService.php b/Classes/Command/CrudGeneratorService.php
@@ -4,6 +4,7 @@
 
 
 use Neos\Flow\Package\Package;
+use Neos\Flow\Package\PackageManager;
 use Neos\Utility\Files;
 use Neos\FluidAdaptor\View\StandaloneView;
 use Neos\Flow\Annotations as Flow;
@@ -14,7 +15,7 @@ class CrudGeneratorService
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var PackageManager
      */
     protected $packageManager;
 
@@ -23,7 +24,6 @@ class CrudGeneratorService
      */
     protected $generatedFiles = array();
 
-
     /**
      * Generate a controller with the given name for the given package
      *
@@ -33,6 +33,7 @@ class CrudGeneratorService
      * @param string $modelClassName The name of the model to base the controler on
      * @param boolean $overwrite Overwrite any existing files?
      * @return array An array of generated filenames
+     * @throws \Neos\FluidAdaptor\Exception
      */
     public function generateCrudController($packageKey, $subpackage, $controllerName, $modelClassName, $overwrite = FALSE)
     {

diff --git a/Classes/Command/CrudKickstartCommandController.php b/Classes/Command/CrudKickstartCommandController.php
@@ -3,20 +3,21 @@
 
 use Neos\Flow\Cli\CommandController;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Package\PackageManager;
 
 class CrudKickstartCommandController extends CommandController
 {
 
 
     /**
      * @Flow\Inject
-     * @var \Neos\Flow\Package\PackageManagerInterface
+     * @var PackageManager
      */
     protected $packageManager;
 
     /**
      * @Flow\Inject
-     * @var \Sandstorm\CrudForms\Command\CrudGeneratorService
+     * @var CrudGeneratorService
      */
     protected $crudGeneratorService;
 

diff --git a/Classes/ViewHelpers/Internal/Form/DateViewHelper.php b/Classes/ViewHelpers/Internal/Form/DateViewHelper.php
@@ -22,7 +22,7 @@ public function initializeArguments()
         // HINT: we use a format compatible with the input type Date
         $this->registerArgument('format', 'string', 'A Format string compatible with the DateTimeConverter.', FALSE, 'MULTIPLE');
     }
-    
+
     /**
      * Renders the textfield.
      *
@@ -40,7 +40,7 @@ public function render()
         return $content;
     }
 
-    protected function getNameWithoutPrefix()
+    protected function getNameWithoutPrefix(): string
     {
         return parent::getNameWithoutPrefix() . '[date]';
     }