Merge master

app/AppKernel.php

@@ -43,7 +43,9 @@ class AppKernel extends Kernel
             new FiberhomeBundle\FiberhomeBundle(),
             new StatsDBundle\StatsDBundle(),
             new GeoserverBundle\GeoserverBundle(),
-            new LeafletBundle\LeafletBundle()
+            new LeafletBundle\LeafletBundle(),
+            new SimpleThings\EntityAudit\SimpleThingsEntityAuditBundle(),
+            new AuditBundle\AuditBundle()
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/config.yml

@@ -18,6 +18,7 @@ imports:
     - { resource: "@StatsBundle/Resources/config/services.yml" }
     - { resource: '@BaseAdminBundle/Resources/config/services.yml' }
     - { resource: '@GeoserverBundle/Resources/config/services.yml' }
+    - { resource: "@AuditBundle/Resources/config/services.yml" }
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration

app/config/routing.yml

@@ -48,3 +48,8 @@ admin_tenancy_change_tenancy_global_ajax:
 baseadmin_alert:
     resource: "@BaseAdminBundle/Controller"
     type:     annotation
+
+audit:
+    resource: "@AuditBundle/Controller/"
+    type:     annotation
+    prefix:   /

bin/symfony_requirements

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/./SymfonyRequirements.php';
 
 $lineSize = 70;
 $symfonyRequirements = new SymfonyRequirements();

composer.json

@@ -100,6 +100,13 @@
         {
             "type": "vcs",
             "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/LeafletBundle.git"
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "require": {
@@ -135,7 +142,8 @@
         "symfony/swiftmailer-bundle": "^2.3.10",
         "symfony/symfony": "3.2.*",
         "twig/twig": "^1.0||^2.0",
-        "voryx/restgeneratorbundle": "dev-master"
+        "voryx/restgeneratorbundle": "dev-master",
+        "ik/audit-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
@@ -188,6 +196,9 @@
             },
             {
                 "file": "app/config/bundles/hwi/oauth-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
             }
         ],
         "branch-alias": null

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": "52a4fa87ec5a63187f0d15bff7a04850",
+    "content-hash": "3da4979cb87bdb948a34a18016ebb293",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1391,13 +1391,37 @@
             ],
             "time": "2017-01-08T14:13:58+00:00"
         },
+        {
+            "name": "ik/audit-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+                "reference": "deba8813246a14dd17b160e44a35bb4811c13452"
+            },
+            "require": {
+                "simplethings/entity-audit-bundle": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AuditBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Audit Bundle",
+            "keywords": [
+                "audit",
+                "bundle"
+            ],
+            "time": "2017-06-27T13:16:34+00:00"
+        },
         {
             "name": "ik/base-admin-bundle",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "a5eb135e5b6cc3d4e8fa5f5cd6255833c2b3d709"
+                "reference": "a7fc7ce8a171e4d8494f070878b231f3629f610d"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1436,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-09-07 17:58:38"
+            "time": "2017-09-12T17:41:51+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1420,7 +1444,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "f6b8fdcefdf517a0a28f4c8abd79940228e6ac7c"
+                "reference": "f574d1a7a2e021ac4148c633ef94cfaafc4601f4"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1459,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-08-15 13:45:08"
+            "time": "2017-09-12T19:28:27+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1458,7 +1482,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-07-05 12:20:18"
+            "time": "2017-07-05T12:20:18+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1479,7 +1503,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-09-01 15:52:53"
+            "time": "2017-09-01T15:52:53+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1502,7 +1526,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1529,7 +1553,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-08-24 15:50:04"
+            "time": "2017-08-24T15:50:04+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1552,7 +1576,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1576,7 +1600,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2017-08-09 18:29:16"
+            "time": "2017-08-09T18:29:16+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1597,7 +1621,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2017-08-23 14:30:32"
+            "time": "2017-08-23T14:30:32+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1618,7 +1642,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-08-29 15:11:22"
+            "time": "2017-08-29T15:11:22+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1639,7 +1663,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2017-07-25 18:45:31"
+            "time": "2017-07-25T18:45:31+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1647,7 +1671,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "464007b3df353eb346aefd1b3ddb8a1827dc8e69"
+                "reference": "5b2c00acd8080d6a5d572b917b3e384b1954e3ca"
             },
             "require": {
                 "ext-curl": "*",
@@ -1660,7 +1684,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-09-07 13:15:50"
+            "time": "2017-09-13T13:31:04+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2504,7 +2528,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-06-10 07:30:59"
+            "time": "2017-06-10T07:30:59+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4267,6 +4291,57 @@
             "description": "A security checker for your composer.lock",
             "time": "2017-08-03T12:24:05+00:00"
         },
+        {
+            "name": "simplethings/entity-audit-bundle",
+            "version": "v1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplethings/EntityAuditBundle.git",
+                "reference": "ee71ea62735797f5b6562590e15cd237edce6489"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplethings/EntityAuditBundle/zipball/ee71ea62735797f5b6562590e15cd237edce6489",
+                "reference": "ee71ea62735797f5b6562590e15cd237edce6489",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/dbal": "~2.5",
+                "doctrine/orm": "~2.4",
+                "php": "^5.3.9|~7.0"
+            },
+            "conflict": {
+                "doctrine/doctrine-bundle": "<1.4",
+                "gedmo/doctrine-extensions": "<2.3.1",
+                "symfony/framework-bundle": "<2.7"
+            },
+            "require-dev": {
+                "doctrine/doctrine-bundle": "~1.4",
+                "fabpot/php-cs-fixer": "^1.11",
+                "gedmo/doctrine-extensions": "^2.3.1",
+                "matthiasnoback/symfony-dependency-injection-test": "^1.0",
+                "phpunit/phpunit": "^4.8",
+                "symfony/framework-bundle": "~2.7|~3.0",
+                "symfony/var-dumper": "^2.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SimpleThings\\EntityAudit\\": "src/SimpleThings/EntityAudit"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "description": "Audit for Doctrine Entities",
+            "keywords": [
+                "Audit",
+                "database",
+                "persistence"
+            ],
+            "time": "2017-07-24T15:38:35+00:00"
+        },
         {
             "name": "sonata-project/admin-bundle",
             "version": "3.20.1",
@@ -5735,7 +5810,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -6064,7 +6139,8 @@
         "ik/statsd-bundle": 20,
         "ik/webservice-bundle": 20,
         "opensolutions/oss-snmp": 20,
-        "voryx/restgeneratorbundle": 20
+        "voryx/restgeneratorbundle": 20,
+        "ik/audit-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

web/config.php

@@ -22,7 +22,7 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
     exit('This script is only accessible from localhost.');
 }
 
-require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/./SymfonyRequirements.php';
 
 $symfonyRequirements = new SymfonyRequirements();