Skip to content

Commit 95c1d58

Browse files
foxycodefoxycode
committed
Refactoring: renamed Carrooi\Menu namespace to Contributte\MenuControl
1 parent 3feb613 commit 95c1d58

32 files changed

+106
-105
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cache:
1212
install:
1313
- travis_retry composer install --no-progress --prefer-dist
1414

15-
script: vendor/bin/tester -s -p php -c tests/php.ini tests/CarrooiTests/Menu/
15+
script: vendor/bin/tester -s -p php -c tests/php.ini tests/CarrooiTests/
1616

1717
after_failure:
1818
- for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done

‎README.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[![Build Status](https://img.shields.io/travis/Carrooi/Nette-Menu.svg?style=flat-square)](https://travis-ci.org/Carrooi/Nette-Menu)
2-
[![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)
1+
[![Build Status](https://travis-ci.org/contributte/menu-control.svg?branch=nette24)](https://travis-ci.org/contributte/menu-control)
32

43
# Nette menu
54

@@ -15,14 +14,14 @@ Nette component for creating menus, breadcrumbs and sitemaps.
1514
**Install package with composer:**
1615

1716
```
18-
$ composer require carrooi/nette-menu
17+
$ composer require contributte/menu-control
1918
```
2019

2120
**Register as nette extension:**
2221

2322
```yaml
2423
extensions:
25-
menu: Carrooi\Menu\DI\MenuExtension
24+
menu: Contributte\MenuControl\DI\MenuExtension
2625

2726
menu:
2827
```
@@ -66,8 +65,8 @@ menu:
6665

6766
namespace App;
6867

69-
use Carrooi\Menu\UI\IMenuComponentFactory;
70-
use Carrooi\Menu\UI\MenuComponent;
68+
use Contributte\MenuControl\UI\IMenuComponentFactory;
69+
use Contributte\MenuControl\UI\MenuComponent;
7170
use Nette\Application\UI\Presenter;
7271

7372
final class BasePresenter extends Presenter
@@ -117,9 +116,9 @@ This package includes 3 default templates (menu, breadcrumbs, sitemap). However
117116
should be used in real project. The other two templates should only help you in the beginning with building your own
118117
templates which will fit your's website look.
119118

120-
* [menu.latte](./src/Carrooi/Menu/UI/templates/menu.latte)
121-
* [breadcrumbs.latte](./src/Carrooi/Menu/UI/templates/menu.latte)
122-
* [sitemap.latte](./src/Carrooi/Menu/UI/templates/sitemap.latte)
119+
* [menu.latte](./src/UI/templates/menu.latte)
120+
* [breadcrumbs.latte](./src/UI/templates/menu.latte)
121+
* [sitemap.latte](./src/UI/templates/sitemap.latte)
123122

124123
Changing templates can be done in your menu configuration:
125124

@@ -233,8 +232,8 @@ This menu package uses custom `IAuthorizator` interface which you can use to wri
233232
234233
namespace App;
235234
236-
use Carrooi\Menu\IMenuItem;
237-
use Carrooi\Menu\Security\IAuthorizator;
235+
use Contributte\MenuControl\IMenuItem;
236+
use Contributte\MenuControl\Security\IAuthorizator;
238237
239238
final class FrontAuthorizator implements IAuthorizator
240239
{
@@ -269,8 +268,8 @@ your custom link generator.
269268
270269
namespace App;
271270
272-
use Carrooi\Menu\IMenuItem;
273-
use Carrooi\Menu\LinkGenerator\ILinkGenerator;
271+
use Contributte\MenuControl\IMenuItem;
272+
use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
274273
275274
final class FrontLinkGenerator implements ILinkGenerator
276275
{
@@ -316,7 +315,7 @@ menu:
316315
If you want to build your menu maybe from database instead of neon config, you can do that by creating `IMenuLoader`
317316
class.
318317

319-
See the default [ArrayMenuLoader](./src/Carrooi/Menu/Loaders/ArrayMenuLoader.php) how it works.
318+
See the default [ArrayMenuLoader](../src/Loaders/ArrayMenuLoader.php) how it works.
320319

321320
## Changelog
322321

‎composer.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
{
2-
"name": "carrooi/nette-menu",
2+
"name": "contributte/menu-control",
33
"type": "library",
4-
"description": "Menu for Nette framework",
4+
"description": "Menu control for Nette framework",
55
"keywords": ["nette", "menu", "control", "component", "breadcrumbs"],
6-
"homepage": "https://github.com/Carrooi/Nette-Menu",
6+
"homepage": "https://github.com/contributte/menu-control",
77
"license": "MIT",
88
"authors": [
99
{
1010
"name": "David Kudera",
11-
"homepage": "http://davidkudera.com",
12-
"email": "kudera.d@gmail.com"
11+
"homepage": "https://kudera.dev"
12+
},
13+
{
14+
"name": "Milan Felix Šulc",
15+
"homepage": "https://f3l1x.io"
16+
},
17+
{
18+
"name": "Tomáš Jacík",
19+
"homepage": "https://tomasjacik.cz"
1320
}
1421
],
1522
"support": {
16-
"issues": "https://github.com/Carrooi/Nette-Menu/issues"
23+
"issues": "https://github.com/contributte/menu-control/issues"
1724
},
1825
"require": {
1926
"php": ">=7.1",
@@ -28,7 +35,7 @@
2835
},
2936
"autoload": {
3037
"psr-4": {
31-
"Carrooi\\Menu\\": "src/"
38+
"Contributte\\MenuControl\\": "src/"
3239
}
3340
},
3441
"autoload-dev": {

‎src/AbstractMenuItemsContainer.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu;
5+
namespace Contributte\MenuControl;
66

7-
use Carrooi\Menu\LinkGenerator\ILinkGenerator;
8-
use Carrooi\Menu\Security\IAuthorizator;
7+
use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
8+
use Contributte\MenuControl\Security\IAuthorizator;
99
use Nette\Http\Request;
1010
use Nette\Localization\ITranslator;
1111

@@ -16,25 +16,25 @@ abstract class AbstractMenuItemsContainer implements IMenuItemsContainer
1616
{
1717

1818

19-
/** @var \Carrooi\Menu\IMenu */
19+
/** @var IMenu */
2020
protected $menu;
2121

22-
/** @var \Carrooi\Menu\LinkGenerator\ILinkGenerator */
22+
/** @var ILinkGenerator */
2323
protected $linkGenerator;
2424

25-
/** @var \Nette\Localization\ITranslator */
25+
/** @var ITranslator */
2626
protected $translator;
2727

28-
/** @var \Carrooi\Menu\Security\IAuthorizator */
28+
/** @var IAuthorizator */
2929
protected $authorizator;
3030

3131
/** @var \Nette\Http\Request */
3232
protected $httpRequest;
3333

34-
/** @var \Carrooi\Menu\IMenuItemFactory */
34+
/** @var IMenuItemFactory */
3535
protected $menuItemFactory;
3636

37-
/** @var \Carrooi\Menu\IMenuItem[] */
37+
/** @var IMenuItem[] */
3838
private $items = [];
3939

4040

@@ -56,7 +56,7 @@ public function setLinkGenerator(ILinkGenerator $linkGenerator): void
5656

5757

5858
/**
59-
* @return \Carrooi\Menu\IMenuItem[]
59+
* @return \Contributte\MenuControl\IMenuItem[]
6060
*/
6161
public function getItems(): array
6262
{
@@ -148,7 +148,7 @@ private function hasVisibleItemsOn(string $type): bool
148148

149149
/**
150150
* @param string $type
151-
* @return \Carrooi\Menu\AbstractMenuItemsContainer[]
151+
* @return AbstractMenuItemsContainer[]
152152
*/
153153
private function getVisibleItemsOn(string $type): array
154154
{

‎src/DI/MenuExtension.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu\DI;
6-
7-
use Carrooi\Menu\LinkGenerator\NetteLinkGenerator;
8-
use Carrooi\Menu\Loaders\ArrayMenuLoader;
9-
use Carrooi\Menu\Localization\ReturnTranslator;
10-
use Carrooi\Menu\Menu;
11-
use Carrooi\Menu\MenuContainer;
12-
use Carrooi\Menu\MenuItemFactory;
13-
use Carrooi\Menu\Security\OptimisticAuthorizator;
14-
use Carrooi\Menu\UI\IMenuComponentFactory;
15-
use Carrooi\Menu\UI\MenuComponent;
5+
namespace Contributte\MenuControl\DI;
6+
7+
use Contributte\MenuControl\LinkGenerator\NetteLinkGenerator;
8+
use Contributte\MenuControl\Loaders\ArrayMenuLoader;
9+
use Contributte\MenuControl\Localization\ReturnTranslator;
10+
use Contributte\MenuControl\Menu;
11+
use Contributte\MenuControl\MenuContainer;
12+
use Contributte\MenuControl\MenuItemFactory;
13+
use Contributte\MenuControl\Security\OptimisticAuthorizator;
14+
use Contributte\MenuControl\UI\IMenuComponentFactory;
15+
use Contributte\MenuControl\UI\MenuComponent;
1616
use Nette\DI\CompilerExtension;
1717
use Nette\DI\ContainerBuilder;
1818
use Nette\DI\ServiceDefinition;

‎src/IMenu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu;
5+
namespace Contributte\MenuControl;
66

77
use Nette\Application\UI\Presenter;
88

‎src/IMenuItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu;
5+
namespace Contributte\MenuControl;
66

77
/**
88
* @author David Kudera <kudera.d@gmail.com>

‎src/IMenuItemFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu;
5+
namespace Contributte\MenuControl;
66

7-
use Carrooi\Menu\LinkGenerator\ILinkGenerator;
8-
use Carrooi\Menu\Security\IAuthorizator;
7+
use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
8+
use Contributte\MenuControl\Security\IAuthorizator;
99
use Nette\Http\Request;
1010
use Nette\Localization\ITranslator;
1111

‎src/IMenuItemsContainer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu;
5+
namespace Contributte\MenuControl;
66

7-
use Carrooi\Menu\LinkGenerator\ILinkGenerator;
7+
use Contributte\MenuControl\LinkGenerator\ILinkGenerator;
88

99
/**
1010
* @author David Kudera <kudera.d@gmail.com>

‎src/LinkGenerator/ILinkGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Carrooi\Menu\LinkGenerator;
5+
namespace Contributte\MenuControl\LinkGenerator;
66

7-
use Carrooi\Menu\IMenuItem;
7+
use Contributte\MenuControl\IMenuItem;
88

99
/**
1010
* @author David Kudera <kudera.d@gmail.com>

0 commit comments

Comments
 (0)