Explorar o código

Actualizacion php7.1 y phpunit 6.3

gabriel %!s(int64=7) %!d(string=hai) anos
pai
achega
01406b71c2
Modificáronse 4 ficheiros con 592 adicións e 204 borrados
  1. 1 1
      .drone.yml
  2. 1 1
      Dockerfile
  3. 6 11
      composer.json
  4. 584 191
      composer.lock

+ 1 - 1
.drone.yml

@@ -10,7 +10,7 @@ services:
     image: rabbitmq:3-management
 pipeline:
  build:
-    image: docker.infra.flowdat.com/fd3/sf-php:latest
+    image: docker.infra.flowdat.com/fd3/sf-php:7.1
     environment:
       HOST_FTTH: ftth.test.fd3.flowdat.com
       HOST_STATS: stats.test.fd3.flowdat.com

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.infra.flowdat.com/fd3/sf-php:php-7.1
+FROM docker.infra.flowdat.com/fd3/sf-php:7.1
 EXPOSE 8000
 
 ADD . /opt/ftth

+ 6 - 11
composer.json

@@ -106,29 +106,24 @@
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
-	{
+        {
             "type": "vcs",
             "url": "ssh://git@gogs.infra.flowdat.com:222/3erPartyFlowdat3/SonataAdminBundle.git",
             "name": "ik-sonata"
-	}
-
+        }
     ],
     "config": {
         "secure-http": false,
         "optimize-autoloader": true,
-	"platform": {
-		    "php": "5.5.9"
-		    },
-	"sort-packages": true
-
+        "sort-packages": true
     },
     "require": {
         "php": ">=5.5.9",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "doctrine/doctrine-migrations-bundle": "^1.2",
+        "doctrine/instantiator": "^1.0.5",
         "doctrine/orm": "^2.5",
-        "hwi/oauth-bundle": "^0.5.3",
         "ik/audit-bundle": "dev-master",
         "ik/auth-bundle": "dev-master",
         "ik/base-admin-bundle": "dev-master",
@@ -159,9 +154,9 @@
         "voryx/restgeneratorbundle": "dev-master"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.3.0",
         "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.3",
-        "phpunit/phpunit": "^4.8"
+        "symfony/phpunit-bridge": "^3.3"
     },
     "scripts": {
         "workflows-commands": [

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 584 - 191
composer.lock