Merge branch 'luciano' of bitbucket.org:ikflowdat/ftth into luciano

.drone.yml

@@ -8,8 +8,17 @@ pipeline:
   build:
     image: debian:8.0
     commands:
-      - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy     
-      - apt-get update && apt-get install -yq build-essential git unzip php5-cli php5-mysql wget mysql-client php5-curl
+      - echo 'Acquire::http { Proxy "http://200.50.168.30:3142"; };' > /etc/apt/apt.conf.d/01proxy  
+      
+      - apt-get update && apt-get install -yq build-essential git unzip wget
+      
+      - echo 'deb http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list
+      - echo 'deb-src http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list
+      - wget https://www.dotdeb.org/dotdeb.gpg
+      - apt-key add dotdeb.gpg
+      - rm dotdeb.gpg
+      - apt-get update 
+      - apt-get install -yq php7.0-cli php7.0-mysql mysql-client php7.0-curl php7.0-xml php7.0-bcmath php7.0-mbstring
       
       # RabbitMQ apt repository
       - echo 'deb http://www.rabbitmq.com/debian/ testing main' | tee /etc/apt/sources.list.d/rabbitmq.list
@@ -23,7 +32,7 @@ pipeline:
       - php composer-setup.php --install-dir=/usr/local/bin/ --filename=composer
       - php -r "unlink('composer-setup.php');"
       - echo 'client = Flowdat3-FTTH-Drone-Test' | tee /etc/flowdat.conf
-      - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php5/cli/php.ini
+      - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
       - yes | mysqladmin -h 127.0.0.1 create flowdat_ftth
       - mkdir -p /root/.ssh/
       - ssh-keyscan -p222 200.50.168.30 >> ~/.ssh/known_hosts

app/config/bundles/ik/device-bundle/parameters.yml

@@ -2,3 +2,4 @@
 parameters:
     device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
     device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
+    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'

app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -1,3 +1,4 @@
 parameters:
     device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
     device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
+    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'

composer.lock

@@ -1281,7 +1281,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "0469a3768cc4c3f282ec8740cc617f0b6243303c"
+                "reference": "fee905fe5323574e900e15b3dd954d513e468cad"
             },
             "type": "library",
             "autoload": {
@@ -1296,7 +1296,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-05-29 17:24:01"
+            "time": "2017-05-29 18:29:43"
         },
         {
             "name": "ik/extra-data-bundle",