Skip to content

Commit 236082c

Browse files
wtfzdotnetwtfzdotnet
authored
Merge pull request #25 from z38/symfony4
Implement support for Symfony 4
2 parents 901df0a + 275cbc2 commit 236082c

File tree

5 files changed

+30
-33
lines changed

5 files changed

+30
-33
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ matrix:
5858
env: [SYMFONY_VERSION="3.2.*", SYMFONY_EVENT_DISPATCHER_VERSION="3.2.*"]
5959
- php: 7.1
6060
env: [SYMFONY_VERSION="^3.3", SYMFONY_EVENT_DISPATCHER_VERSION="^3.3"]
61+
- php: 7.1
62+
env: [SYMFONY_VERSION="^4.0", SYMFONY_EVENT_DISPATCHER_VERSION="^4.0"]
6163

6264
allow_failures:
6365
- php: nightly

‎Resources/config/repositories.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,83 +30,83 @@
3030
</parameters>
3131

3232
<services>
33-
<service id="tmdb.certification_repository" class="%tmdb.certification_repository.class%">
33+
<service id="tmdb.certification_repository" class="%tmdb.certification_repository.class%" public="true">
3434
<argument type="service" id="tmdb.client" />
3535
</service>
3636

37-
<service id="tmdb.changes_repository" class="%tmdb.changes_repository.class%">
37+
<service id="tmdb.changes_repository" class="%tmdb.changes_repository.class%" public="true">
3838
<argument type="service" id="tmdb.client" />
3939
</service>
4040

41-
<service id="tmdb.collection_repository" class="%tmdb.collection_repository.class%">
41+
<service id="tmdb.collection_repository" class="%tmdb.collection_repository.class%" public="true">
4242
<argument type="service" id="tmdb.client" />
4343
</service>
4444

45-
<service id="tmdb.company_repository" class="%tmdb.company_repository.class%">
45+
<service id="tmdb.company_repository" class="%tmdb.company_repository.class%" public="true">
4646
<argument type="service" id="tmdb.client" />
4747
</service>
4848

49-
<service id="tmdb.configuration_repository" class="%tmdb.configuration_repository.class%">
49+
<service id="tmdb.configuration_repository" class="%tmdb.configuration_repository.class%" public="true">
5050
<argument type="service" id="tmdb.client" />
5151
</service>
5252

53-
<service id="tmdb.credits_repository" class="%tmdb.credits_repository.class%">
53+
<service id="tmdb.credits_repository" class="%tmdb.credits_repository.class%" public="true">
5454
<argument type="service" id="tmdb.client" />
5555
</service>
5656

57-
<service id="tmdb.discover_repository" class="%tmdb.discover_repository.class%">
57+
<service id="tmdb.discover_repository" class="%tmdb.discover_repository.class%" public="true">
5858
<argument type="service" id="tmdb.client" />
5959
</service>
6060

61-
<service id="tmdb.find_repository" class="%tmdb.find_repository.class%">
61+
<service id="tmdb.find_repository" class="%tmdb.find_repository.class%" public="true">
6262
<argument type="service" id="tmdb.client" />
6363
</service>
6464

65-
<service id="tmdb.genre_repository" class="%tmdb.genre_repository.class%">
65+
<service id="tmdb.genre_repository" class="%tmdb.genre_repository.class%" public="true">
6666
<argument type="service" id="tmdb.client" />
6767
</service>
6868

69-
<service id="tmdb.jobs_repository" class="%tmdb.jobs_repository.class%">
69+
<service id="tmdb.jobs_repository" class="%tmdb.jobs_repository.class%" public="true">
7070
<argument type="service" id="tmdb.client" />
7171
</service>
7272

73-
<service id="tmdb.keyword_repository" class="%tmdb.keyword_repository.class%">
73+
<service id="tmdb.keyword_repository" class="%tmdb.keyword_repository.class%" public="true">
7474
<argument type="service" id="tmdb.client" />
7575
</service>
7676

77-
<service id="tmdb.list_repository" class="%tmdb.list_repository.class%">
77+
<service id="tmdb.list_repository" class="%tmdb.list_repository.class%" public="true">
7878
<argument type="service" id="tmdb.client" />
7979
</service>
8080

