From 609ec9c7ce75366dd46f7d883c27518ce77ca729 Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Wed, 9 Jan 2019 10:28:16 -0300 Subject: [PATCH] Fixes from php7.2 migration Change-Id: Ib8017917e4b31894de6a130bf1c1ddf32ecc36ed --- .../SummitLocationImageSerializer.php | 2 +- app/Models/Foundation/Main/File.php | 2 +- bindep.txt | 32 +++++++------------ 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php index 9f9c87e8..bedd926e 100644 --- a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php +++ b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php @@ -43,7 +43,7 @@ class SummitLocationImageSerializer extends SilverStripeSerializer if($this->object->hasPicture()) { $picture = $this->object->getPicture(); - $values['image_url'] = $picture->getFilename()->getUrl(); + $values['image_url'] = $picture->getUrl(); } else { diff --git a/app/Models/Foundation/Main/File.php b/app/Models/Foundation/Main/File.php index 0d9920a8..959b581a 100644 --- a/app/Models/Foundation/Main/File.php +++ b/app/Models/Foundation/Main/File.php @@ -59,7 +59,7 @@ class File extends SilverstripeBaseModel private $cloud_status; /** - * @ORM\Column(name="CloudSize", type="int") + * @ORM\Column(name="CloudSize", type="integer") */ private $cloud_size; diff --git a/bindep.txt b/bindep.txt index db9ab84f..aee48ba1 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,32 +1,22 @@ -mcrypt +php7.2 [platform:dpkg] -php [platform:ubuntu-xenial] -php5 [platform:dpkg !platform:ubuntu-xenial] +php7.2-cli [platform:dpkg] -php-cli [platform:rpm platform:ubuntu-xenial] -php5-cli [platform:dpkg !platform:ubuntu-xenial] +php7.2-common [platform:dpkg] -php-common [platform:ubuntu-xenial] -php5-common [platform:dpkg !platform:ubuntu-xenial] +php7.2-curl [platform:dpkg] -php-curl [platform:rpm platform:ubuntu-xenial] -php5-curl [platform:dpkg !platform:ubuntu-xenial] +php7.2-gd [platform:dpkg] -php-gd [platform:rpm platform:ubuntu-xenial] -php5-gd [platform:dpkg !platform:ubuntu-xenial] +php7.2-json [platform:dpkg] -php-json [platform:rpm platform:ubuntu-xenial] -php5-json [platform:dpkg !platform:ubuntu-xenial] +php7.2-mysqlnd [platform:dpkg] -php-mysql [platform:rpm platform:ubuntu-xenial] -php5-mysql [platform:dpkg !platform:ubuntu-xenial] +php7.2-xml [platform:dpkg] -php-gmp [platform:rpm platform:ubuntu-xenial] -php5-gmp [platform:dpkg !platform:ubuntu-xenial] +php7.2-mbstring [platform:dpkg] -php-mcrypt [platform:ubuntu-xenial] -php5-mcrypt [platform:dpkg !platform:ubuntu-xenial] +php7.2-gmp [platform:dpkg] -php-ssh2 [platform:ubuntu-xenial] -php5-ssh2 [platform:dpkg !platform:ubuntu-xenial] +php7.2-ssh2 [platform:dpkg]