openinfra/openstackid-resources
Code Issues Proposed changes

Fixes from php7.2 migration

Browse Source 
Change-Id: Ib8017917e4b31894de6a130bf1c1ddf32ecc36ed
This commit is contained in:
Sebastian Marcet 2019-01-09 10:28:16 -03:00
parent a33f002611
commit 609ec9c7ce
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ModelSerializers/Locations/SummitLocationImageSerializer.php
View File

@ -43,7 +43,7 @@ class SummitLocationImageSerializer extends SilverStripeSerializer
if($this->object->hasPicture()) if($this->object->hasPicture())
{ {
$picture = $this->object->getPicture(); $picture = $this->object->getPicture();
$values['image_url'] = $picture->getFilename()->getUrl(); $values['image_url'] = $picture->getUrl();
} }
else else
{ {

2
app/Models/Foundation/Main/File.php
View File

@ -59,7 +59,7 @@ class File extends SilverstripeBaseModel
private $cloud_status; private $cloud_status;
/** /**
* @ORM\Column(name="CloudSize", type="int") * @ORM\Column(name="CloudSize", type="integer")
*/ */
private $cloud_size; private $cloud_size;

32
bindep.txt
View File

@ -1,32 +1,22 @@
mcrypt php7.2 [platform:dpkg]
php [platform:ubuntu-xenial] php7.2-cli [platform:dpkg]
php5 [platform:dpkg !platform:ubuntu-xenial]
php-cli [platform:rpm platform:ubuntu-xenial] php7.2-common [platform:dpkg]
php5-cli [platform:dpkg !platform:ubuntu-xenial]
php-common [platform:ubuntu-xenial] php7.2-curl [platform:dpkg]
php5-common [platform:dpkg !platform:ubuntu-xenial]
php-curl [platform:rpm platform:ubuntu-xenial] php7.2-gd [platform:dpkg]
php5-curl [platform:dpkg !platform:ubuntu-xenial]
php-gd [platform:rpm platform:ubuntu-xenial] php7.2-json [platform:dpkg]
php5-gd [platform:dpkg !platform:ubuntu-xenial]
php-json [platform:rpm platform:ubuntu-xenial] php7.2-mysqlnd [platform:dpkg]
php5-json [platform:dpkg !platform:ubuntu-xenial]
php-mysql [platform:rpm platform:ubuntu-xenial] php7.2-xml [platform:dpkg]
php5-mysql [platform:dpkg !platform:ubuntu-xenial]
php-gmp [platform:rpm platform:ubuntu-xenial] php7.2-mbstring [platform:dpkg]
php5-gmp [platform:dpkg !platform:ubuntu-xenial]
php-mcrypt [platform:ubuntu-xenial] php7.2-gmp [platform:dpkg]
php5-mcrypt [platform:dpkg !platform:ubuntu-xenial]
php-ssh2 [platform:ubuntu-xenial] php7.2-ssh2 [platform:dpkg]
php5-ssh2 [platform:dpkg !platform:ubuntu-xenial]