81-
<service id="tmdb.movie_repository" class="%tmdb.movie_repository.class%">
81+
<service id="tmdb.movie_repository" class="%tmdb.movie_repository.class%" public="true">
8282
<argument type="service" id="tmdb.client" />
8383
</service>
8484

85-
<service id="tmdb.network_repository" class="%tmdb.network_repository.class%">
85+
<service id="tmdb.network_repository" class="%tmdb.network_repository.class%" public="true">
8686
<argument type="service" id="tmdb.client" />
8787
</service>
8888

89-
<service id="tmdb.people_repository" class="%tmdb.people_repository.class%">
89+
<service id="tmdb.people_repository" class="%tmdb.people_repository.class%" public="true">
9090
<argument type="service" id="tmdb.client" />
9191
</service>
9292

93-
<service id="tmdb.review_repository" class="%tmdb.review_repository.class%">
93+
<service id="tmdb.review_repository" class="%tmdb.review_repository.class%" public="true">
9494
<argument type="service" id="tmdb.client" />
9595
</service>
9696

97-
<service id="tmdb.search_repository" class="%tmdb.search_repository.class%">
97+
<service id="tmdb.search_repository" class="%tmdb.search_repository.class%" public="true">
9898
<argument type="service" id="tmdb.client" />
9999
</service>
100100

101-
<service id="tmdb.tv_repository" class="%tmdb.tv_repository.class%">
101+
<service id="tmdb.tv_repository" class="%tmdb.tv_repository.class%" public="true">
102102
<argument type="service" id="tmdb.client" />
103103
</service>
104104

105-
<service id="tmdb.tv_season_repository" class="%tmdb.tv_season_repository.class%">
105+
<service id="tmdb.tv_season_repository" class="%tmdb.tv_season_repository.class%" public="true">
106106
<argument type="service" id="tmdb.client" />
107107
</service>
108108

109-
<service id="tmdb.tv_episode_repository" class="%tmdb.tv_episode_repository.class%">
109+
<service id="tmdb.tv_episode_repository" class="%tmdb.tv_episode_repository.class%" public="true">
110110
<argument type="service" id="tmdb.client" />
111111
</service>
112112
</services>

‎Resources/config/services.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</parameters>
1717

1818
<services>
19-
<service id="tmdb.client" class="%tmdb.client.class%">
19+
<service id="tmdb.client" class="%tmdb.client.class%" public="true">
2020
<argument type="service" id="tmdb.api_token" />
2121
<argument type="service" id="tmdb.configuration" />
2222
</service>

‎Tests/DependencyInjection/TmdbSymfonyExtensionTest.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ public function all_tmdb_services_can_be_loaded()
1919

2020
/** @var Container $container */
2121
$container = $kernel->getContainer();
22-
$tmdbServiceIds = array_filter($container->getServiceIds(), function ($id) {
23-
return strpos($id, 'tmdb') === 0;
24-
});
25-
26-
foreach ($tmdbServiceIds as $serviceId) {
27-
$container->get($serviceId);
28-
}
22+
$this->assertInstanceOf('Tmdb\Client', $container->get('tmdb.client'));
23+
$this->assertInstanceOf('Tmdb\Repository\MovieRepository', $container->get('tmdb.movie_repository'));
2924
}
3025
}

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
],
1515
"require": {
1616
"php": ">=5.5.0",
17-
"symfony/config": ">=2.7,<4",
18-
"symfony/dependency-injection": ">=2.7,<4",
19-
"symfony/event-dispatcher": ">=2.7,<4",
20-
"symfony/http-kernel": ">=2.7,<4",
17+
"symfony/config": ">=2.7,<5",
18+
"symfony/dependency-injection": ">=2.7,<5",
19+
"symfony/event-dispatcher": ">=2.7,<5",
20+
"symfony/http-kernel": ">=2.7,<5",
2121
"doctrine/doctrine-cache-bundle": "^1.0",
2222
"php-tmdb/api": "^2.1",
2323
"twig/twig": "^1.11|^2.0"
2424
},
2525
"require-dev": {
2626
"phpunit/phpunit": "^4.8||^5.0,<5.4",
27-
"symfony/framework-bundle": ">=2.7,<4"
27+
"symfony/framework-bundle": ">=2.7,<5"
2828
},
2929
"autoload": {
3030
"psr-4": { "Tmdb\\SymfonyBundle\\": "" }

0 commit comments

Comments
 (0)