Skip to content

Commit

Permalink
refactor #8 Change parameters argument to minkParameters to support a…
Browse files Browse the repository at this point in the history
…utowiring (pamil)

This PR was merged into the 1.0-dev branch.

Discussion
----------

While autowiring Mink parameters with `$parameters` could be too much, we could setup autowiring for `$minkParameters` in SymfonyExtension.

Commits
-------

c693639 Change parameters argument to minkParameters to support autowiring
  • Loading branch information
Zales0123 authored Jan 9, 2019
2 parents 938cc53 + c693639 commit 447cd6c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/Element/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ abstract class Element
private $document;

/**
* @param array|\ArrayAccess $parameters
* @param array|\ArrayAccess $minkParameters
*/
public function __construct(Session $session, $parameters = [])
public function __construct(Session $session, $minkParameters = [])
{
if (!is_array($parameters) && !$parameters instanceof \ArrayAccess) {
if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
throw new \InvalidArgumentException(sprintf(
'"$parameters" passed to "%s" has to be an array or implement "%s".',
self::class,
Expand All @@ -36,7 +36,7 @@ public function __construct(Session $session, $parameters = [])
}

$this->session = $session;
$this->parameters = $parameters;
$this->parameters = $minkParameters;
}

protected function getParameter(string $name): NodeElement
Expand Down
8 changes: 4 additions & 4 deletions src/Page/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ abstract class Page implements PageInterface
private $document;

/**
* @param array|\ArrayAccess $parameters
* @param array|\ArrayAccess $minkParameters
*/
public function __construct(Session $session, $parameters = [])
public function __construct(Session $session, $minkParameters = [])
{
if (!is_array($parameters) && !$parameters instanceof \ArrayAccess) {
if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
throw new \InvalidArgumentException(sprintf(
'"$parameters" passed to "%s" has to be an array or implement "%s".',
self::class,
Expand All @@ -37,7 +37,7 @@ public function __construct(Session $session, $parameters = [])
}

$this->session = $session;
$this->parameters = $parameters;
$this->parameters = $minkParameters;
}

public function open(array $urlParameters = []): void
Expand Down
8 changes: 4 additions & 4 deletions src/Page/SymfonyPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ abstract class SymfonyPage extends Page implements SymfonyPageInterface
protected static $additionalParameters = ['_locale' => 'en_US'];

/**
* @param array|\ArrayAccess $parameters
* @param array|\ArrayAccess $minkParameters
*/
public function __construct(Session $session, $parameters, RouterInterface $router)
public function __construct(Session $session, $minkParameters, RouterInterface $router)
{
if (!is_array($parameters) && !$parameters instanceof \ArrayAccess) {
if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
throw new \InvalidArgumentException(sprintf(
'"$parameters" passed to "%s" has to be an array or implement "%s".',
self::class,
\ArrayAccess::class
));
}

parent::__construct($session, $parameters);
parent::__construct($session, $minkParameters);

$this->router = $router;
}
Expand Down

0 comments on commit 447cd6c

Please sign in to comment.