remove bundle dir

php-arsenal · Apr 13, 2021 · 11bf76b · 11bf76b
1 parent 445854e
commit 11bf76b
Show file tree

Hide file tree

Showing 40 changed files with 49 additions and 59 deletions.
diff --git a/composer.json b/composer.json
@@ -6,16 +6,16 @@
   "license": "MIT",
   "autoload": {
     "psr-4": {
-      "PhpArsenal\\": "src"
+      "PhpArsenal\\SalesforceOutboundMessageBundle\\": "src"
     },
     "files": [
-      "src/SalesforceOutboundMessageBundle/functions.php"
+      "src/functions.php"
     ]
   },
   "autoload-dev": {
     "files": [
-      "src/SalesforceOutboundMessageBundle/functions.php",
-      "vendor/php-arsenal/salesforce-mapper-bundle/src/SalesforceMapperBundle/Annotation/Field.php"
+      "src/functions.php",
+      "vendor/php-arsenal/salesforce-mapper-bundle/src/Annotation/Field.php"
     ],
     "psr-4": {
       "Tests\\": "tests/"

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpArsenal\SalesforceOutboundMessageBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder('arsenal_salesforce_outbound_message');
+        $treeBuilder
+            ->getRootNode()
+            ->children()
+                ->scalarNode('wsdl_cache')
+                    ->defaultValue('WSDL_CACHE_DISK')
+                ->end()
+                ->scalarNode('wsdl_directory')
+                    ->isRequired()
+                ->end()
+                ->arrayNode('document_paths')
+                    ->arrayPrototype()
+                        ->children()
+                            ->scalarNode('path')
+                                ->isRequired()
+                            ->end()
+                            ->scalarNode('force_compare')
+                                ->defaultFalse()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+
+        return $treeBuilder;
+    }
+}
diff --git a/...yInjection/DependencyInjectionBuilder.php → ...yInjection/DependencyInjectionBuilder.php b/...yInjection/DependencyInjectionBuilder.php → ...yInjection/DependencyInjectionBuilder.php
diff --git a/...on/SalesforceOutboundMessageExtension.php → ...on/SalesforceOutboundMessageExtension.php b/...on/SalesforceOutboundMessageExtension.php → ...on/SalesforceOutboundMessageExtension.php
@@ -12,11 +12,12 @@ class SalesforceOutboundMessageExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
+        $processedConfiguration =$this->processConfiguration($configuration);
 
         DependencyInjectionBuilder::setupConfigurationParameters(
             $container,
-            $this->processConfiguration($configuration, $configs),
-            'arsenal_salesforce_outbound_message'
+            $processedConfiguration,
+            'arsenal.salesforce_outbound_message'
         );
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

