Skip to content

Commit 22f7e85

Browse files
authored
Merge pull request #7 from StoreFactory/feature/deprecations-removal
Support Symfony4 (and drop Symfony <3.3 support)
2 parents 9617f91 + 200a825 commit 22f7e85

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

CompilerPass/DynamicServiceCacheCompilerPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function process(ContainerBuilder $container)
2121
{
2222
if ($container->getParameter('zoho_subscription.cache.service') !== null) {
2323
$container
24-
->getDefinition('zoho.api.manager')
24+
->getDefinition('Zoho\Subscription\Client\Client')
2525
->replaceArgument(2, new Reference($container->getParameter('zoho_subscription.cache.service')))
2626
;
2727
}

Resources/config/services.xml

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

7-
<service id="zoho.api.manager" class="Zoho\Subscription\Client\Client" abstract="true">
7+
<service id="Zoho\Subscription\Client\Client" abstract="true">
88
<argument>%zoho_subscription.api_key%</argument>
99
<argument>%zoho_subscription.org_id%</argument>
1010
<argument>null</argument>
1111
<argument>%zoho_subscription.cache.ttl%</argument>
1212
</service>
1313

14-
<service id="zoho.api.addon" class="Zoho\Subscription\Api\Addon" parent="zoho.api.manager"></service>
15-
<service id="zoho.api.plan" class="Zoho\Subscription\Api\Plan" parent="zoho.api.manager"></service>
16-
<service id="zoho.api.invoice" class="Zoho\Subscription\Api\Invoice" parent="zoho.api.manager"></service>
17-
<service id="zoho.api.customer" class="Zoho\Subscription\Api\Customer" parent="zoho.api.manager"></service>
18-
<service id="zoho.api.subscription" class="Zoho\Subscription\Api\Subscription" parent="zoho.api.manager"></service>
19-
<service id="zoho.api.hosted_page" class="Zoho\Subscription\Api\HostedPage" parent="zoho.api.manager"></service>
14+
<service id="Zoho\Subscription\Api\Addon" parent="Zoho\Subscription\Client\Client"></service>
15+
<service id="Zoho\Subscription\Api\Plan" parent="Zoho\Subscription\Client\Client"></service>
16+
<service id="Zoho\Subscription\Api\Invoice" parent="Zoho\Subscription\Client\Client"></service>
17+
<service id="Zoho\Subscription\Api\Customer" parent="Zoho\Subscription\Client\Client"></service>
18+
<service id="Zoho\Subscription\Api\Subscription" parent="Zoho\Subscription\Client\Client"></service>
19+
<service id="Zoho\Subscription\Api\HostedPage" parent="Zoho\Subscription\Client\Client"></service>
2020

2121
<service id="zoho.array.cache" class="Doctrine\Common\Cache\ArrayCache"></service>
2222

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "storefactory/zoho-subscription-bundle",
3+
"keywords": ["zoho", "subscription", "bundle"],
34
"type": "symfony-bundle",
45
"license": "MIT",
56
"autoload": {
@@ -16,7 +17,7 @@
1617
"description": "Zoho Subscription Bundle uses the zoho-subscription-api PHP client library",
1718
"require": {
1819
"php": "^7.0",
19-
"symfony/framework-bundle": "^2.8 | ^3.0",
20+
"symfony/framework-bundle": "^3.3 | ^4.0",
2021
"storefactory/zoho-subscription-api": "^2.0"
2122
},
2223
"minimum-stability": "stable"

0 commit comments

Comments
 (0)