FD3-416 fix conflictos

app/AppKernel.php

@@ -42,6 +42,7 @@ class AppKernel extends Kernel
             new AuditBundle\AuditBundle(),
             new IPv4Bundle\IPv4Bundle(),
             new DHCPBundle\DHCPBundle(),
+            new WorkflowBundle\WorkflowBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/config.yml

@@ -39,6 +39,7 @@ framework:
         resource: '%kernel.project_dir%/app/config/routing.yml'
         strict_requirements: ~
     form: ~
+    csrf_protection: ~
     validation: { enable_annotations: true }
     #serializer: { enable_annotations: true }
     templating:
@@ -114,6 +115,7 @@ sonata_admin:
     templates:
         layout: BaseAdminBundle::standard_layout.html.twig
         user_block: BaseOAuthClientBundle:Core:oauth_user_block.html.twig
+        list: BaseAdminBundle::standard_list.html.twig
     persist_filters: true
 
 doctrine_migrations:

app/config/config_dev.yml

@@ -13,14 +13,27 @@ web_profiler:
     intercept_redirects: false
 
 monolog:
+    channels: ['devicelog', 'webservice']
     handlers:
         main:
-            type: stream
-            path: '%kernel.logs_dir%/%kernel.environment%.log'
-            level: debug
+            type:         fingers_crossed
+            action_level: error
+            handler:      grouped
             channels: ['!event']
+        grouped:
+            type:         group
+            members:      [nested, amqp]
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+        amqp:
+            type:               service
+            id:                 monolog.amqp
+            level:              debug
+            channels: ['devicelog', 'webservice']
         console:
-            type:   console
+            type: console
             process_psr_3_messages: false
             channels: ['!event', '!doctrine', '!console']
         # To follow logs in real time, execute the following command:

app/config/config_prod.yml

@@ -12,18 +12,21 @@ monolog:
     channels: ['devicelog', 'webservice']
     handlers:
         main:
-            type: fingers_crossed
+            type:         fingers_crossed
             action_level: error
-            handler: nested
+            handler:      grouped
+        grouped:
+            type:         group
+            members:      [nested, amqp]
         nested:
-            type: stream
-            path: '%kernel.logs_dir%/%kernel.environment%.log'
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-        console:
-            type: console
-            process_psr_3_messages: false
         amqp:
-            type: service
-            id: monolog.amqp
-            level: debug
+            type:               service
+            id:                 monolog.amqp
+            level:              debug
             channels: ['devicelog', 'webservice']
+        console:
+            type: console
+            process_psr_3_messages: false

app/config/parameters.yml.dist

@@ -21,17 +21,17 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # amqp queue config
-    rabbit_mq.host:     'amqp'
+    rabbit_mq.host:     127.0.0.1
     rabbit_mq.port:     5672
     rabbit_mq.user:     'guest'
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
     db_session_host: mysql
-    db_session_port: ~
+    db_session_port: null
     db_session_name: fd_session
     db_session_user: root
-    db_session_password: 235r2342gtfsw
+    db_session_password: null
     env(AMQP_KEY) : ""
 
     cookie_domain_client: '%env(CLIENT)%'

composer.json

@@ -117,6 +117,13 @@
         {
             "type": "vcs",
             "url": "https://github.com/dwoo-project/dwoo.git"
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
+            "options": {
+                    "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a33c33be0f9fa051d1731ae0f42a625c",
+    "content-hash": "eed830237ae0da051947fd839cf7abba",
     "packages": [
         {
             "name": "behat/transliterator",

src/IPv4Bundle/Form/HostType.php

@@ -27,7 +27,8 @@ class HostType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => 'IPv4Bundle\Entity\Host'
+            'data_class' => 'IPv4Bundle\Entity\Host',
+            'csrf_protection' => false
         ));
     }
 

src/IPv4Bundle/Form/HostTypeType.php

@@ -22,7 +22,8 @@ class HostTypeType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => 'IPv4Bundle\Entity\HostType'
+            'data_class' => 'IPv4Bundle\Entity\HostType',
+            'csrf_protection' => false
         ));
     }