Merge pull request #2 from dotkernel/develop

Develop

composer.json

@@ -10,20 +10,19 @@
     }
   ],
   "require": {
-
     "php": "^5.6 || ^7.0",
     "psr/http-message": "^1.0",
     "container-interop/container-interop": "^1.1",
-    "zendframework/zend-expressive-helpers": "^2.0",
-    "zendframework/zend-expressive-template": "^1.0",
     "zendframework/zend-servicemanager": "^3.1",
     "zendframework/zend-escaper": "^2.5",
-    "zendframework/zend-stdlib": "^3.1"
+    "zendframework/zend-expressive-helpers": "^2.0",
+    "zendframework/zend-expressive-template": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
     "squizlabs/php_codesniffer": "^2.3",
 
+    "zendframework/zend-stdlib": "^3.1",
     "dotkernel/dot-authorization": "0.6.x-dev"
   },
   "autoload": {

src/ConfigProvider.php

@@ -81,4 +81,4 @@ public function getDependencyConfig()
             ],
         ];
     }
-}
+}

src/Exception/ExceptionInterface.php

@@ -16,4 +16,4 @@
 interface ExceptionInterface
 {
 
-}
+}

src/Exception/InvalidArgumentException.php

@@ -16,4 +16,4 @@
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 
-}
+}

src/Exception/RuntimeException.php

@@ -16,4 +16,4 @@
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 
-}
+}

src/Factory/NavigationMiddlewareFactory.php

@@ -28,4 +28,4 @@ public function __invoke(ContainerInterface $container)
         $navigation = $container->get(NavigationInterface::class);
         return new NavigationMiddleware($navigation);
     }
-}
+}

src/Factory/NavigationOptionsFactory.php

@@ -27,4 +27,4 @@ public function __invoke(ContainerInterface $container)
         $config = $container->get('config')['dot_navigation'];
         return new NavigationOptions($config);
     }
-}
+}

src/Factory/NavigationRendererFactory.php

@@ -32,6 +32,5 @@ public function __invoke(ContainerInterface $container)
         $template = $container->get(TemplateRendererInterface::class);
 
         return new NavigationRenderer($navigation, $template, $options);
-
     }
-}
+}

src/Factory/NavigationServiceFactory.php

@@ -32,7 +32,7 @@ public function __invoke(ContainerInterface $container)
         $authorization = $container->has(AuthorizationInterface::class)
             ? $container->get(AuthorizationInterface::class)
             : null;
-        
+
         $providerPluginManager = $container->get(ProviderPluginManager::class);
 
         /** @var NavigationOptions $options */
@@ -43,4 +43,4 @@ public function __invoke(ContainerInterface $container)
 
         return $service;
     }
-}
+}

src/Factory/ProviderPluginManagerFactory.php

@@ -27,4 +27,4 @@ public function __invoke(ContainerInterface $container)
         $config = $container->get('config')['dot_navigation']['provider_manager'];
         return new ProviderPluginManager($container, $config);
     }
-}
+}

src/Filter/IsAllowedFilter.php

@@ -9,7 +9,6 @@
 
 namespace Dot\Navigation\Filter;
 
-
 use Dot\Navigation\Service\NavigationInterface;
 
 /**
@@ -49,5 +48,4 @@ public function getChildren()
         $innerIterator = $this->getInnerIterator();
         return new self($innerIterator->getChildren(), $this->navigation);
     }
-
-}
+}

src/NavigationContainer.php

@@ -9,7 +9,6 @@
 
 namespace Dot\Navigation;
 
-
 /**
  * Class Container
  * @package Dot\Navigation
@@ -37,6 +36,26 @@ public function __construct(array $pages = [])
         $this->addPages($pages);
     }
 
+    /**
+     * @param array $pages
+     */
+    public function addPages(array $pages)
+    {
+        foreach ($pages as $page) {
+            $this->addPage($page);
+        }
+    }
+
+    /**
+     * @param Page $page
+     * @return $this
+     */
+    public function addPage(Page $page)
+    {
+        $this->children[] = $page;
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -93,26 +112,6 @@ public function getChildren()
         return $this->children[$this->index];
     }
 
-    /**
-     * @param array $pages
-     */
-    public function addPages(array $pages)
-    {
-        foreach ($pages as $page) {
-            $this->addPage($page);
-        }
-    }
-
-    /**
-     * @param Page $page
-     * @return $this
-     */
-    public function addPage(Page $page)
-    {
-        $this->children[] = $page;
-        return $this;
-    }
-
     /**
      * Find a single child by attribute
      *
@@ -192,5 +191,4 @@ public function findByOption($option, $value)
         }
         return $result;
     }
-
-}
+}

src/NavigationMiddleware.php

@@ -47,4 +47,4 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
 
         return $next($request, $response);
     }
-}
+}

src/Options/MenuOptions.php

@@ -95,6 +95,4 @@ public function setUlClass($ulClass)
     {
         $this->ulClass = $ulClass;
     }
-
-
-}
+}

src/Options/NavigationOptions.php

@@ -107,6 +107,4 @@ public function setMenuOptions($menuOptions)
 
         return $this;
     }
-
-
-}
+}

src/Page.php

@@ -30,14 +30,6 @@ class Page extends NavigationContainer
      */
     protected $parent;
 
-    /**
-     * @param Page $parent
-     */
-    public function setParent(Page $parent)
-    {
-        $this->parent = $parent;
-    }
-
     /**
      * @return bool
      */
@@ -54,6 +46,14 @@ public function getParent()
         return $this->parent;
     }
 
+    /**
+     * @param Page $parent
+     */
+    public function setParent(Page $parent)
+    {
+        $this->parent = $parent;
+    }
+
     /**
      * @param Page $page
      * @return NavigationContainer
@@ -76,12 +76,11 @@ public function setOption($option, $value)
     }
 
     /**
-     * @param $option
-     * @return mixed|null
+     * @return array
      */
-    public function getOption($option)
+    public function getOptions()
     {
-        return isset($this->options[$option]) ? $this->options[$option] : null;
+        return $this->options;
     }
 
     /**
@@ -94,14 +93,6 @@ public function setOptions(array $options)
         return $this;
     }
 
-    /**
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
     /**
      * @param $attribute
      * @param $value
@@ -122,6 +113,14 @@ public function getAttribute($attribute)
         return isset($this->attributes[$attribute]) ? $this->attributes[$attribute] : null;
     }
 
+    /**
+     * @return array
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
     /**
      * @param array $attributes
      * @return $this
@@ -133,18 +132,19 @@ public function setAttributes(array $attributes)
     }
 
     /**
-     * @return array
+     * @return mixed|null
      */
-    public function getAttributes()
+    public function getName()
     {
-        return $this->attributes;
+        return $this->getOption('name');
     }
 
     /**
+     * @param $option
      * @return mixed|null
      */
-    public function getName()
+    public function getOption($option)
     {
-        return $this->getOption('name');
+        return isset($this->options[$option]) ? $this->options[$option] : null;
     }
-}
+}

src/Provider/ArrayProvider.php

@@ -79,4 +79,4 @@ protected function getPage(array $spec)
 
         return $page;
     }
-}
+}

src/Provider/ProviderInterface.php

@@ -21,4 +21,4 @@ interface ProviderInterface
      * @return NavigationContainer
      */
     public function getContainer();
-}
+}

src/Provider/ProviderPluginManager.php

@@ -25,4 +25,4 @@ class ProviderPluginManager extends AbstractPluginManager
     protected $factories = [
         ArrayProvider::class => InvokableFactory::class,
     ];
-}
+}