update structure of composer.json and update dependencies

* version/2.x-dev:

Classes/MenuService/ServiceInterface.php

@@ -20,7 +20,7 @@ interface ServiceInterface
     /**
      * @param string|null $forPath
      *
-     * @return array|\Iterator
+     * @return \Iterator
      */
     public function getItems(string $forPath = null): \Iterator;
 }

Classes/MenuService/SettingsService.php

@@ -15,8 +15,6 @@ namespace DigiComp\Menu\MenuService;
 use Neos\Flow\Annotations as Flow;
 
 /**
- * @package DigiComp\Menu\Menu
- *
  * @Flow\Scope("singleton")
  */
 class SettingsService implements ServiceInterface
@@ -30,7 +28,7 @@ class SettingsService implements ServiceInterface
     /**
      * @var array
      */
-    protected array $items = array();
+    protected array $items = [];
 
     public function getItems(string $forPath = null): \Iterator
     {
@@ -40,9 +38,9 @@ class SettingsService implements ServiceInterface
             $items = &$this->menuConfiguration;
         }
         if ($items) {
-            uasort(
+            \uasort(
                 $items,
-                function ($a, $b) {
+                static function ($a, $b) {
                     return $a['sorting'] > $b['sorting'];
                 }
             );

Classes/Package.php

@@ -12,9 +12,9 @@ namespace DigiComp\Menu;
  * source code.
  */
 
+use Neos\Flow\Configuration\ConfigurationManager;
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Package\Package as BasePackage;
-use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  * Package base class of the DigiComp.Menu package.

Classes/ViewHelpers/ProgressViewHelper.php

@@ -53,13 +53,16 @@ class ProgressViewHelper extends AbstractViewHelper
     {
         $links = $activeStep = $returnable = $stepsAs = $backLinkAs = $activeStepAs = $linksAs =
             $activeStepLinkAs = $offset = $linkCount = null;
-        extract($this->arguments);
+        \extract($this->arguments, \EXTR_OVERWRITE);
         //handling famous off by one
         $activeStep -= $offset;
         //make sure our array index is numeric
-        $links = array_values($links);
+        if (\is_iterable($links)) {
+            $links = \iterator_to_array($links);
+        }
+        $links = \array_values($links);
         if (!$linkCount) {
-            $linkCount = count($links);
+            $linkCount = \count($links);
         }
         foreach ($links as $i => &$link) {
             $link['completed'] = $activeStep > $i;

composer.json

@@ -1,36 +1,49 @@
 {
     "name": "digicomp/menu",
-    "type": "neos-package",
     "description": "Helps with the creation of simple fluid based menus",
+    "type": "neos-package",
     "keywords": [
-        "flow",
-        "neos",
+        "Neos",
+        "Flow",
         "menu"
     ],
+    "homepage": "https://git.digital-competence.de/Packages/DigiComp.Menu",
+    "license": "MIT",
     "authors": [
         {
             "name": "Ferdinand Kuhl",
             "email": "f.kuhl@digital-competence.de",
-            "homepage": "http://www.digital-competence.de",
+            "homepage": "https://www.digital-competence.de",
             "role": "Developer"
         }
     ],
-    "license": "MIT",
-    "homepage": "https://github.com/digicomp/DigiComp.Menu",
     "require": {
-        "neos/flow": "~6.3",
-        "php": "^7.4"
+        "php": ">=7.4.0",
+        "neos/flow": "^6.3.21"
+    },
+    "require-dev": {
+        "mikey179/vfsstream": "^1.6.1",
+        "neos/buildessentials": "^7.0.0",
+        "phpunit/phpunit": "~8.5",
+        "vimeo/psalm": "~4.22.0"
     },
     "autoload": {
         "psr-4": {
-            "DigiComp\\Menu\\": "Classes"
+            "DigiComp\\Menu\\": "Classes/"
         }
     },
+    "config": {
+        "sort-packages": true,
+        "platform-check": true
+    },
     "extra": {
         "branch-alias": {
             "dev-develop": "3.0.x-dev",
             "dev-version/2.x-dev": "2.0.x-dev"
         },
+        "neos": {
+            "package-key": "DigiComp.Menu"
+        },
         "applied-flow-migrations": [
             "TYPO3.Fluid-20150214130800",
             "TYPO3.Fluid-20141121091700",