From 9ea0c863dd644668250de4650608dc59bb2bb0dd Mon Sep 17 00:00:00 2001
From: Ferdinand Kuhl <f.kuhl@digital-competence.de>
Date: Sat, 3 Jun 2017 11:39:59 +0200
Subject: [PATCH] TASK: PSR-2 and copyright notice

---
 .../Menu/MenuService/ServiceInterface.php     | 25 +++++---
 .../Menu/MenuService/SettingsService.php      | 63 +++++++++++--------
 Classes/DigiComp/Menu/Package.php             | 39 ++++++++----
 .../Menu/ViewHelpers/MenuViewHelper.php       | 52 ++++++++-------
 4 files changed, 109 insertions(+), 70 deletions(-)

diff --git a/Classes/DigiComp/Menu/MenuService/ServiceInterface.php b/Classes/DigiComp/Menu/MenuService/ServiceInterface.php
index 6873d98..93a1b04 100644
--- a/Classes/DigiComp/Menu/MenuService/ServiceInterface.php
+++ b/Classes/DigiComp/Menu/MenuService/ServiceInterface.php
@@ -1,15 +1,26 @@
 <?php
 namespace DigiComp\Menu\MenuService;
-/*                                                                        *
- * This script belongs to the FLOW3 package "DigiComp.Controls".          *
- *                                                                        *
- *                                                                        */
+
+/*
+ * This file is part of the DigiComp.Menu package.
+ *
+ * (c) digital competence
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
 
 /**
  * Interface for Menu-Configuration
  */
