From cdbd6151232309ed14bf8c3433659a8fe92baa49 Mon Sep 17 00:00:00 2001 From: mesour Date: Tue, 22 Jan 2019 23:50:18 +0100 Subject: [PATCH] Fixed for PHP 7.2 --- .travis.yml | 1 + composer.json | 20 +++++++++---------- .../DataGrid/Extensions/Selection/Link.php | 4 +++- .../DataGrid/Extensions/Selection/Links.php | 4 +++- .../Extensions/SubItem/Items/Item.php | 4 +++- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index d667995..89a34e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 - hhvm matrix: diff --git a/composer.json b/composer.json index 3478cc8..216a006 100644 --- a/composer.json +++ b/composer.json @@ -10,17 +10,17 @@ }], "require": { "php": ">=5.6.0", - "mesour/components": "~3.1.0", - "mesour/button": "~3.1.0", - "mesour/dropdown": "~3.1.0", - "mesour/editable": "~3.1.0", - "mesour/filter": "~3.1.0", - "mesour/icon": "~3.1.0", - "mesour/pager": "~3.1.0", - "mesour/selection": "~3.1.0", + "mesour/components": "~3.2.0", + "mesour/button": "~3.2.0", + "mesour/dropdown": "~3.2.0", + "mesour/editable": "~3.2.0", + "mesour/filter": "~3.2.0", + "mesour/icon": "~3.2.0", + "mesour/pager": "~3.2.0", + "mesour/selection": "~3.2.0", "mesour/sources": "~3.0.0", - "mesour/template": "~3.1.0", - "mesour/table": "~3.1.0" + "mesour/template": "~3.2.0", + "mesour/table": "~3.2.0" }, "require-dev": { "tracy/tracy": "~2.4.0", diff --git a/src/Mesour/DataGrid/Extensions/Selection/Link.php b/src/Mesour/DataGrid/Extensions/Selection/Link.php index 93a1a57..29235e1 100644 --- a/src/Mesour/DataGrid/Extensions/Selection/Link.php +++ b/src/Mesour/DataGrid/Extensions/Selection/Link.php @@ -16,9 +16,11 @@ * * @method null onCall($items) */ -class Link extends Mesour\Object +class Link { + use Mesour\SmartObject; + private $name; private $fixed_name; diff --git a/src/Mesour/DataGrid/Extensions/Selection/Links.php b/src/Mesour/DataGrid/Extensions/Selection/Links.php index 93ee8f7..0e71a38 100644 --- a/src/Mesour/DataGrid/Extensions/Selection/Links.php +++ b/src/Mesour/DataGrid/Extensions/Selection/Links.php @@ -14,9 +14,11 @@ /** * @author Matouš Němec */ -class Links extends Mesour\Object implements Mesour\Components\Utils\IString +class Links implements Mesour\Components\Utils\IString { + use Mesour\SmartObject; + /** * @var Mesour\Components\Control\IControl|Mesour\Components\Localization\Translatable */ diff --git a/src/Mesour/DataGrid/Extensions/SubItem/Items/Item.php b/src/Mesour/DataGrid/Extensions/SubItem/Items/Item.php index edae165..24ca135 100644 --- a/src/Mesour/DataGrid/Extensions/SubItem/Items/Item.php +++ b/src/Mesour/DataGrid/Extensions/SubItem/Items/Item.php @@ -14,9 +14,11 @@ /** * @author Matouš Němec */ -abstract class Item extends Mesour\Object +abstract class Item { + use Mesour\SmartObject; + const DEFAULT_COUNT = 20; /** @var Mesour\DataGrid\Extensions\SubItem\ISubItem */