Skip to content

Commit

Permalink
Merge pull request #15 from tobias-93/symfony3.0-compat
Browse files Browse the repository at this point in the history
Add symfony3 compatibility
  • Loading branch information
Nyholm committed Feb 11, 2016
2 parents da42603 + edc1c6c commit 246d781
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ matrix:
env: SYMFONY_VERSION=2.5.*
- php: 5.5
env: SYMFONY_VERSION=dev-master
- php: 5.5
env: SYMFONY_VERSION=2.8.*
- php: 5.5
env: SYMFONY_VERSION=3.0.*
- php: 7.0
env: SYMFONY_VERSION=3.0.*



Expand Down
8 changes: 4 additions & 4 deletions Resources/config/services.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
services:
happyr.google.api.client:
class: HappyR\Google\ApiBundle\Services\GoogleClient
arguments: [%happy_r_google_api%, @?logger]
arguments: ["%happy_r_google_api%", "@?logger"]
tags:
- { name: monolog.logger, channel: google_client }

happyr.google.api.analytics:
class: HappyR\Google\ApiBundle\Services\AnalyticsService
arguments: [@happyr.google.api.client]
arguments: ["@happyr.google.api.client"]

happyr.google.api.youtube:
class: HappyR\Google\ApiBundle\Services\YoutubeService
arguments: [@happyr.google.api.client]
arguments: ["@happyr.google.api.client"]

happyr.google.api.groups_migration:
class: HappyR\Google\ApiBundle\Services\GroupsMigrationService
arguments: [@happyr.google.api.client]
arguments: ["@happyr.google.api.client"]
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
],
"require": {
"php": ">=5.3.2",
"symfony/framework-bundle": "2.*",
"symfony/yaml": "2.*",
"symfony/framework-bundle": "2.*|~3.0",
"symfony/yaml": "2.*|~3.0",
"google/apiclient": "1.*"
},
"require-dev": {
"mockery/mockery": "*"
},
"autoload": {
"psr-0": { "HappyR\\Google\\ApiBundle": "" }
"psr-4": { "HappyR\\Google\\ApiBundle\\": "" }
},
"target-dir": "HappyR/Google/ApiBundle",
"extra": {
"branch-alias": {
"dev-master": "2.2.x-dev"
Expand Down

0 comments on commit 246d781

Please sign in to comment.