Router::$defaultFlags and flag SECURED are deprecated [Closes nette/r…

…outing#13]
nette · May 20, 2016 · e04c0e1 · e04c0e1
1 parent 81ebb2d
commit e04c0e1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/Application/Routers/Route.php b/src/Application/Routers/Route.php
@@ -41,7 +41,7 @@ class Route implements Application\IRouter
  PATH_OPTIONAL = 1,
  CONSTANT = 2;
 
- /** @var int */
+ /** @deprecated */
  public static $defaultFlags = 0;
 
  /** @var array */
@@ -134,6 +134,11 @@ public function __construct($mask, $metadata = [], $flags = 0)
 
  $this->flags = $flags | static::$defaultFlags;
  $this->setMask($mask, $metadata);
+ if (static::$defaultFlags) {
+ trigger_error('Route::$defaultFlags is deprecated, router by default keeps the used protocol.', E_USER_DEPRECATED);
+ } elseif ($this->type !== self::HOST && $flags & self::SECURED) {
+ trigger_error('Router::SECURED is deprecated for routes without host, router by default keeps the used protocol.', E_USER_DEPRECATED);
+ }
  }
 
 

diff --git a/src/Application/Routers/SimpleRouter.php b/src/Application/Routers/SimpleRouter.php
@@ -55,6 +55,9 @@ public function __construct($defaults = [], $flags = 0)
 
  $this->defaults = $defaults;
  $this->flags = $flags;
+ if ($flags & self::SECURED) {
+ trigger_error('IRouter::SECURED is deprecated, router by default keeps the used protocol.', E_USER_DEPRECATED);
+ }
  }
 
 

diff --git a/tests/Routers/Route.secured.phpt b/tests/Routers/Route.secured.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/Route.php';
 
 
-$route = new Route('<param>', [
+$route = @new Route('<param>', [ // @ SECURED is deprecated
  'presenter' => 'Presenter',
 ]);
 

diff --git a/tests/Routers/SimpleRouter.secured.phpt b/tests/Routers/SimpleRouter.secured.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$router = new Application\Routers\SimpleRouter([
+$router = @new Application\Routers\SimpleRouter([ // @ SECURED is deprecated
  'id' => 12,
  'any' => 'anyvalue',
 ], Application\Routers\SimpleRouter::SECURED);