Merge pull request #5 from RiKap/patch-1

Upgrade to Nette 3.0

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
-    - 5.6
-    - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 install:
     - composer install --no-interaction --prefer-source

composer.json

@@ -25,12 +25,12 @@
 		}
 	},
 	"require": {
-		"nette/di"          : "^2.3|^2.4",
-		"nette/application" : "^2.3|^2.4",
-		"nette/http"        : "^2.3|^2.4"
+		"nette/di"          : "^3.0",
+		"nette/application" : "^3.0",
+		"nette/http"        : "^3.0"
 	},
 	"require-dev": {
-		"nette/tester"              : "~1.7",
+		"nette/tester"              : "~2.2.0",
 		"mockery/mockery"           : "dev-master"
 	},
 	"minimum-stability": "dev"

src/DI/SimpleHttpAuthExtension.php

@@ -9,40 +9,43 @@
 namespace Ublaboo\SimpleHttpAuth\DI;
 
 use Nette;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
 
 class SimpleHttpAuthExtension extends Nette\DI\CompilerExtension
 {
 
-	private $defaults = [
-		'username' => '',
-		'password' => '',
-		'consoleAuth' => TRUE,
-		'presenters' => []
-	];
+	public function getConfigSchema(): Schema
+	{
+		return Expect::structure([
+			'username' => Expect::string(NULL),
+			'password' => Expect::string(NULL),
+			'consoleAuth' => Expect::bool(true),
+			'presenters' => Expect::array(),
+		]);
+	}
 
 
 	public function loadConfiguration()
 	{
-		$config = $this->_getConfig();
-
 		$builder = $this->getContainerBuilder();
+		$config = $this->config;
 
 		$builder->addDefinition($this->prefix('simpleHttpAuth'))
-			->setClass('Ublaboo\SimpleHttpAuth\SimpleHttpAuth')
-			->addTag('run')
+			->setClass(\Ublaboo\SimpleHttpAuth\SimpleHttpAuth::class)
 			->setArguments([
-				$config['username'],
-				$config['password'],
-				$config['presenters'],
-				$config['consoleAuth'],
+				$config->username,
+				$config->password,
+				$config->presenters,
+				$config->consoleAuth,
 				$builder->parameters['consoleMode'],
 			]);
 	}
 
 
-	private function _getConfig()
+	public function afterCompile(Nette\PhpGenerator\ClassType $class)
 	{
-		return $this->validateConfig($this->defaults, $this->config);
+		$class->getMethod('initialize')->addBody('$this->getService(?);', [$this->prefix('simpleHttpAuth')]);
 	}
 
 }

src/SimpleHttpAuth.php

@@ -10,7 +10,7 @@
 
 use Nette;
 
-class SimpleHttpAuth extends Nette\DI\CompilerExtension
+class SimpleHttpAuth
 {
 
 	/**
@@ -77,7 +77,7 @@ public function __construct(
 		/**
 		 * Eccapt either all presenter or just the specified ones
 		 */
-		if (empty($presenters) || in_array($request->getPresenterName(), $presenters)) {
+		if (empty($presenters) || (isset($request['presenter']) && in_array($request['presenter'], $presenters))) {
 			$this->authenticate($username, $password);
 		}
 	}

tests/bootstrap.php

@@ -3,4 +3,6 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 Tester\Environment::setup();
+Tester\Environment::bypassFinals();
+
 date_default_timezone_set('Europe/Prague');

tests/cases/SimpleHttpAuthTest.phpt

@@ -57,7 +57,9 @@ final class SimpleHttpAuthTest extends Tester\TestCase
 
 		$this->router->shouldReceive('match')
 			->withArgs([$this->request])
-			->andReturn($this->appRequest);
+			->andReturn([
+				'presenter' => $return_presenter,
+			]);
 	}