diff --git a/...sageBundle/Document/ObjectToBeRemoved.php → src/Document/ObjectToBeRemoved.php b/...sageBundle/Document/ObjectToBeRemoved.php → src/Document/ObjectToBeRemoved.php
diff --git a/.../Event/OutboundMessageAfterFlushEvent.php → src/Event/OutboundMessageAfterFlushEvent.php b/.../Event/OutboundMessageAfterFlushEvent.php → src/Event/OutboundMessageAfterFlushEvent.php
diff --git a/...Event/OutboundMessageBeforeFlushEvent.php → ...Event/OutboundMessageBeforeFlushEvent.php b/...Event/OutboundMessageBeforeFlushEvent.php → ...Event/OutboundMessageBeforeFlushEvent.php
diff --git a/...iber/ObjectToBeRemovedEventSubscriber.php → ...iber/ObjectToBeRemovedEventSubscriber.php b/...iber/ObjectToBeRemovedEventSubscriber.php → ...iber/ObjectToBeRemovedEventSubscriber.php
diff --git a/...e/Exception/DocumentNotFoundException.php → src/Exception/DocumentNotFoundException.php b/...e/Exception/DocumentNotFoundException.php → src/Exception/DocumentNotFoundException.php
diff --git a/...dle/Exception/InvalidRequestException.php → src/Exception/InvalidRequestException.php b/...dle/Exception/InvalidRequestException.php → src/Exception/InvalidRequestException.php
diff --git a/...Exception/ObjectNameNotFoundException.php → ...Exception/ObjectNameNotFoundException.php b/...Exception/ObjectNameNotFoundException.php → ...Exception/ObjectNameNotFoundException.php
diff --git a/...eBundle/Exception/SalesforceException.php → src/Exception/SalesforceException.php b/...eBundle/Exception/SalesforceException.php → src/Exception/SalesforceException.php
diff --git a/...sageBundle/Exception/WsdlFileNotFound.php → src/Exception/WsdlFileNotFound.php b/...sageBundle/Exception/WsdlFileNotFound.php → src/Exception/WsdlFileNotFound.php
diff --git a/...geBundle/Interfaces/DocumentInterface.php → src/Interfaces/DocumentInterface.php b/...geBundle/Interfaces/DocumentInterface.php → src/Interfaces/DocumentInterface.php
diff --git a/...nterfaces/SoapRequestHandlerInterface.php → ...nterfaces/SoapRequestHandlerInterface.php b/...nterfaces/SoapRequestHandlerInterface.php → ...nterfaces/SoapRequestHandlerInterface.php
diff --git a/...e/Interfaces/WsdlPathFactoryInterface.php → src/Interfaces/WsdlPathFactoryInterface.php b/...e/Interfaces/WsdlPathFactoryInterface.php → src/Interfaces/WsdlPathFactoryInterface.php
diff --git a/...ssageBundle/Model/NotificationRequest.php → src/Model/NotificationRequest.php b/...ssageBundle/Model/NotificationRequest.php → src/Model/NotificationRequest.php
diff --git a/...sageBundle/Model/NotificationResponse.php → src/Model/NotificationResponse.php b/...sageBundle/Model/NotificationResponse.php → src/Model/NotificationResponse.php
diff --git a/...epository/ObjectToBeRemovedRepository.php → ...epository/ObjectToBeRemovedRepository.php b/...epository/ObjectToBeRemovedRepository.php → ...epository/ObjectToBeRemovedRepository.php
diff --git a/...essageBundle/Resources/config/routing.yml → src/Resources/config/routing.yml b/...essageBundle/Resources/config/routing.yml → src/Resources/config/routing.yml
diff --git a/...ssageBundle/Resources/config/services.yml → src/Resources/config/services.yml b/...ssageBundle/Resources/config/services.yml → src/Resources/config/services.yml
diff --git a/.../Resources/wsdl/ObjectToBeRemoved__c.wsdl → src/Resources/wsdl/ObjectToBeRemoved__c.wsdl b/.../Resources/wsdl/ObjectToBeRemoved__c.wsdl → src/Resources/wsdl/ObjectToBeRemoved__c.wsdl
diff --git a/...undle/SalesforceOutboundMessageBundle.php → src/SalesforceOutboundMessageBundle.php b/...undle/SalesforceOutboundMessageBundle.php → src/SalesforceOutboundMessageBundle.php
diff --git a/src/SalesforceOutboundMessageBundle/DependencyInjection/Configuration.php b/src/SalesforceOutboundMessageBundle/DependencyInjection/Configuration.php
diff --git a/...OutboundMessageAfterFlushEventBuilder.php → ...OutboundMessageAfterFlushEventBuilder.php b/...OutboundMessageAfterFlushEventBuilder.php → ...OutboundMessageAfterFlushEventBuilder.php
diff --git a/...utboundMessageBeforeFlushEventBuilder.php → ...utboundMessageBeforeFlushEventBuilder.php b/...utboundMessageBeforeFlushEventBuilder.php → ...utboundMessageBeforeFlushEventBuilder.php
diff --git a/...lder/OutboundMessageSoapServerBuilder.php → ...lder/OutboundMessageSoapServerBuilder.php b/...lder/OutboundMessageSoapServerBuilder.php → ...lder/OutboundMessageSoapServerBuilder.php
diff --git a/...ces/Builder/SoapRequestHandlerBuilder.php → ...ces/Builder/SoapRequestHandlerBuilder.php b/...ces/Builder/SoapRequestHandlerBuilder.php → ...ces/Builder/SoapRequestHandlerBuilder.php
diff --git a/.../Services/Builder/SoapResponseBuilder.php → src/Services/Builder/SoapResponseBuilder.php b/.../Services/Builder/SoapResponseBuilder.php → src/Services/Builder/SoapResponseBuilder.php
diff --git a/...le/Services/Builder/SoapServerBuilder.php → src/Services/Builder/SoapServerBuilder.php b/...le/Services/Builder/SoapServerBuilder.php → src/Services/Builder/SoapServerBuilder.php
diff --git a/...essageBundle/Services/DocumentUpdater.php → src/Services/DocumentUpdater.php b/...essageBundle/Services/DocumentUpdater.php → src/Services/DocumentUpdater.php
diff --git a/...actory/OutboundMessageWsdlPathFactory.php → ...actory/OutboundMessageWsdlPathFactory.php b/...actory/OutboundMessageWsdlPathFactory.php → ...actory/OutboundMessageWsdlPathFactory.php
diff --git a/...lesforceObjectDocumentMetadataFactory.php → ...lesforceObjectDocumentMetadataFactory.php b/...lesforceObjectDocumentMetadataFactory.php → ...lesforceObjectDocumentMetadataFactory.php
diff --git a/...ssageBundle/Services/ObjectComparator.php → src/Services/ObjectComparator.php b/...ssageBundle/Services/ObjectComparator.php → src/Services/ObjectComparator.php
diff --git a/...ssageBundle/Services/PropertyAccessor.php → src/Services/PropertyAccessor.php b/...ssageBundle/Services/PropertyAccessor.php → src/Services/PropertyAccessor.php
diff --git a/...Handler/OutboundMessageRequestHandler.php → ...Handler/OutboundMessageRequestHandler.php b/...Handler/OutboundMessageRequestHandler.php → ...Handler/OutboundMessageRequestHandler.php
diff --git a/...ces/RequestHandler/SoapRequestHandler.php → ...ces/RequestHandler/SoapRequestHandler.php b/...ces/RequestHandler/SoapRequestHandler.php → ...ces/RequestHandler/SoapRequestHandler.php
diff --git a/...ver/OutboundMessageObjectNameResolver.php → ...ver/OutboundMessageObjectNameResolver.php b/...ver/OutboundMessageObjectNameResolver.php → ...ver/OutboundMessageObjectNameResolver.php
diff --git a/...sforceOutboundMessageBundle/functions.php → src/functions.php b/...sforceOutboundMessageBundle/functions.php → src/functions.php
diff --git a/tests/Unit/DependencyInjection/ConfigurationTest.php b/tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -16,30 +16,22 @@ class ConfigurationTest extends TestCase
     public function testConfiguration(): void
     {
         $inputOutput = [
-            'salesforce_outbound_message' => [
+//            'arsenal_salesforce_outbound_message' => [
                 'wsdl_cache' => 'WSDL_CACHE_NONE',
                 'wsdl_directory' => '%kernel.project_dir%/Resources/wsdl_documents',
                 'document_paths' => [
                     'ObjectToBeRemoved__c' => [
                         'path' => 'PhpArsenal\SalesforceOutboundMessageBundle\Document\ObjectToBeRemoved',
                     ],
                 ],
-            ]
+//            ]
         ];
 
         $configuration = new Configuration();
 
         $configNode = $configuration->getConfigTreeBuilder()->buildTree();
         $resultConfig = $configNode->finalize($configNode->normalize($inputOutput));
 
-        $this->assertEquals(array_merge_recursive($inputOutput, [
-            'salesforce_outbound_message' => [
-                'document_paths' => [
-                    'ObjectToBeRemoved__c' => [
-                        'force_compare' => false,
-                    ]
-                ]
-            ]
-        ]), $resultConfig);
+        $this->assertEquals($inputOutput, $resultConfig);
     }
 }