-
Notifications
You must be signed in to change notification settings - Fork 11
chore(config): migrate DI configuration from XML to PHP (services.php) [Fixes #66] #67
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
AAYUSH-SPIDEY-SHARMA
wants to merge
1
commit into
Bee-Lab:master
from
AAYUSH-SPIDEY-SHARMA:chore/migrate-xml-to-php-config-66
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?php | ||
| // config/services.php | ||
|
|
||
| use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; | ||
| use function Symfony\Component\DependencyInjection\Loader\Configurator\service; | ||
|
|
||
| return static function (ContainerConfigurator $configurator): void { | ||
| $services = $configurator->services(); | ||
|
|
||
| // sensible defaults | ||
| $services->defaults() | ||
| ->autowire() | ||
| ->autoconfigure() | ||
| ->private(); | ||
|
|
||
| // The service that the compiler pass will inspect and modify. | ||
| // RequestMethodPass expects this service id and will replace argument index 1. | ||
| $services->set('beelab_recaptcha2.google_recaptcha', \Beelab\Recaptcha2Bundle\Recaptcha\RecaptchaVerifier::class) | ||
| ->args([ | ||
| '%beelab_recaptcha2.secret%', // constructor arg 0 (the secret) | ||
| null, // constructor arg 1 (placeholder: replaced by RequestMethodPass) | ||
| ]); | ||
|
|
||
| // Validator service must match the string returned by Recaptcha2::validatedBy() | ||
| // Recaptcha2::validatedBy() returns 'recaptcha2' so we register the service id 'recaptcha2'. | ||
| $services->set('recaptcha2', \Beelab\Recaptcha2Bundle\Validator\Constraints\Recaptcha2Validator::class) | ||
| ->args([service('beelab_recaptcha2.google_recaptcha')]) | ||
| ->tag('validator.constraint_validator'); | ||
|
|
||
| // Form type | ||
| $services->set(\Beelab\Recaptcha2Bundle\Form\Type\RecaptchaType::class) | ||
| ->tag('form.type'); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| use Symfony\Component\Config\FileLocator; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Extension\Extension; | ||
| use Symfony\Component\DependencyInjection\Loader; | ||
| use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; | ||
|
|
||
| final class BeelabRecaptcha2Extension extends Extension | ||
| { | ||
|
|
@@ -23,8 +23,8 @@ public function load(array $configs, ContainerBuilder $container): void | |
| $requestMethodClass = $this->getRequestMethod($config['request_method']); | ||
| $container->setParameter('beelab_recaptcha2.request_method', $requestMethodClass); | ||
|
|
||
| $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../config')); | ||
| $loader->load('services.xml'); | ||
| $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config')); | ||
| $loader->load('services.php'); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the xml file needs to be removed |
||
| } | ||
|
|
||
| private function getRequestMethod(string $requestMethod): string | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This part should not be here, please remove