Skip to content

Commit c8cf68e

Browse files
hlecorchehlecorche
committed
Add Symfony 4.2 support
1 parent 58a160c commit c8cf68e

6 files changed

Lines changed: 42 additions & 44 deletions

File tree

‎DependencyInjection/Configuration.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\Config\Definition\ConfigurationInterface;
1616

1717
/**
18-
* This is the class that validates and merges configuration from your app/config files
18+
* This is the class that validates and merges configuration from your config files
1919
*
2020
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
2121
*/
@@ -41,7 +41,7 @@ public function getConfigTreeBuilder()
4141
->end()
4242
->end()
4343
->booleanNode('use_bootstrap')->defaultValue(true)->end()
44-
->scalarNode('overlay_service')->defaultValue('ecommit_javascript.overlay.jquery_popup_overlay')->end()
44+
->scalarNode('overlay_service')->defaultValue('Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay')->end()
4545
->end()
4646
;
4747

‎Helper/JqueryHelper.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,7 @@ public function jQueryFormToRemote($form, $options = array(), $htmlOptions = arr
262262
$options['form'] = true;
263263
$htmlOptions['onsubmit'] = $this->jQueryRemoteFunction($form->vars['action'], $options) . '; return false;';
264264

265-
//Après suppression du BC (ci-dessous), la méthode devra être uniquement ce cas
266-
try {
267-
$runtime = $this->templating->getRuntime('Symfony\Component\Form\FormRenderer');
268-
} catch (\Twig_Error_Runtime $e) {
269-
if ('Unable to load the "Symfony\Component\Form\FormRenderer" runtime.' === $e->getMessage()) { //Symfony < 3.4
270-
$runtime = $this->templating->getRuntime('Symfony\Bridge\Twig\Form\TwigRenderer');
271-
}
272-
}
265+
$runtime = $this->templating->getRuntime('Symfony\Component\Form\FormRenderer');
273266

274267
return $runtime->renderBlock($form, 'form_start', ['attr' => $htmlOptions]);
275268
}

‎Resources/config/services.xml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,30 @@
22
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
33

44
<services>
5-
<service id="ecommit_javascript.helper.jquery_helper" class="Ecommit\JavascriptBundle\Helper\JqueryHelper">
6-
<argument type="service" id="ecommit_util.helper" />
7-
<argument type="service" id="twig"/>
5+
<service id="Ecommit\JavascriptBundle\Helper\JqueryHelper" class="Ecommit\JavascriptBundle\Helper\JqueryHelper" public="true">
6+
<argument type="service" id="Ecommit\UtilBundle\Helper\UtilHelper" />
7+
<argument type="service" id="Twig\Environment"/>
88
</service>
9+
<service id="ecommit_javascript.helper.jquery_helper" alias="Ecommit\JavascriptBundle\Helper\JqueryHelper" public="true" />
910

10-
<service id="ecommit_javascript.twig.jquery_extension" class="Ecommit\JavascriptBundle\Twig\JqueryExtension">
11-
<argument type="service" id="ecommit_javascript.helper.jquery_helper" />
11+
<service id="Ecommit\JavascriptBundle\Twig\JqueryExtension" class="Ecommit\JavascriptBundle\Twig\JqueryExtension">
12+
<argument type="service" id="Ecommit\JavascriptBundle\Helper\JqueryHelper" />
1213
<tag name="twig.extension" />
1314
</service>
1415

15-
<service id="ecommit_javascript.form.type.jqueryautocompleteentityajax" class="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType">
16-
<argument type="service" id="doctrine" on-invalid="null" />
17-
<argument type="service" id="router" />
16+
<service id="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType" class="Ecommit\JavascriptBundle\Form\Type\JqueryAutocompleteEntityAjaxType">
17+
<argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
18+
<argument type="service" id="Symfony\Component\Routing\RouterInterface" />
1819
<tag name="form.type" />
1920
</service>
2021

21-
<service id="ecommit_javascript.form.type.tokeninputentitiesajax" class="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType">
22-
<argument type="service" id="doctrine" on-invalid="null" />
23-
<argument type="service" id="router" />
22+
<service id="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType" class="Ecommit\JavascriptBundle\Form\Type\TokenInputEntitiesAjaxType">
23+
<argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
24+
<argument type="service" id="Symfony\Component\Routing\RouterInterface" />
2425
<tag name="form.type" />
2526
</service>
2627

27-
<service id="ecommit_javascript.form.type.recaptcha" class="Ecommit\JavascriptBundle\Form\Type\RecaptchaType">
28+
<service id="Ecommit\JavascriptBundle\Form\Type\RecaptchaType" class="Ecommit\JavascriptBundle\Form\Type\RecaptchaType">
2829
<argument>%ecommit_javascript.recaptcha.public_key%</argument>
2930
<argument>%ecommit_javascript.recaptcha.secure%</argument>
3031
<argument>%ecommit_javascript.recaptcha.enable%</argument>
@@ -33,26 +34,28 @@
3334
<deprecated>The "%service_id%" service is deprecated since version 2.2.</deprecated>
3435
</service>
3536

