Skip to content

[Slim] Fix AbstractAuthenticator constructor TypeError #2641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Apr 13, 2019
Merged

[Slim] Fix AbstractAuthenticator constructor TypeError #2641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe5aa8c
Fix AbstractAuthenticator constructor TypeError
ybelenko Apr 10, 2019
821fa40
Refresh samples
ybelenko Apr 10, 2019
108ced7
Remove container argument reassign
ybelenko Apr 13, 2019
ff349bf
Refresh samples
ybelenko Apr 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions modules/openapi-generator/src/main/resources/php-slim-server/SlimRouter.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,17 @@ class SlimRouter
/**
* Class constructor
*
* @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
* @param ContainerInterface|array $settings Either a ContainerInterface or an associative array of app settings
*
* @throws InvalidArgumentException When no container is provided that implements ContainerInterface
* @throws Exception When implementation class doesn't exists
*/
public function __construct($container = [])
public function __construct($settings = [])
{
$this->slimApp = new App($container);
$this->slimApp = new App($settings);

// middlewares requires Psr\Container\ContainerInterface
$container = $this->slimApp->getContainer();

{{#hasAuthMethods}}
$authPackage = '{{authPackage}}';
Expand Down
9 changes: 6 additions & 3 deletions samples/server/petstore/php-slim/lib/SlimRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,14 +577,17 @@ class SlimRouter
/**
* Class constructor
*
* @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
* @param ContainerInterface|array $settings Either a ContainerInterface or an associative array of app settings
*
* @throws InvalidArgumentException When no container is provided that implements ContainerInterface
* @throws Exception When implementation class doesn't exists
*/
public function __construct($container = [])
public function __construct($settings = [])
{
$this->slimApp = new App($container);
$this->slimApp = new App($settings);

// middlewares requires Psr\Container\ContainerInterface
$container = $this->slimApp->getContainer();

$authPackage = 'OpenAPIServer\Auth';
$basicAuthenticator = function (ServerRequestInterface &$request, TokenSearch $tokenSearch) use ($authPackage) {
Expand Down