From 50dee3a6a2a8e0c9793b328fa1fbabaeedeb8f8a Mon Sep 17 00:00:00 2001 From: Mykola Chomenko Date: Mon, 24 Sep 2018 15:16:36 +0200 Subject: [PATCH 1/2] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index dc361e7..bc79c2c 100644 --- a/composer.json +++ b/composer.json @@ -18,9 +18,9 @@ "require": { "php": ">=5.6", "nette/di": "~2.4.0", - "nette/utils": "~2.4.0", - "latte/latte": "~2.4.0", - "kdyby/console": "~2.6.0", + "nette/utils": ">=2.4.0", + "latte/latte": ">=2.4.0", + "kdyby/console": ">=2.6.0", "sergiors/importing": "1.0.1" }, "require-dev": { From 414c76db27341f664b3366da5742d6d245e8791c Mon Sep 17 00:00:00 2001 From: chomenko Date: Tue, 25 Sep 2018 10:09:13 +0200 Subject: [PATCH 2/2] Nette Object => Nette SmartObject --- src/Generators/BaseGenerator.php | 6 ++++-- src/Generators/BaseItem.php | 4 +++- src/Generators/Google/Image.php | 5 ++++- src/Generators/Google/ProductType.php | 5 +++-- src/Generators/Heureka/Delivery.php | 4 +++- src/Generators/Heureka/Gift.php | 4 +++- src/Generators/Heureka/Image.php | 5 ++++- src/Generators/Heureka/Parameter.php | 4 +++- src/Generators/Zbozi/CategoryText.php | 6 ++++-- src/Generators/Zbozi/ExtraMessage.php | 5 ++++- src/Generators/Zbozi/Image.php | 5 ++++- src/Generators/Zbozi/Parameter.php | 4 +++- src/Generators/Zbozi/ShopDepot.php | 4 +++- 13 files changed, 45 insertions(+), 16 deletions(-) mode change 100644 => 100755 src/Generators/BaseGenerator.php mode change 100644 => 100755 src/Generators/BaseItem.php mode change 100644 => 100755 src/Generators/Google/Image.php mode change 100644 => 100755 src/Generators/Google/ProductType.php mode change 100644 => 100755 src/Generators/Heureka/Delivery.php mode change 100644 => 100755 src/Generators/Heureka/Gift.php mode change 100644 => 100755 src/Generators/Heureka/Image.php mode change 100644 => 100755 src/Generators/Heureka/Parameter.php mode change 100644 => 100755 src/Generators/Zbozi/CategoryText.php mode change 100644 => 100755 src/Generators/Zbozi/ExtraMessage.php mode change 100644 => 100755 src/Generators/Zbozi/Image.php mode change 100644 => 100755 src/Generators/Zbozi/Parameter.php mode change 100644 => 100755 src/Generators/Zbozi/ShopDepot.php diff --git a/src/Generators/BaseGenerator.php b/src/Generators/BaseGenerator.php old mode 100644 new mode 100755 index f966b34..d9bcc78 --- a/src/Generators/BaseGenerator.php +++ b/src/Generators/BaseGenerator.php @@ -3,7 +3,7 @@ use Latte\Engine; use Mk\Feed\Storage; -use Nette\Object; +use Nette\SmartObject; use Mk\Feed\FileEmptyException; use Mk\Feed\ItemIncompletedException; @@ -12,7 +12,9 @@ * @author Martin Knor * @package Mk\Feed\Generators */ -abstract class BaseGenerator extends Object implements IGenerator { +abstract class BaseGenerator implements IGenerator { + + use SmartObject; /** @var bool true if some products added */ private $prepared = false; diff --git a/src/Generators/BaseItem.php b/src/Generators/BaseItem.php old mode 100644 new mode 100755 index 55243f8..a72bce5 --- a/src/Generators/BaseItem.php +++ b/src/Generators/BaseItem.php @@ -10,9 +10,11 @@ * @author Martin Knor * @package Mk\Feed\Generators\Zbozi */ -abstract class BaseItem extends Nette\Object implements Mk\Feed\Generators\IItem +abstract class BaseItem implements Mk\Feed\Generators\IItem { + use Nette\SmartObject; + /** * Validate item * @return bool return true if item is valid diff --git a/src/Generators/Google/Image.php b/src/Generators/Google/Image.php old mode 100644 new mode 100755 index 5e45ed8..61f3f2d --- a/src/Generators/Google/Image.php +++ b/src/Generators/Google/Image.php @@ -10,8 +10,11 @@ * @author Martin Knor * @package Mk\Feed\Generators\Google */ -class Image extends Nette\Object +class Image { + + use Nette\SmartObject; + /** @var string */ private $url; diff --git a/src/Generators/Google/ProductType.php b/src/Generators/Google/ProductType.php old mode 100644 new mode 100755 index bec21e2..a3ef6f1 --- a/src/Generators/Google/ProductType.php +++ b/src/Generators/Google/ProductType.php @@ -10,8 +10,9 @@ * @author Martin Knor * @package Mk\Feed\Generators\Google */ -class ProductType extends Nette\Object { - +class ProductType{ + + use Nette\SmartObject; /** @var string */ protected $text; diff --git a/src/Generators/Heureka/Delivery.php b/src/Generators/Heureka/Delivery.php old mode 100644 new mode 100755 index acf876d..c427d6e --- a/src/Generators/Heureka/Delivery.php +++ b/src/Generators/Heureka/Delivery.php @@ -9,7 +9,9 @@ * @author Martin Knor * @package Mk\Feed\Generators\Heureka */ -class Delivery extends Nette\Object { +class Delivery{ + + use Nette\SmartObject; CONST CESKA_POSTA = 'CESKA_POSTA', CESKA_POSTA_NA_POSTU = 'CESKA_POSTA_NA_POSTU', diff --git a/src/Generators/Heureka/Gift.php b/src/Generators/Heureka/Gift.php old mode 100644 new mode 100755 index ac0f65c..670f477 --- a/src/Generators/Heureka/Gift.php +++ b/src/Generators/Heureka/Gift.php @@ -9,7 +9,9 @@ * @author Martin Knor * @package Mk\Feed\Generators\Heureka */ -class Gift extends Nette\Object { +class Gift{ + + use Nette\SmartObject; /** @var string */ protected $name; diff --git a/src/Generators/Heureka/Image.php b/src/Generators/Heureka/Image.php old mode 100644 new mode 100755 index 319b3b3..581cbcb --- a/src/Generators/Heureka/Image.php +++ b/src/Generators/Heureka/Image.php @@ -10,8 +10,11 @@ * @author Martin Knor * @package Mk\Feed\Generators\Heureka */ -class Image extends Nette\Object +class Image { + + use Nette\SmartObject; + /** @var string */ private $url; diff --git a/src/Generators/Heureka/Parameter.php b/src/Generators/Heureka/Parameter.php old mode 100644 new mode 100755 index 6c66bd6..7dcb85f --- a/src/Generators/Heureka/Parameter.php +++ b/src/Generators/Heureka/Parameter.php @@ -9,7 +9,9 @@ * @author Martin Knor * @package Mk\Feed\Generators\Heureka */ -class Parameter extends Nette\Object { +class Parameter{ + + use Nette\SmartObject; protected $name; protected $value; diff --git a/src/Generators/Zbozi/CategoryText.php b/src/Generators/Zbozi/CategoryText.php old mode 100644 new mode 100755 index 8327264..3d4f799 --- a/src/Generators/Zbozi/CategoryText.php +++ b/src/Generators/Zbozi/CategoryText.php @@ -10,8 +10,10 @@ * @author Martin Knor * @package Mk\Feed\Generators\Zbozi */ -class CategoryText extends Nette\Object { - +class CategoryText{ + + use Nette\SmartObject; + /** @var string */ protected $text; diff --git a/src/Generators/Zbozi/ExtraMessage.php b/src/Generators/Zbozi/ExtraMessage.php old mode 100644 new mode 100755 index 3ebca87..1e5e8e2 --- a/src/Generators/Zbozi/ExtraMessage.php +++ b/src/Generators/Zbozi/ExtraMessage.php @@ -10,7 +10,10 @@ * @author Martin Knor * @package Mk\Feed\Generators\Zbozi */ -class ExtraMessage extends Nette\Object { +class ExtraMessage{ + + use Nette\SmartObject; + CONST EXTENDED_WARRANTY = 'extended_warranty', FREE_ACCESSORIES = 'free_accessories', FREE_CASE = 'free_case', diff --git a/src/Generators/Zbozi/Image.php b/src/Generators/Zbozi/Image.php old mode 100644 new mode 100755 index 87fa744..b0cf858 --- a/src/Generators/Zbozi/Image.php +++ b/src/Generators/Zbozi/Image.php @@ -4,7 +4,10 @@ use Mk, Nette; -class Image extends Nette\Object { +class Image{ + + use Nette\SmartObject; + private $url; /** diff --git a/src/Generators/Zbozi/Parameter.php b/src/Generators/Zbozi/Parameter.php old mode 100644 new mode 100755 index a037bba..1c9d6df --- a/src/Generators/Zbozi/Parameter.php +++ b/src/Generators/Zbozi/Parameter.php @@ -10,7 +10,9 @@ * @package Mk\Feed\Generators\Zbozi * @see http://napoveda.seznam.cz/cz/zbozi/specifikace-xml-pro-obchody/specifikace-xml-feedu/#PARAM */ -class Parameter extends Nette\Object { +class Parameter{ + + use Nette\SmartObject; protected $name; protected $value; diff --git a/src/Generators/Zbozi/ShopDepot.php b/src/Generators/Zbozi/ShopDepot.php old mode 100644 new mode 100755 index 67e43c2..1714086 --- a/src/Generators/Zbozi/ShopDepot.php +++ b/src/Generators/Zbozi/ShopDepot.php @@ -4,7 +4,9 @@ use Mk, Nette; -class ShopDepot extends Nette\Object { +class ShopDepot{ + + use Nette\SmartObject; private $id;