symfony
diff --git a/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php‎
Lines changed: 20 additions & 20 deletions b/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php‎
Lines changed: 20 additions & 20 deletions
diff --git a/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php‎
Lines changed: 0 additions & 185 deletions b/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php‎
Lines changed: 0 additions & 185 deletions
diff --git a/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt‎
Lines changed: 1 addition & 1 deletion
@@ -26,21 +26,9 @@ class PhpDumperTest extends TestCase
 {
     public function testDumpContainerWithProxyService()
     {
-        $container = new ContainerBuilder();
-
-        $container->register('foo', 'stdClass');
-        $container->getDefinition('foo')->setLazy(true);
-        $container->compile();
-
-        $dumper = new PhpDumper($container);
-
-        $dumper->setProxyDumper(new ProxyDumper());
-
-        $dumpedString = $dumper->dump();
-
         $this->assertStringMatchesFormatFile(
             __DIR__.'/../Fixtures/php/lazy_service_structure.txt',
-            $dumpedString,
+            $this->dumpLazyServiceProjectServiceContainer(),
             '->dump() does generate proxy lazy loading logic.'
         );
     }
@@ -50,18 +38,15 @@ public function testDumpContainerWithProxyService()
      */
     public function testDumpContainerWithProxyServiceWillShareProxies()
     {
-        // detecting ProxyManager v2
-        if (class_exists('ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\StaticProxyConstructor')) {
-            require_once __DIR__.'/../Fixtures/php/lazy_service_with_hints.php';
-        } else {
-            require_once __DIR__.'/../Fixtures/php/lazy_service.php';
+        if (!class_exists('LazyServiceProjectServiceContainer', false)) {
+            eval('?>'.$this->dumpLazyServiceProjectServiceContainer());
         }
 
         $container = new \LazyServiceProjectServiceContainer();
 
-        /* @var $proxy \stdClass_c1d194250ee2e2b7d2eab8b8212368a8 */
         $proxy = $container->get('foo');
-        $this->assertInstanceOf('stdClass_c1d194250ee2e2b7d2eab8b8212368a8', $proxy);
+        $this->assertInstanceOf('stdClass', $proxy);
+        $this->assertInstanceOf('ProxyManager\Proxy\LazyLoadingInterface', $proxy);
         $this->assertSame($proxy, $container->get('foo'));
 
         $this->assertFalse($proxy->isProxyInitialized());
@@ -71,4 +56,19 @@ public function testDumpContainerWithProxyServiceWillShareProxies()
         $this->assertTrue($proxy->isProxyInitialized());
         $this->assertSame($proxy, $container->get('foo'));
     }
+
+    private function dumpLazyServiceProjectServiceContainer()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass');
+        $container->getDefinition('foo')->setLazy(true);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $dumper->setProxyDumper(new ProxyDumper());
+
+        return $dumper->dump(array('class' => 'LazyServiceProjectServiceContainer'));
+    }
 }
@@ -1,7 +1,7 @@
 <?php
 
 use %a
-class ProjectServiceContainer extends Container
+class LazyServiceProjectServiceContainer extends Container
 {%a
     public function getFooService($lazyLoad = true)
     {
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`use %a`
`4`		`-class ProjectServiceContainer extends Container`
	`4`	`+class LazyServiceProjectServiceContainer extends Container`
`5`	`5`	`{%a`
`6`	`6`	`public function getFooService($lazyLoad = true)`
`7`	`7`	`{`