Skip to content

Commit 14cb428

Browse files
Denis Brumannfbourigault
Denis Brumann
authored and
fbourigault
committed
Update composer.json for Symfony 4.
1 parent d12c15d commit 14cb428

File tree

4 files changed

+27
-22
lines changed

4 files changed

+27
-22
lines changed

‎DependencyInjection/HttplugExtension.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Http\Message\Authentication\Wsse;
1515
use Psr\Http\Message\UriInterface;
1616
use Symfony\Component\Config\FileLocator;
17+
use Symfony\Component\DependencyInjection\Alias;
1718
use Symfony\Component\DependencyInjection\ChildDefinition;
1819
use Symfony\Component\DependencyInjection\ContainerBuilder;
1920
use Symfony\Component\DependencyInjection\Definition;
@@ -50,7 +51,7 @@ public function load(array $configs, ContainerBuilder $container)
5051

5152
// Set main aliases
5253
foreach ($config['main_alias'] as $type => $id) {
53-
$container->setAlias(sprintf('httplug.%s', $type), $id);
54+
$container->setAlias(sprintf('httplug.%s', $type), new Alias($id, true));
5455
}
5556

5657
// Configure toolbar
@@ -103,7 +104,7 @@ private function configureClients(ContainerBuilder $container, array $config)
103104
// If we do not have a client named 'default'
104105
if (!isset($config['clients']['default'])) {
105106
// Alias the first client to httplug.client.default
106-
$container->setAlias('httplug.client.default', 'httplug.client.'.$first);
107+
$container->setAlias('httplug.client.default', new Alias('httplug.client.'.$first, true));
107108
}
108109
}
109110
}
@@ -297,6 +298,7 @@ private function configureClient(ContainerBuilder $container, $clientName, array
297298

298299
$container
299300
->register($serviceId, PluginClient::class)
301+
->setPublic(true)
300302
->setFactory([new Reference(PluginClientFactory::class), 'createClient'])
301303
->addArgument(new Reference($serviceId.'.client'))
302304
->addArgument(

‎Resources/config/services.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<services>
7-
<service id="httplug.strategy" class="Http\HttplugBundle\Discovery\ConfiguredClientsStrategy">
7+
<service id="httplug.strategy" class="Http\HttplugBundle\Discovery\ConfiguredClientsStrategy" public="true">
88
<argument type="service" id="httplug.auto_discovery.auto_discovered_client" on-invalid="null"/>
99
<argument type="service" id="httplug.auto_discovery.auto_discovered_async" on-invalid="null"/>
1010
<tag name="kernel.event_subscriber"/>
1111
</service>
1212

13-
<service id="httplug.auto_discovery.auto_discovered_client" class="Http\Client\HttpClient">
13+
<service id="httplug.auto_discovery.auto_discovered_client" class="Http\Client\HttpClient" public="true">
1414
<factory class="Http\Discovery\HttpClientDiscovery" method="find" />
1515
</service>
1616

17-
<service id="httplug.auto_discovery.auto_discovered_async" class="Http\Client\HttpAsyncClient">
17+
<service id="httplug.auto_discovery.auto_discovered_async" class="Http\Client\HttpAsyncClient" public="true">
1818
<factory class="Http\Discovery\HttpAsyncClientDiscovery" method="find" />
1919
</service>
2020

2121
<!-- Discovery with autowiring support for Symfony 3.3+ -->
22-
<service id="httplug.message_factory.default" class="Http\Message\MessageFactory">
22+
<service id="httplug.message_factory.default" class="Http\Message\MessageFactory" public="true">
2323
<factory class="Http\Discovery\MessageFactoryDiscovery" method="find" />
2424
</service>
2525
<service id="Http\Message\MessageFactory" alias="httplug.message_factory" public="false" />
2626
<service id="Http\Message\RequestFactory" alias="httplug.message_factory" public="false" />
2727
<service id="Http\Message\ResponseFactory" alias="httplug.message_factory" public="false" />
2828

29-
<service id="httplug.stream_factory.default" class="Http\Message\StreamFactory">
29+
<service id="httplug.stream_factory.default" class="Http\Message\StreamFactory" public="true">
3030
<factory class="Http\Discovery\StreamFactoryDiscovery" method="find" />
3131
</service>
3232
<service id="Http\Message\StreamFactory" alias="httplug.stream_factory" public="false" />
3333

34-
<service id="httplug.uri_factory.default" class="Http\Message\UriFactory">
34+
<service id="httplug.uri_factory.default" class="Http\Message\UriFactory" public="true">
3535
<factory class="Http\Discovery\UriFactoryDiscovery" method="find" />
3636
</service>
3737
<service id="Http\Message\UriFactory" alias="httplug.uri_factory" public="false" />
3838

39-
<service id="httplug.async_client.default" class="Http\Client\HttpAsyncClient">
39+
<service id="httplug.async_client.default" class="Http\Client\HttpAsyncClient" public="true">
4040
<factory class="Http\Discovery\HttpAsyncClientDiscovery" method="find" />
4141
</service>
4242
<service id="Http\Client\HttpAsyncClient" alias="httplug.async_client.default" public="false" />
4343

44-
<service id="httplug.client.default" class="Http\Client\HttpClient">
44+
<service id="httplug.client.default" class="Http\Client\HttpClient" public="true">
4545
<factory class="Http\Discovery\HttpClientDiscovery" method="find" />
4646
</service>
4747
<service id="Http\Client\HttpClient" alias="httplug.client" public="false" />

‎Tests/Resources/app/config/config_test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ httplug:
2626
services:
2727
app.http.plugin.custom:
2828
class: Http\Client\Common\Plugin\RedirectPlugin
29+
public: true
30+
# plugin services usually do not need to be public.
31+
# this one is made public so that we can do functional tests on the service

‎composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
"php-http/cache-plugin": "^1.4",
2424
"php-http/logger-plugin": "^1.0",
2525
"php-http/stopwatch-plugin": "^1.0",
26-
"symfony/options-resolver": "^2.8 || ^3.0",
27-
"symfony/event-dispatcher": "^2.8 || ^3.0",
28-
"symfony/framework-bundle": "^2.8 || ^3.0",
26+
"symfony/options-resolver": "^2.8 || ^3.0 || ^4.0",
27+
"symfony/event-dispatcher": "^2.8 || ^3.0 || ^4.0",
28+
"symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0",
2929
"php-http/message": "^1.4",
3030
"php-http/discovery": "^1.0",
3131
"twig/twig": "^1.18 || ^2.0",
32-
"symfony/asset": "^2.8 || ^3.0",
33-
"symfony/dependency-injection": "^2.8.3 || ^3.0.3"
32+
"symfony/asset": "^2.8 || ^3.0 || ^4.0",
33+
"symfony/dependency-injection": "^2.8.3 || ^3.0.3 || ^4.0"
3434
},
3535
"require-dev": {
3636
"phpunit/php-token-stream": "^1.1.8",
@@ -41,13 +41,13 @@
4141
"php-http/buzz-adapter": "^0.3",
4242
"php-http/mock-client": "^1.0",
4343
"symfony/phpunit-bridge": "^3.3 || ^4.0",
44-
"symfony/twig-bundle": "^2.8 || ^3.0",
45-
"symfony/twig-bridge": "^2.8 || ^3.0",
46-
"symfony/web-profiler-bundle": "^2.8 || ^3.0",
47-
"symfony/finder": "^2.7 || ^3.0",
48-
"symfony/cache": "^3.1",
49-
"symfony/browser-kit": "^2.8 || ^3.0",
50-
"symfony/dom-crawler": "^2.8 || ^3.0",
44+
"symfony/twig-bundle": "^2.8 || ^3.0 || ^4.0",
45+
"symfony/twig-bridge": "^2.8 || ^3.0 || ^4.0",
46+
"symfony/web-profiler-bundle": "^2.8 || ^3.0 || ^4.0",
47+
"symfony/finder": "^2.7 || ^3.0 || ^4.0",
48+
"symfony/cache": "^3.1 || ^4.0",
49+
"symfony/browser-kit": "^2.8 || ^3.0 || ^4.0",
50+
"symfony/dom-crawler": "^2.8 || ^3.0 || ^4.0",
5151
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
5252
"matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0",
5353
"nyholm/nsa": "^1.1"

0 commit comments

Comments
 (0)