Merge branch 'master' of bitbucket.org:ikflowdat/ftth into FD3-262

composer.json

@@ -133,7 +133,7 @@
         "ik/map-bundle": "dev-master",
         "ik/migrations-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-FD3-257",
+        "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/owner-voter-bundle": "dev-master",
         "ik/template-bundle": "dev-master",

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": "8e7f4d9492913bbd4ad16441d8ec4683",
+    "content-hash": "49c90dc355b5613a1df168bfdfa84aaa",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "ccf944e46dc4fe66c32c9ecec0fa3ffa0f919594"
+                "reference": "53d81ce96e6b94af88c2546c5470fc3ad050a7bc"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-24T12:41:46+00:00"
+            "time": "2017-10-27T15:27:11+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1440,7 +1440,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "4a05cb8892cb401ab3b1b6ab28446caf428e75ea"
+                "reference": "584909edec2acc3eb9b565366f01ed5265369738"
             },
             "type": "library",
             "autoload": {
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-20T14:49:48+00:00"
+            "time": "2017-10-27T15:31:53+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1507,7 +1507,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-                "reference": "ae8d73c03abf31412cd890b6c1c4ce7436379ab5"
+                "reference": "003e1010325ac458e9fe59df2e8d27b67a36b423"
             },
             "type": "library",
             "autoload": {
@@ -1522,7 +1522,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-12T13:55:36+00:00"
+            "time": "2017-10-24T15:18:07+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1625,11 +1625,11 @@
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-FD3-257",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "9bf7cb7e643e4d4a2c42d16e08ff1b319c0110c4"
+                "reference": "07e10004f1435298222be5519b4933ce783c380f"
             },
             "require": {
                 "ext-curl": "*",
@@ -1642,7 +1642,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-10-23T15:02:50+00:00"
+            "time": "2017-10-24T15:56:43+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1650,7 +1650,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "e1a027927aa7c67bbed5e10d9c594034f368d31f"
+                "reference": "14c6dbbc36036b5b57a1be49debfe8c3e35c1d46"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1680,7 +1680,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-20T18:13:35+00:00"
+            "time": "2017-10-27T15:31:10+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/FTTHBundle/Entity/NAP.php

@@ -120,7 +120,7 @@ class NAP implements TenancyIdTraitInterface, LocationInterface
     /**
      * @return ContainerInterface
      */
-    public function getContainer(): ContainerInterface
+    public function getContainer()
     {
         return $this->container;
     }