presenters moved to namespaces Presenters

CD-collection/app/config.neon

@@ -6,9 +6,13 @@ php:
 	date.timezone: Europe/Prague
 
 nette:
+	application:
+		mapping:
+			*: App\*Module\Presenters\*Presenter
+
 	database:
 		dsn: "sqlite:%appDir%/model/demo.db3"
 
 services:
-	- Authenticator
-	- AlbumRepository
+	- App\Model\Authenticator
+	- App\Model\AlbumRepository

CD-collection/app/model/AlbumRepository.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Model;
+
+use Nette;
+
 
 class AlbumRepository extends Nette\Object
 {

CD-collection/app/model/Authenticator.php

@@ -1,8 +1,9 @@
 <?php
 
-use Nette\Security,
-	Nette\Utils\Strings,
-	Nette\Security\Passwords;
+namespace App\Model;
+
+use Nette,
+	Nette\Security;
 
 
 /**
@@ -33,7 +34,7 @@ public function authenticate(array $credentials)
 		if (!$row) {
 			throw new Security\AuthenticationException('The username is incorrect.', self::IDENTITY_NOT_FOUND);
 
-		} elseif (!Passwords::verify($password, $row->password)) {
+		} elseif (!Security\Passwords::verify($password, $row->password)) {
 			throw new Security\AuthenticationException('The password is incorrect.', self::INVALID_CREDENTIAL);
 		}
 

CD-collection/app/presenters/DashboardPresenter.php

@@ -1,15 +1,19 @@
 <?php
 
-use Nette\Application\UI\Form;
+namespace App\Presenters;
+
+use App\Model,
+	Nette,
+	Nette\Application\UI\Form;
 
 
 class DashboardPresenter extends Nette\Application\UI\Presenter
 {
-	/** @var AlbumRepository */
+	/** @var Model\AlbumRepository */
 	private $albums;
 
 
-	public function __construct(AlbumRepository $albums)
+	public function __construct(Model\AlbumRepository $albums)
 	{
 		$this->albums = $albums;
 	}

CD-collection/app/presenters/SignPresenter.php

@@ -1,6 +1,9 @@
 <?php
 
-use Nette\Application\UI;
+namespace App\Presenters;
+
+use Nette,
+	Nette\Application\UI;
 
 
 class SignPresenter extends Nette\Application\UI\Presenter

Modules-Usage/app/AdminModule/presenters/DefaultPresenter.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DemoApp\AdminModule;
+namespace DemoApp\AdminModule\Presenters;
 
-class DefaultPresenter extends \BasePresenter
+class DefaultPresenter extends \DemoApp\Presenters\BasePresenter
 {
 
 }

Modules-Usage/app/FrontModule/ExportModule/presenters/DefaultPresenter.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DemoApp\FrontModule\ExportModule;
+namespace DemoApp\FrontModule\ExportModule\Presenters;
 
-class DefaultPresenter extends \BasePresenter
+class DefaultPresenter extends \DemoApp\Presenters\BasePresenter
 {
 
 }

Modules-Usage/app/FrontModule/presenters/CatalogListPresenter.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DemoApp\FrontModule;
+namespace DemoApp\FrontModule\Presenters;
 
-class CatalogListPresenter extends \BasePresenter
+class CatalogListPresenter extends \DemoApp\Presenters\BasePresenter
 {
 
 }

Modules-Usage/app/FrontModule/presenters/DefaultPresenter.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DemoApp\FrontModule;
+namespace DemoApp\FrontModule\Presenters;
 
-class DefaultPresenter extends \BasePresenter
+class DefaultPresenter extends \DemoApp\Presenters\BasePresenter
 {
 
 }

Modules-Usage/app/config.neon

@@ -8,4 +8,4 @@ php:
 nette:
 	application:
 		mapping:
-			*: DemoApp\*Module\*Presenter
+			*: DemoApp\*Module\Presenters\*Presenter

Modules-Usage/app/presenters/BasePresenter.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace DemoApp\Presenters;
+
+use Nette;
+
 
 abstract class BasePresenter extends Nette\Application\UI\Presenter
 {