uses Nette\SmartObject

composer.json

@@ -19,7 +19,7 @@
  "nette/http": "~2.2",
  "nette/reflection": "~2.2",
  "nette/security": "~2.2",
- "nette/utils": "~2.2"
+ "nette/utils": "~2.4"
  },
  "suggest": {
  "nette/forms": "Allows to use Nette\\Application\\UI\\Form",

src/Application/Application.php

@@ -13,8 +13,10 @@
 /**
  * Front Controller.
  */
-class Application extends Nette\Object
+class Application
 {
+ use Nette\SmartObject;
+
  /** @var int */
  public static $maxLoop = 20;
 

src/Application/ErrorPresenter.php

@@ -15,8 +15,10 @@
 /**
  * Default Error Presenter.
  */
-class ErrorPresenter extends Nette\Object implements Application\IPresenter
+class ErrorPresenter implements Application\IPresenter
 {
+ use Nette\SmartObject;
+
  /** @var ILogger|NULL */
  private $logger;
 

src/Application/LinkGenerator.php

@@ -13,8 +13,10 @@
 /**
  * Link generator.
  */
-class LinkGenerator extends Nette\Object
+class LinkGenerator
 {
+ use Nette\SmartObject;
+
  /** @var IRouter */
  private $router;
 

src/Application/MicroPresenter.php

@@ -17,8 +17,10 @@
 /**
  * Micro presenter.
  */
-class MicroPresenter extends Nette\Object implements Application\IPresenter
+class MicroPresenter implements Application\IPresenter
 {
+ use Nette\SmartObject;
+
  /** @var Nette\DI\Container|NULL */
  private $context;
 

src/Application/PresenterFactory.php

@@ -13,8 +13,10 @@
 /**
  * Default presenter loader.
  */
-class PresenterFactory extends Nette\Object implements IPresenterFactory
+class PresenterFactory implements IPresenterFactory
 {
+ use Nette\SmartObject;
+
  /** @var array[] of module => splited mask */
  private $mapping = [
  '*' => ['', '*Module\\', '*Presenter'],

src/Application/Request.php

@@ -18,8 +18,10 @@
  * @property array $files
  * @property string|NULL $method
  */
-class Request extends Nette\Object
+class Request
 {
+ use Nette\SmartObject;
+
  /** method */
  const FORWARD = 'FORWARD';
 

src/Application/Responses/CallbackResponse.php

@@ -13,8 +13,10 @@
 /**
  * Callback response.
  */
-class CallbackResponse extends Nette\Object implements Nette\Application\IResponse
+class CallbackResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var callable */
  private $callback;
 

src/Application/Responses/FileResponse.php

@@ -13,8 +13,10 @@
 /**
  * File download response.
  */
-class FileResponse extends Nette\Object implements Nette\Application\IResponse
+class FileResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var string */
  private $file;
 

src/Application/Responses/ForwardResponse.php

@@ -13,8 +13,10 @@
 /**
  * Forwards to new request.
  */
-class ForwardResponse extends Nette\Object implements Nette\Application\IResponse
+class ForwardResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var Nette\Application\Request */
  private $request;
 

src/Application/Responses/JsonResponse.php

@@ -13,8 +13,10 @@
 /**
  * JSON response used mainly for AJAX requests.
  */
-class JsonResponse extends Nette\Object implements Nette\Application\IResponse
+class JsonResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var array|\stdClass */
  private $payload;
 

src/Application/Responses/RedirectResponse.php

@@ -14,8 +14,10 @@
 /**
  * Redirects to new URI.
  */
-class RedirectResponse extends Nette\Object implements Nette\Application\IResponse
+class RedirectResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var string */
  private $url;
 

src/Application/Responses/TextResponse.php

@@ -13,8 +13,10 @@
 /**
  * String output response.
  */
-class TextResponse extends Nette\Object implements Nette\Application\IResponse
+class TextResponse implements Nette\Application\IResponse
 {
+ use Nette\SmartObject;
+
  /** @var mixed */
  private $source;
 

src/Application/Routers/CliRouter.php

@@ -14,8 +14,10 @@
 /**
  * The unidirectional router for CLI. (experimental)
  */
-class CliRouter extends Nette\Object implements Application\IRouter
+class CliRouter implements Application\IRouter
 {
+ use Nette\SmartObject;
+
  const PRESENTER_KEY = 'action';
 
  /** @var array */

src/Application/Routers/Route.php

@@ -16,8 +16,10 @@
  * The bidirectional route is responsible for mapping
  * HTTP request to a Request object for dispatch and vice-versa.
  */
-class Route extends Nette\Object implements Application\IRouter
+class Route implements Application\IRouter
 {
+ use Nette\SmartObject;
+
  const PRESENTER_KEY = 'presenter';
  const MODULE_KEY = 'module';
 

src/Application/Routers/SimpleRouter.php

@@ -14,8 +14,10 @@
 /**
  * The bidirectional route for trivial routing via query parameters.
  */
-class SimpleRouter extends Nette\Object implements Application\IRouter
+class SimpleRouter implements Application\IRouter
 {
+ use Nette\SmartObject;
+
  const PRESENTER_KEY = 'presenter';
  const MODULE_KEY = 'module';
 

src/Application/UI/Link.php

@@ -14,8 +14,10 @@
  * Lazy encapsulation of PresenterComponent::link().
  * Do not instantiate directly, use PresenterComponent::lazyLink()
  */
-class Link extends Nette\Object
+class Link
 {
+ use Nette\SmartObject;
+
  /** @var PresenterComponent */
  private $component;
 

src/Bridges/ApplicationLatte/Template.php

@@ -14,8 +14,10 @@
 /**
  * Latte powered template.
  */
-class Template extends Nette\Object implements Nette\Application\UI\ITemplate
+class Template implements Nette\Application\UI\ITemplate
 {
+ use Nette\SmartObject;
+
  /** @var Latte\Engine */
  private $latte;
 

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -14,8 +14,10 @@
 /**
  * Latte powered template factory.
  */
-class TemplateFactory extends Nette\Object implements UI\ITemplateFactory
+class TemplateFactory implements UI\ITemplateFactory
 {
+ use Nette\SmartObject;
+
  /** @var ILatteFactory */
  private $latteFactory;
 

src/Bridges/ApplicationLatte/UIRuntime.php

@@ -15,8 +15,9 @@
  * Runtime helpers for UI macros.
  * @internal
  */
-class UIRuntime extends Nette\Object
+class UIRuntime
 {
+ use Nette\StaticClass;
 
  public static function renderSnippets(UI\Control $control, \stdClass $local = NULL, array $params = [])
  {

src/Bridges/ApplicationTracy/RoutingPanel.php

@@ -17,8 +17,10 @@
 /**
  * Routing debugger for Debug Bar.
  */
-class RoutingPanel extends Nette\Object implements Tracy\IBarPanel
+class RoutingPanel implements Tracy\IBarPanel
 {
+ use Nette\SmartObject;
+
  /** @var Nette\Application\IRouter */
  private $router;
 

tests/Application/MicroPresenter.invoke.phpt

@@ -11,7 +11,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-class Invokable extends Nette\Object
+class Invokable
 {
  public function __invoke($page, $id, NetteModule\MicroPresenter $presenter)
  {

tests/Bridges.Latte/UIMacros.control.2.phpt

@@ -4,15 +4,14 @@
  * Test: {control ...}
  */
 
-use Nette\Object;
 use Nette\Bridges\ApplicationLatte\UIMacros;
 use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-class MockComponent extends Object
+class MockComponent
 {
  function getComponent($name)
  {
@@ -24,7 +23,7 @@ class MockComponent extends Object
 }
 
 
-class MockControl extends Object
+class MockControl
 {
 
  function __call($name, $args)

tests/UI/MockPresenterFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-class MockPresenterFactory extends Nette\Object implements Nette\Application\IPresenterFactory
+class MockPresenterFactory implements Nette\Application\IPresenterFactory
 {
  function getPresenterClass(& $name)
  {

tests/UI/Presenter.storeRequest().phpt

@@ -31,7 +31,7 @@ class MockSession extends Http\Session
  }
 }
 
-class MockSessionSection extends Nette\Object implements \ArrayAccess
+class MockSessionSection implements \ArrayAccess
 {
  public $testedKeyExistence;
  public $storedKey;