Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Asset] Add support for preloading with links and HTTP/2 push #21478

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

Closed
wants to merge 16 commits into from
Closed

[Asset] Add support for preloading with links and HTTP/2 push #21478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
64bd530
[Asset] Add suport for preloading with links and HTTP/2 push
dunglas Jan 31, 2017
f920ca4
Add tests and nopush support
dunglas Jan 31, 2017
1de19cc
CS
dunglas Jan 31, 2017
c5ca4bc
Fix tests
dunglas Jan 31, 2017
639d7d1
Preload is now a standalone Twig function
dunglas Feb 1, 2017
9c11a0f
Make the preload manager independant of HTTP Foundation
dunglas Feb 1, 2017
d39b4f1
Fix CS
dunglas Feb 1, 2017
581c700
Fix listener
dunglas Feb 1, 2017
693107c
Fix @stof's comments
dunglas Feb 1, 2017
2d8d750
Fix CS
dunglas Feb 1, 2017
0b7fe14
Don't replace existing link
dunglas Feb 3, 2017
dffb7b6
Fix tests
dunglas Feb 3, 2017
18412e5
Some more fixes
dunglas Feb 4, 2017
78d7b6a
Remove HttpKernel from suggest
dunglas Feb 7, 2017
05134b6
Remove unseless null
dunglas Feb 7, 2017
a7f77b4
Update skip message
dunglas Feb 7, 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
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@dunglas
dunglas committed Feb 7, 2017
commit c5ca4bc73729e03f5394b240e95c4005a7df21b0
13 changes: 11 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Bundle\FullStack;
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
use Symfony\Component\Asset\EventListener\PreloadListener;
use Symfony\Component\Cache\Adapter\ApcuAdapter;
use Symfony\Component\Cache\Adapter\ChainAdapter;
use Symfony\Component\Cache\Adapter\DoctrineAdapter;
Expand Down Expand Up @@ -363,8 +364,6 @@ public function testAssets()

$package = $container->getDefinition((string) $packages['bar_version_strategy']);
$this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));

$this->assertTrue($container->hasDefinition('asset.preload_listener'));
}

public function testAssetsDefaultVersionStrategyAsService()
Expand All @@ -377,6 +376,16 @@ public function testAssetsDefaultVersionStrategyAsService()
$this->assertEquals('assets.custom_version_strategy', (string) $defaultPackage->getArgument(1));
}

public function testAssetHasPreloadListener()
{
if (!class_exists(PreloadListener::class)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

composer ensures that this is always existing

Copy link
Member Author

@dunglas dunglas Feb 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not if a version for symfony/asset lesser than 3.3 has been installed, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it cannot, due to the require-dev constraint

$this->markTestSkipped('Requires asset 3.3 or superior.');
}

$container = $this->createContainerFromFile('assets');
$this->assertTrue($container->hasDefinition('asset.preload_listener'));
}

public function testTranslator()
{
$container = $this->createContainerFromFile('full');
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Asset/Tests/EventListener/PreloadListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function testOnKernelResponse()
$listener = new PreloadListener($manager);
$response = new Response();

$event = $this->createMock(FilterResponseEvent::class);
$event = $this->getMockBuilder(FilterResponseEvent::class)->disableOriginalConstructor()->getMock();
$event->method('getResponse')->willReturn($response);

$listener->onKernelResponse($event);
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Asset/Tests/PackageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testGetVersion()

public function testGetAndPreloadUrl()
{
$preloadManager = $this->createMock(PreloadManagerInterface::class);
$preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();
$preloadManager
->expects($this->exactly(2))
->method('addResource')
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Asset/Tests/PackagesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function testGetUrl()

public function testGetAndPreloadUrl()
{
$preloadManager = $this->createMock(PreloadManagerInterface::class);
$preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();
$preloadManager
->expects($this->exactly(2))
->method('addResource')
Expand Down Expand Up @@ -100,7 +100,7 @@ public function testUndefinedPackage()
*/
public function testDoesNotSupportPreloading()
{
$packages = new Packages($this->createMock(PackageInterface::class));
$packages = new Packages($this->getMockBuilder(PackageInterface::class)->getMock());
$packages->getAndPreloadUrl('/foo');
}
}