-interface ServiceInterface {
-
-    public function getItems();
+interface ServiceInterface
+{
 
+    /**
+     * @param mixed $forPath
+     *
+     * @return array|\Iterator
+     */
+    public function getItems($forPath = null);
 }
\ No newline at end of file
diff --git a/Classes/DigiComp/Menu/MenuService/SettingsService.php b/Classes/DigiComp/Menu/MenuService/SettingsService.php
index 7e5a06c..bd29f83 100644
--- a/Classes/DigiComp/Menu/MenuService/SettingsService.php
+++ b/Classes/DigiComp/Menu/MenuService/SettingsService.php
@@ -1,53 +1,64 @@
 <?php
 namespace DigiComp\Menu\MenuService;
-/*                                                                        *
- * This script belongs to the FLOW3 package "DigiComp.Controls".          *
- *                                                                        *
- *                                                                        */
+
+/*
+ * This file is part of the DigiComp.Menu package.
+ *
+ * (c) digital competence
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
 
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Configuration\ConfigurationManager;
 
 /**
- * Class Menu
  * @package DigiComp\Menu\Menu
  *
  * @Flow\Scope("singleton")
  */
-class SettingsService implements ServiceInterface {
+class SettingsService implements ServiceInterface
+{
     /**
      * @var \TYPO3\Flow\Configuration\ConfigurationManager
      */
     protected $configurationManager;
-    public function injectConfigurationManager(ConfigurationManager $configurationManager) {
+    public function injectConfigurationManager(ConfigurationManager $configurationManager)
+    {
         $this->configurationManager = $configurationManager;
-        $this->menu = $this->configurationManager->getConfiguration('Menu');
+        $this->menuConfiguration = $this->configurationManager->getConfiguration('Menu');
     }
 
     /**
      * @var array
      */
-    protected $menu;
+    protected $menuConfiguration;
 
+    /**
+     * @var array
+     */
     protected $items = array();
 
-	/**
-	 * @param string $forMenu
-	 * @return array
-	 */
-	public function getItems($forMenu = NULL) {
-        if ($forMenu){
-			$items = &$this->menu[$forMenu];
-		}else {
-			$items = &$this->menu;
-		}
-		if ($items) {
-			uasort($items, function ($a, $b) {
-				return $a['sorting'] > $b['sorting'];
-			});
-		}
+    /**
+     * @param string $forMenu
+     * @return array
+     */
+    public function getItems($forMenu = null)
+    {
+        if ($forMenu) {
+            $items = &$this->menuConfiguration[$forMenu];
+        }else {
+            $items = &$this->menuConfiguration;
+        }
+        if ($items) {
+            uasort(
+                $items, function ($a, $b) {
+                    return $a['sorting'] > $b['sorting'];
+                }
+            );
+        }
         return $items;
     }
-
-
 }
\ No newline at end of file
diff --git a/Classes/DigiComp/Menu/Package.php b/Classes/DigiComp/Menu/Package.php
index a252707..897edaf 100644
--- a/Classes/DigiComp/Menu/Package.php
+++ b/Classes/DigiComp/Menu/Package.php
@@ -1,25 +1,38 @@
 <?php
-/**
- * @author skoetzing
- * @date 07.07.14
+namespace DigiComp\Menu;
+
+/*
+ * This file is part of the DigiComp.Menu package.
+ *
+ * (c) digital competence
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
  */
 
-namespace DigiComp\Menu;
 use TYPO3\Flow\Core\Bootstrap;
 use TYPO3\Flow\Package\Package as BasePackage;
-use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Configuration\ConfigurationManager;
 
-class Package extends BasePackage{
+/**
+ * Package base class of the DigiComp.Menu package.
+ *
+ * @Flow\Scope("singleton")
+ */
+class Package extends BasePackage
+{
 
-    public function boot(Bootstrap $bootstrap){
+    public function boot(Bootstrap $bootstrap)
+    {
         parent::boot($bootstrap);
 
         $dispatcher = $bootstrap->getSignalSlotDispatcher();
-        $dispatcher->connect('TYPO3\Flow\Configuration\ConfigurationManager', 'configurationManagerReady',
-        function(ConfigurationManager $configurationManager){
-           $configurationManager->registerConfigurationType('Menu');
-        });
+        $dispatcher->connect(
+            'TYPO3\Flow\Configuration\ConfigurationManager', 'configurationManagerReady',
+            function (ConfigurationManager $configurationManager) {
+                $configurationManager->registerConfigurationType('Menu');
+            }
+        );
     }
-
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php b/Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php
index 7bb0a0d..a2d7305 100644
--- a/Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php
+++ b/Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php
@@ -1,22 +1,27 @@
 <?php
 namespace DigiComp\Menu\ViewHelpers;
-/*                                                                        *
- * This script belongs to the FLOW3 package "DigiComp.Controls".          *
- *                                                                        *
- *                                                                        */
-use TYPO3\Flow\Annotations as Flow;
-/**
- * Renders the sum of given collection and property name
- */
-class MenuViewHelper extends \TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper {
 
-    
-	/**
-	 * NOTE: This property has been introduced via code migration to ensure backwards-compatibility.
-	 * @see AbstractViewHelper::isOutputEscapingEnabled()
-	 * @var boolean
-	 */
-	protected $escapeOutput = FALSE;
+/*
+ * This file is part of the DigiComp.Menu package.
+ *
+ * (c) digital competence
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper;
+
+/**
+ * Just adds the return of MenuService
+ * TODO: Write example
+ */
+class MenuViewHelper extends AbstractViewHelper
+{
+
+    protected $escapeOutput = false;
 
     /**
      * @var \DigiComp\Menu\MenuService\ServiceInterface
@@ -24,15 +29,14 @@ class MenuViewHelper extends \TYPO3\Fluid\Core\ViewHelper\AbstractViewHelper {
      */
     protected $menuService;
 
-	/**
-	 * @param string $as
-	 * @param string $forPath
-	 * @return mixed
-	 */
-	public function render($as = 'menuItems', $forPath = NULL) {
+    /**
+     * @param string $as
+     * @param string $forPath
+     * @return string
+     */
+    public function render($as = 'menuItems', $forPath = null)
+    {
         $this->templateVariableContainer->add($as, $this->menuService->getItems($forPath));
         return $this->renderChildren();
     }
 }
-
-?>
\ No newline at end of file