36-
<service id="ecommit_javascript.validator.constraints.recaptcha" class="Ecommit\JavascriptBundle\Validator\Constraints\RecaptchaValidator">
37-
<argument type="service" id="request_stack" />
37+
<service id="Ecommit\JavascriptBundle\Validator\Constraints\RecaptchaValidator" class="Ecommit\JavascriptBundle\Validator\Constraints\RecaptchaValidator">
38+
<argument type="service" id="Symfony\Component\HttpFoundation\RequestStack" />
3839
<argument>%ecommit_javascript.recaptcha.private_key%</argument>
3940
<argument>%ecommit_javascript.recaptcha.enable%</argument>
40-
<tag name="validator.constraint_validator" alias="ecommit_javascript.validator.constraints.recaptcha" />
41+
<tag name="validator.constraint_validator" />
4142
<deprecated>The "%service_id%" service is deprecated since version 2.2.</deprecated>
4243
</service>
4344

44-
<service id="ecommit_javascript.form.type.select2entityajax" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType">
45-
<argument type="service" id="doctrine" on-invalid="null" />
46-
<argument type="service" id="router" />
45+
<service id="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType" class="Ecommit\JavascriptBundle\Form\Type\Select2\Select2EntityAjaxType">
46+
<argument type="service" id="Symfony\Bridge\Doctrine\RegistryInterface" />
47+
<argument type="service" id="Symfony\Component\Routing\RouterInterface" />
4748
<tag name="form.type" />
4849
</service>
4950

50-
<service id="ecommit_javascript.overlay.jquery_tools_overlay" class="Ecommit\JavascriptBundle\Overlay\JQueryToolsOverlay">
51+
<service id="Ecommit\JavascriptBundle\Overlay\JQueryToolsOverlay" class="Ecommit\JavascriptBundle\Overlay\JQueryToolsOverlay" public="true">
5152
<argument>%ecommit_javascript.use_bootstrap%</argument>
5253
</service>
54+
<service id="ecommit_javascript.overlay.jquery_tools_overlay" alias="Ecommit\JavascriptBundle\Overlay\JQueryToolsOverlay" public="true" />
5355

54-
<service id="ecommit_javascript.overlay.jquery_popup_overlay" class="Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay">
56+
<service id="Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay" class="Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay" public="true">
5557
<argument>%ecommit_javascript.use_bootstrap%</argument>
5658
</service>
59+
<service id="ecommit_javascript.overlay.jquery_popup_overlay" alias="Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay" public="true" />
5760
</services>
5861
</container>

‎Resources/doc/config.sample.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ ecommit_javascript:
1111
#Utilise ou non bootstrap pour l'application (pour la creation des boutons)
1212
use_bootstrap: true
1313
#Service utilisé pour Overlay
14-
overlay_service: ecommit_javascript.overlay.jquery_popup_overlay
14+
overlay_service: Ecommit\JavascriptBundle\Overlay\JQueryPopupOverlay

‎Validator/Constraints/Recaptcha.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,5 @@ public function getTargets()
2929
{
3030
return Constraint::PROPERTY_CONSTRAINT;
3131
}
32-
33-
/**
34-
* {@inheritdoc}
35-
*/
36-
public function validatedBy()
37-
{
38-
return 'ecommit_javascript.validator.constraints.recaptcha';
39-
}
4032
}
4133

‎composer.json‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,22 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.5.9",
14-
"symfony/framework-bundle": "~3.0",
15-
"symfony/twig-bundle": "~3.0",
16-
"doctrine/orm": "~2.3",
13+
"doctrine/common": "*",
1714
"doctrine/doctrine-bundle": "^1.6",
18-
"ecommit/util-bundle": "2.4.*@dev"
15+
"doctrine/orm": "~2.3",
16+
"ecommit/util-bundle": "2.5.*@dev",
17+
"symfony/config": "^4.2",
18+
"symfony/dependency-injection": "^4.2",
19+
"symfony/doctrine-bridge": "^4.2",
20+
"symfony/event-dispatcher": "^4.2",
21+
"symfony/form": "^4.2",
22+
"symfony/framework-bundle": "^4.2",
23+
"symfony/http-kernel": "^4.2",
24+
"symfony/options-resolver": "^4.2",
25+
"symfony/property-access": "^4.2",
26+
"symfony/translation": "^4.2",
27+
"symfony/twig-bundle": "^4.2",
28+
"twig/extensions": "^1.0"
1929
},
2030
"autoload": {
2131
"psr-4": { "Ecommit\\JavascriptBundle\\": "" }

0 commit comments

Comments
 (0)