Skip to content

Commit 34619f1

Browse files
committed
trying to work around trait vs interface issue
1 parent 80315be commit 34619f1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

tests/Functional/Fixtures/Symfony/AppCache.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
class AppCache extends HttpCache implements CacheInvalidationInterface
1212
{
13-
use EventDispatchingHttpCache;
13+
// http://stackoverflow.com/questions/31877844/php-trait-exposing-a-method-and-interfaces
14+
use EventDispatchingHttpCache {fetch as public eventTriggeringFetch;}
1415

1516
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
1617
{
@@ -37,6 +38,6 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
3738
*/
3839
public function fetch(Request $request, $catch = false)
3940
{
40-
return parent::fetch($request, $catch);
41+
return $this->eventTriggeringFetch($request, $catch);
4142
}
4243
}

tests/Unit/SymfonyCache/EventDispatchingHttpCacheTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ public function testAbortInvalidate()
146146

147147
class AppCache extends HttpCache implements CacheInvalidationInterface
148148
{
149-
use EventDispatchingHttpCache;
150-
149+
// http://stackoverflow.com/questions/31877844/php-trait-exposing-a-method-and-interfaces
150+
use EventDispatchingHttpCache {fetch as public eventTriggeringFetch;}
151151
public function fetch(Request $request, $catch = false)
152152
{
153-
return $this->fetch($request, $catch);
153+
return $this->eventTriggeringFetch($request, $catch);
154154
}
155155
}
156156

@@ -164,7 +164,7 @@ class TestSubscriber implements EventSubscriberInterface
164164
private $kernel;
165165
private $request;
166166

167-
public function __construct($test, $kernel, $request)
167+
public function __construct(\PHPUnit_Framework_TestCase $test, $kernel, $request)
168168
{
169169
$this->test = $test;
170170
$this->kernel = $kernel;

0 commit comments

Comments
 (0)