minor #33336 [HttpKernel] do not mock removed getPublicDir() method (xabbuh)
This PR was merged into the 4.4 branch.
Discussion
----------
[HttpKernel] do not mock removed getPublicDir() method
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Commits
-------
54cb471
do not mock removed getPublicDir() method
This commit is contained in:
commit
db9549d775
@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
|
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
|
||||||
use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
|
use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
|
||||||
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
|
use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
|
||||||
use Symfony\Component\HttpKernel\HttpKernel;
|
|
||||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||||
use Symfony\Component\HttpKernel\Kernel;
|
use Symfony\Component\HttpKernel\Kernel;
|
||||||
use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForOverrideName;
|
use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForOverrideName;
|
||||||
@ -626,7 +625,7 @@ EOF;
|
|||||||
{
|
{
|
||||||
$bundle = $this
|
$bundle = $this
|
||||||
->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')
|
->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')
|
||||||
->setMethods(['getPath', 'getPublicDir', 'getParent', 'getName'])
|
->setMethods(['getPath', 'getName'])
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -648,18 +647,6 @@ EOF;
|
|||||||
->willReturn($dir)
|
->willReturn($dir)
|
||||||
;
|
;
|
||||||
|
|
||||||
$bundle
|
|
||||||
->expects($this->any())
|
|
||||||
->method('getPublicDir')
|
|
||||||
->willReturn('Resources/public')
|
|
||||||
;
|
|
||||||
|
|
||||||
$bundle
|
|
||||||
->expects($this->any())
|
|
||||||
->method('getParent')
|
|
||||||
->willReturn($parent)
|
|
||||||
;
|
|
||||||
|
|
||||||
return $bundle;
|
return $bundle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user