fix tests of #18144

HeahDude · HeahDude · commit 5b0da22339c9 · 2016-04-03T20:34:02.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Config/AutowireServiceResource.php b/src/Symfony/Component/DependencyInjection/Config/AutowireServiceResource.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Config;
 
 use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
-use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 
 class AutowireServiceResource implements SelfCheckingResourceInterface, \Serializable
 {
@@ -46,7 +45,7 @@ public function isFresh($timestamp)
             return false;
         }
 
-        return AutowirePass::createResourceForClass($reflectionClass);
+        return false;
     }
 
     public function __toString()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Config/AutowireServiceResourceTest.php b/src/Symfony/Component/DependencyInjection/Tests/Config/AutowireServiceResourceTest.php
@@ -73,7 +73,7 @@ public function testIsNotFreshChangedResource()
         );
 
         // test with a stale file *and* a resource that *will* be different than the actual
-        $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');
+        $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns the false if the constructor arguments have changed');
     }
 
     public function testIsFreshSameConstructorArgs()
@@ -83,7 +83,7 @@ public function testIsFreshSameConstructorArgs()
         );
 
         // test with a stale file *but* the resource will not be changed
-        $this->assertTrue($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');
+        $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');
     }
 
     public function testNotFreshIfClassNotFound()
@@ -94,7 +94,7 @@ public function testNotFreshIfClassNotFound()
             array()
         );
 
-        $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the class no longer exists');
+        $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() the resource object false if the class no longer exists');
     }
 
     protected function tearDown()

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Config;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;`
`15`		`-use Symfony\Component\DependencyInjection\Compiler\AutowirePass;`
`16`	`15`
`17`	`16`	`class AutowireServiceResource implements SelfCheckingResourceInterface, \Serializable`
`18`	`17`	`{`
`@@ -46,7 +45,7 @@ public function isFresh($timestamp)`
`46`	`45`	`return false;`
`47`	`46`	`}`
`48`	`47`
`49`		`- return AutowirePass::createResourceForClass($reflectionClass);`
	`48`	`+ return false;`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public function __toString()`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testIsNotFreshChangedResource()`
`73`	`73`	`);`
`74`	`74`
`75`	`75`	`// test with a stale file and a resource that will be different than the actual`
`76`		`- $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');`
	`76`	`+ $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns the false if the constructor arguments have changed');`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public function testIsFreshSameConstructorArgs()`
`@@ -83,7 +83,7 @@ public function testIsFreshSameConstructorArgs()`
`83`	`83`	`);`
`84`	`84`
`85`	`85`	`// test with a stale file but the resource will not be changed`
`86`		`- $this->assertTrue($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');`
	`86`	`+ $this->assertFalse($oldResource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the constructor arguments have changed');`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public function testNotFreshIfClassNotFound()`
`@@ -94,7 +94,7 @@ public function testNotFreshIfClassNotFound()`
`94`	`94`	`array()`
`95`	`95`	`);`
`96`	`96`
`97`		`- $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the class no longer exists');`
	`97`	`+ $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() the resource object false if the class no longer exists');`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`protected function tearDown()`