Skip to content

Remove typehint to allow MobileDetector override #108

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove typehint to allow MobileDetector override #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd7f485
Remove typehint to allow MobileDetector override
May 25, 2017
a7786e1
Update twig.xml
Oct 3, 2017
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
7 changes: 3 additions & 4 deletions EventListener/RequestResponseListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

namespace SunCat\MobileDetectBundle\EventListener;

use SunCat\MobileDetectBundle\DeviceDetector\MobileDetector;
use SunCat\MobileDetectBundle\Helper\DeviceView;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
Expand All @@ -37,7 +36,7 @@ class RequestResponseListener
CONST FULL = 'full';

/**
* @var MobileDetector
* @var mixed
*/
protected $mobileDetector;

Expand Down Expand Up @@ -69,14 +68,14 @@ class RequestResponseListener
/**
* RequestResponseListener constructor.
*
* @param MobileDetector $mobileDetector
* @param mixed $mobileDetector
* @param DeviceView $deviceView
* @param RouterInterface $router
* @param array $redirectConf
* @param bool $fullPath
*/
public function __construct(
MobileDetector $mobileDetector,
$mobileDetector,
DeviceView $deviceView,
RouterInterface $router,
array $redirectConf,
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/twig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<argument type="service" id="mobile_detect.device_view" />
<argument>%mobile_detect.redirect%</argument>
<call method="setRequestByRequestStack">
<argument type="service" id="request_stack" on-invalid="null" strict="false" />
<argument type="service" id="request_stack" on-invalid="null" />
</call>
<tag name="twig.extension"/>
</service>
Expand Down
9 changes: 4 additions & 5 deletions Twig/Extension/MobileDetectExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

namespace SunCat\MobileDetectBundle\Twig\Extension;

use SunCat\MobileDetectBundle\DeviceDetector\MobileDetector;
use SunCat\MobileDetectBundle\Helper\DeviceView;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
Expand All @@ -21,10 +20,10 @@
*
* @author suncat2000 <[email protected]>
*/
class MobileDetectExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
class MobileDetectExtension extends \Twig_Extension
{
/**
* @var \SunCat\MobileDetectBundle\DeviceDetector\MobileDetector
* @var mixed
*/
private $mobileDetector;

Expand All @@ -46,11 +45,11 @@ class MobileDetectExtension extends \Twig_Extension implements \Twig_Extension_G
/**
* MobileDetectExtension constructor.
*
* @param MobileDetector $mobileDetector
* @param mixed $mobileDetector
* @param DeviceView $deviceView
* @param array $redirectConf
*/
public function __construct(MobileDetector $mobileDetector, DeviceView $deviceView, array $redirectConf)
public function __construct($mobileDetector, DeviceView $deviceView, array $redirectConf)
{
$this->mobileDetector = $mobileDetector;
$this->deviceView = $deviceView;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"php": ">=5.5.0",
"symfony/framework-bundle": "~2.4|~3.0",
"mobiledetect/mobiledetectlib": "~2.8",
"twig/twig": "~1.23"
"twig/twig": "~1.23|~2.0"
},
"require-dev": {
"phpunit/phpunit": "~4.1",
Expand Down