From f9925387e39b83c38e9f7cec9af934f8d5bd39d2 Mon Sep 17 00:00:00 2001 From: Asmir Mustafic Date: Mon, 26 Sep 2016 08:18:44 +0200 Subject: [PATCH] fixed DI --- .travis.yml | 1 - src/Command/Convert.php | 6 +-- src/DependencyInjection/Xsd2PhpExtension.php | 16 ++++---- src/Resources/config/services.xml | 40 ++++++++++---------- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c3d20d8..d0442950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ before_script: script: - vendor/phpunit/phpunit/phpunit $PHPUNIT_FLAGS - - mkdir ota - bin/xsd2php convert tests/config.yml tests/JmsSerializer/OTA/otaxml/OTA_AirAvailRQ.xsd -vv after_script: diff --git a/src/Command/Convert.php b/src/Command/Convert.php index b01dbe34..11ddb0bf 100644 --- a/src/Command/Convert.php +++ b/src/Command/Convert.php @@ -49,16 +49,16 @@ protected function execute(InputInterface $input, OutputInterface $output) $src = $input->getArgument('src'); $schemas = []; - $reader = $this->container->get('goetas.xsd2php.schema_reader'); + $reader = $this->container->get('goetas_webservices.xsd2php.schema_reader'); foreach ($src as $file) { $schemas[] = $reader->readFile($file); } foreach (['php', 'jms'] as $type) { - $converter = $this->container->get('goetas.xsd2php.converter.' . $type); + $converter = $this->container->get('goetas_webservices.xsd2php.converter.' . $type); $items = $converter->convert($schemas); - $writer = $this->container->get('goetas.xsd2php.writer.' . $type); + $writer = $this->container->get('goetas_webservices.xsd2php.writer.' . $type); $writer->write($items); } return count($items) ? 0 : 255; diff --git a/src/DependencyInjection/Xsd2PhpExtension.php b/src/DependencyInjection/Xsd2PhpExtension.php index ea4fca81..8e3cdb14 100644 --- a/src/DependencyInjection/Xsd2PhpExtension.php +++ b/src/DependencyInjection/Xsd2PhpExtension.php @@ -20,23 +20,23 @@ public function load(array $configs, ContainerBuilder $container) $config = array_merge($config, $subConfig); } - $definition = $container->getDefinition('goetas.xsd2php.naming_convention.' . $config['naming_strategy']); - $container->setDefinition('goetas.xsd2php.naming_convention', $definition); + $definition = $container->getDefinition('goetas_webservices.xsd2php.naming_convention.' . $config['naming_strategy']); + $container->setDefinition('goetas_webservices.xsd2php.naming_convention', $definition); - $schemaReader = $container->getDefinition('goetas.xsd2php.schema_reader'); + $schemaReader = $container->getDefinition('goetas_webservices.xsd2php.schema_reader'); foreach ($config['known_locations'] as $namespace => $location) { $schemaReader->addMethodCall('addKnownSchemaLocation', [$namespace, $location]); } foreach (['php', 'jms'] as $type) { - $definition = $container->getDefinition('goetas.xsd2php.path_generator.' . $type . '.' . $config['path_generator']); - $container->setDefinition('goetas.xsd2php.path_generator.' . $type, $definition); + $definition = $container->getDefinition('goetas_webservices.xsd2php.path_generator.' . $type . '.' . $config['path_generator']); + $container->setDefinition('goetas_webservices.xsd2php.path_generator.' . $type, $definition); - $pathGenerator = $container->getDefinition('goetas.xsd2php.path_generator.' . $type); + $pathGenerator = $container->getDefinition('goetas_webservices.xsd2php.path_generator.' . $type); $pathGenerator->addMethodCall('setTargets', [$config['destinations_' . $type]]); - $converter = $container->getDefinition('goetas.xsd2php.converter.' . $type); + $converter = $container->getDefinition('goetas_webservices.xsd2php.converter.' . $type); foreach ($config['namespaces'] as $xml => $php) { $converter->addMethodCall('addNamespace', [$xml, self::sanitizePhp($php)]); } @@ -47,7 +47,7 @@ public function load(array $configs, ContainerBuilder $container) } } - $container->setParameter('xsd2php.config', $config); + $container->setParameter('goetas_webservices.xsd2php.config', $config); } protected static function sanitizePhp($ns) diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml index e0dede01..673e2d6e 100644 --- a/src/Resources/config/services.xml +++ b/src/Resources/config/services.xml @@ -3,56 +3,56 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - + - + - - + + - - + + - - + + - - - - - + + + - - + + - - - + +