Refactoring: renamed Carrooi\Menu namespace to Contributte\MenuControl

contributte · Mar 28, 2020 · 95c1d58 · 95c1d58
1 parent 3feb613
commit 95c1d58
Show file tree

Hide file tree

Showing 32 changed files with 106 additions and 105 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ cache:
 install:
   - travis_retry composer install --no-progress --prefer-dist
 
-script: vendor/bin/tester -s -p php -c tests/php.ini tests/CarrooiTests/Menu/
+script: vendor/bin/tester -s -p php -c tests/php.ini tests/CarrooiTests/
 
 after_failure:
   - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-[![Build Status](https://img.shields.io/travis/Carrooi/Nette-Menu.svg?style=flat-square)](https://travis-ci.org/Carrooi/Nette-Menu)
-[![Donate](https://img.shields.io/badge/donate-PayPal-brightgreen.svg?style=flat-square)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HPH6AC9D5LGHY)
+[![Build Status](https://travis-ci.org/contributte/menu-control.svg?branch=nette24)](https://travis-ci.org/contributte/menu-control)
 
 # Nette menu
 
@@ -15,14 +14,14 @@ Nette component for creating menus, breadcrumbs and sitemaps.
 **Install package with composer:**
 
 ```
-$ composer require carrooi/nette-menu
+$ composer require contributte/menu-control
 ```
 
 **Register as nette extension:**
 
 ```yaml
 extensions:
-  menu: Carrooi\Menu\DI\MenuExtension
+  menu: Contributte\MenuControl\DI\MenuExtension
 
 menu:
 ```
@@ -66,8 +65,8 @@ menu:
 
 namespace App;
 
-use Carrooi\Menu\UI\IMenuComponentFactory;
-use Carrooi\Menu\UI\MenuComponent;
+use Contributte\MenuControl\UI\IMenuComponentFactory;
+use Contributte\MenuControl\UI\MenuComponent;
 use Nette\Application\UI\Presenter;
 
 final class BasePresenter extends Presenter
@@ -117,9 +116,9 @@ This package includes 3 default templates (menu, breadcrumbs, sitemap). However
 should be used in real project. The other two templates should only help you in the beginning with building your own 
 templates which will fit your's website look.
 
-* [menu.latte](./src/Carrooi/Menu/UI/templates/menu.latte)
-* [breadcrumbs.latte](./src/Carrooi/Menu/UI/templates/menu.latte)
-* [sitemap.latte](./src/Carrooi/Menu/UI/templates/sitemap.latte)
+* [menu.latte](./src/UI/templates/menu.latte)
+* [breadcrumbs.latte](./src/UI/templates/menu.latte)
+* [sitemap.latte](./src/UI/templates/sitemap.latte)
 
 Changing templates can be done in your menu configuration:
 
@@ -233,8 +232,8 @@ This menu package uses custom `IAuthorizator` interface which you can use to wri
 
 namespace App;
 
-use Carrooi\Menu\IMenuItem;
-use Carrooi\Menu\Security\IAuthorizator;
+use Contributte\MenuControl\IMenuItem;
+use Contributte\MenuControl\Security\IAuthorizator;
 
 final class FrontAuthorizator implements IAuthorizator
 {
@@ -269,8 +268,8 @@ your custom link generator.
 
 namespace App;
 
-use Carrooi\Menu\IMenuItem;
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\IMenuItem;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
 
 final class FrontLinkGenerator implements ILinkGenerator
 {
@@ -316,7 +315,7 @@ menu:
 If you want to build your menu maybe from database instead of neon config, you can do that by creating `IMenuLoader`
 class.
 
-See the default [ArrayMenuLoader](./src/Carrooi/Menu/Loaders/ArrayMenuLoader.php) how it works.
+See the default [ArrayMenuLoader](../src/Loaders/ArrayMenuLoader.php) how it works.
 
 ## Changelog
 

diff --git a/composer.json b/composer.json
@@ -1,19 +1,26 @@
 {
-	"name": "carrooi/nette-menu",
+	"name": "contributte/menu-control",
 	"type": "library",
-	"description": "Menu for Nette framework",
+	"description": "Menu control for Nette framework",
 	"keywords": ["nette", "menu", "control", "component", "breadcrumbs"],
-	"homepage": "https://github.com/Carrooi/Nette-Menu",
+	"homepage": "https://github.com/contributte/menu-control",
 	"license": "MIT",
 	"authors": [
 		{
 			"name": "David Kudera",
-			"homepage": "http://davidkudera.com",
-			"email": "[email protected]"
+			"homepage": "https://kudera.dev"
+		},
+		{
+			"name": "Milan Felix Šulc",
+			"homepage": "https://f3l1x.io"
+		},
+		{
+			"name": "Tomáš Jacík",
+			"homepage": "https://tomasjacik.cz"
 		}
 	],
 	"support": {
-		"issues": "https://github.com/Carrooi/Nette-Menu/issues"
+		"issues": "https://github.com/contributte/menu-control/issues"
 	},
 	"require": {
 		"php": ">=7.1",
@@ -28,7 +35,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"Carrooi\\Menu\\": "src/"
+			"Contributte\\MenuControl\\": "src/"
 		}
 	},
 	"autoload-dev": {

diff --git a/src/AbstractMenuItemsContainer.php b/src/AbstractMenuItemsContainer.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
-use Carrooi\Menu\Security\IAuthorizator;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\Security\IAuthorizator;
 use Nette\Http\Request;
 use Nette\Localization\ITranslator;
 
@@ -16,25 +16,25 @@ abstract class AbstractMenuItemsContainer implements IMenuItemsContainer
 {
 
 
-	/** @var \Carrooi\Menu\IMenu */
+	/** @var IMenu */
 	protected $menu;
 
-	/** @var \Carrooi\Menu\LinkGenerator\ILinkGenerator */
+	/** @var ILinkGenerator */
 	protected $linkGenerator;
 
-	/** @var \Nette\Localization\ITranslator */
+	/** @var ITranslator */
 	protected $translator;
 
-	/** @var \Carrooi\Menu\Security\IAuthorizator */
+	/** @var IAuthorizator */
 	protected $authorizator;
 
 	/** @var \Nette\Http\Request */
 	protected $httpRequest;
 
-	/** @var \Carrooi\Menu\IMenuItemFactory */
+	/** @var IMenuItemFactory */
 	protected $menuItemFactory;
 
-	/** @var \Carrooi\Menu\IMenuItem[] */
+	/** @var IMenuItem[] */
 	private $items = [];
 
 
@@ -56,7 +56,7 @@ public function setLinkGenerator(ILinkGenerator $linkGenerator): void
 
 
 	/**
-	 * @return \Carrooi\Menu\IMenuItem[]
+	 * @return \Contributte\MenuControl\IMenuItem[]
 	 */
 	public function getItems(): array
 	{
@@ -148,7 +148,7 @@ private function hasVisibleItemsOn(string $type): bool
 
 	/**
 	 * @param string $type
-	 * @return \Carrooi\Menu\AbstractMenuItemsContainer[]
+	 * @return AbstractMenuItemsContainer[]
 	 */
 	private function getVisibleItemsOn(string $type): array
 	{

diff --git a/src/DI/MenuExtension.php b/src/DI/MenuExtension.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\DI;
-
-use Carrooi\Menu\LinkGenerator\NetteLinkGenerator;
-use Carrooi\Menu\Loaders\ArrayMenuLoader;
-use Carrooi\Menu\Localization\ReturnTranslator;
-use Carrooi\Menu\Menu;
-use Carrooi\Menu\MenuContainer;
-use Carrooi\Menu\MenuItemFactory;
-use Carrooi\Menu\Security\OptimisticAuthorizator;
-use Carrooi\Menu\UI\IMenuComponentFactory;
-use Carrooi\Menu\UI\MenuComponent;
+namespace Contributte\MenuControl\DI;
+
+use Contributte\MenuControl\LinkGenerator\NetteLinkGenerator;
+use Contributte\MenuControl\Loaders\ArrayMenuLoader;
+use Contributte\MenuControl\Localization\ReturnTranslator;
+use Contributte\MenuControl\Menu;
+use Contributte\MenuControl\MenuContainer;
+use Contributte\MenuControl\MenuItemFactory;
+use Contributte\MenuControl\Security\OptimisticAuthorizator;
+use Contributte\MenuControl\UI\IMenuComponentFactory;
+use Contributte\MenuControl\UI\MenuComponent;
 use Nette\DI\CompilerExtension;
 use Nette\DI\ContainerBuilder;
 use Nette\DI\ServiceDefinition;

diff --git a/src/IMenu.php b/src/IMenu.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
 use Nette\Application\UI\Presenter;
 

diff --git a/src/IMenuItem.php b/src/IMenuItem.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
 /**
  * @author David Kudera <[email protected]>

diff --git a/src/IMenuItemFactory.php b/src/IMenuItemFactory.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
-use Carrooi\Menu\Security\IAuthorizator;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\Security\IAuthorizator;
 use Nette\Http\Request;
 use Nette\Localization\ITranslator;
 

diff --git a/src/IMenuItemsContainer.php b/src/IMenuItemsContainer.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
 
 /**
  * @author David Kudera <[email protected]>

diff --git a/src/LinkGenerator/ILinkGenerator.php b/src/LinkGenerator/ILinkGenerator.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\LinkGenerator;
+namespace Contributte\MenuControl\LinkGenerator;
 
-use Carrooi\Menu\IMenuItem;
+use Contributte\MenuControl\IMenuItem;
 
 /**
  * @author David Kudera <[email protected]>

diff --git a/src/LinkGenerator/NetteLinkGenerator.php b/src/LinkGenerator/NetteLinkGenerator.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\LinkGenerator;
+namespace Contributte\MenuControl\LinkGenerator;
 
-use Carrooi\Menu\IMenuItem;
+use Contributte\MenuControl\IMenuItem;
 use Nette\Application\LinkGenerator;
 
 /**

diff --git a/src/Loaders/ArrayMenuLoader.php b/src/Loaders/ArrayMenuLoader.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\Loaders;
+namespace Contributte\MenuControl\Loaders;
 
-use Carrooi\Menu\IMenu;
-use Carrooi\Menu\IMenuItem;
-use Carrooi\Menu\IMenuItemsContainer;
+use Contributte\MenuControl\IMenu;
+use Contributte\MenuControl\IMenuItem;
+use Contributte\MenuControl\IMenuItemsContainer;
 use Nette\Utils;
 
 /**

diff --git a/src/Loaders/IMenuLoader.php b/src/Loaders/IMenuLoader.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\Loaders;
+namespace Contributte\MenuControl\Loaders;
 
-use Carrooi\Menu\IMenu;
+use Contributte\MenuControl\IMenu;
 
 /**
  * @author David Kudera <[email protected]>

diff --git a/src/Localization/ReturnTranslator.php b/src/Localization/ReturnTranslator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu\Localization;
+namespace Contributte\MenuControl\Localization;
 
 use Nette\Localization\ITranslator;
 

diff --git a/src/Menu.php b/src/Menu.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
-use Carrooi\Menu\Loaders\IMenuLoader;
-use Carrooi\Menu\Security\IAuthorizator;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\Loaders\IMenuLoader;
+use Contributte\MenuControl\Security\IAuthorizator;
 use Nette\Application\UI\Presenter;
 use Nette\Http\Request;
 use Nette\Localization\ITranslator;
@@ -18,7 +18,7 @@ final class Menu extends AbstractMenuItemsContainer implements IMenu
 {
 
 
-	/** @var \Carrooi\Menu\Loaders\IMenuLoader */
+	/** @var IMenuLoader */
 	private $loader;
 
 	/** @var string */

diff --git a/src/MenuContainer.php b/src/MenuContainer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
 /**
  * @author David Kudera <[email protected]>
@@ -11,7 +11,7 @@ final class MenuContainer
 {
 
 
-	/** @var \Carrooi\Menu\IMenu[] */
+	/** @var IMenu[] */
 	private $menus = [];
 
 

diff --git a/src/MenuItem.php b/src/MenuItem.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
-use Carrooi\Menu\Security\IAuthorizator;
-use Nette\Application\UI\InvalidLinkException;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\Security\IAuthorizator;
 use Nette\Http\Request;
 use Nette\Localization\ITranslator;
 

diff --git a/src/MenuItemFactory.php b/src/MenuItemFactory.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Carrooi\Menu;
+namespace Contributte\MenuControl;
 
-use Carrooi\Menu\LinkGenerator\ILinkGenerator;
-use Carrooi\Menu\Security\IAuthorizator;
+use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
+use Contributte\MenuControl\Security\IAuthorizator;
 use Nette\Http\Request;
 use Nette\Localization\ITranslator;