Merge branch 'FD3-241' of https://bitbucket.org/ikflowdat/stats into sprintv06

.drone.yml

@@ -30,12 +30,13 @@ pipeline:
       - echo 'client = Flowdat3-Stats-Drone-Test' | tee /etc/flowdat.conf
 
       - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
+      - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - composer install --no-interaction --no-progress
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
-      - vendor/phpunit/phpunit/phpunit --tap -c phpunit.xml.dist
+      - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
 
  docker:
    repo : docker.infra.flowdat.com/fd3/stats

app/AppKernel.php

@@ -58,6 +58,7 @@ class AppKernel extends Kernel
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
         }
 
         return $bundles;

composer.json

@@ -20,6 +20,10 @@
         ]
     },
     "repositories": [
+        {
+            "type": "composer",
+            "url": "https://satis.infra.flowdat.com/"
+        },
         {
             "type": "vcs",
             "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
@@ -128,6 +132,14 @@
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/3erPartyFlowdat3/SonataAdminBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            },
+            "name": "ik-sonata"
         }
     ],
     "require": {
@@ -137,6 +149,7 @@
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "doctrine/orm": "^2.5",
         "ik/audit-bundle": "dev-master",
+        "ik/auth-bundle": "dev-master",
         "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
@@ -150,29 +163,33 @@
         "ik/stats/huawei-bundle": "dev-master",
         "ik/statsd-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
-        "ik/workflow-bundle": "dev-workflow_update",
         "ik/auth-bundle": "dev-master",
         "ik/workflow-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
-        "jms/serializer-bundle": "^1.1",
+        "jms/serializer": "^1.9.0",
+        "jms/serializer-bundle": "^1.5.0",
+        "kriswallsmith/assetic": "^1.4",
         "opensolutions/oss-snmp": "dev-master",
         "php-amqplib/rabbitmq-bundle": "^1.12",
-        "phpunit/phpunit": "5.5.*",
-        "sensio/distribution-bundle": "^5.0",
+        "sensio/distribution-bundle": "^5.0.21",
         "sensio/framework-extra-bundle": "^3.0.2",
-        "sonata-project/admin-bundle": "^3.12",
+        "sonata-project/admin-bundle": "dev-bf4681 as 3.23.0",
         "sonata-project/doctrine-orm-admin-bundle": "^3.1",
         "stof/doctrine-extensions-bundle": "^1.2",
-        "symfony/monolog-bundle": "^3.0.2",
+        "symfony/assetic-bundle": "^2.8",
+        "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3.10",
-        "symfony/symfony": "3.2.*",
-        "twig/twig": "^1.0||^2.0",
+        "symfony/symfony": "3.3.*",
+        "symfony/web-server-bundle": "^3.3",
+        "twig/extensions": "^1.5",
+        "twig/twig": "^2.0",
         "voryx/restgeneratorbundle": "dev-master"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.4",
         "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.0"
+        "symfony/phpunit-bridge": "^3.3"
     },
     "scripts": {
         "symfony-scripts": [
@@ -203,6 +220,7 @@
         ]
     },
     "config": {
+        "optimize-autoloader": true,
         "sort-packages": true
     },
     "extra": {
@@ -228,7 +246,6 @@
             {
                 "file": "app/config/bundles/ik/base-admin-bundle/parameters.yml"
             }
-        ],
-        "branch-alias": null
+        ]
     }
 }