Add support for new Nette

romanmatyus · Oct 5, 2018 · 603b586 · 603b586
1 parent 1dca480
commit 603b586
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -24,8 +24,9 @@
 		"nette/di": "If you wanna use Nette DI extension"
 	},
 	"require-dev": {
-		"nette/di": "~2.3@dev",
-		"nette/bootstrap": "~2.3@dev",
+		"nette/di": "~2.3",
+		"nette/bootstrap": "~2.3",
+		"nette/reflection": "~2.3",
 		"nette/neon": "~2.3",
 		"nette/tester": "~1.7",
 		"jakub-onderka/php-parallel-lint": "~0.8"

diff --git a/src/RM/SMSender/BaseSender.php b/src/RM/SMSender/BaseSender.php
@@ -3,14 +3,16 @@
 namespace RM\SMSender;
 
 use GuzzleHttp;
-use Nette\Object;
+use Nette\SmartObject;
 use Nette\Utils\Strings;
 
 /**
  * Base Sender
  */
-abstract class BaseSender extends Object implements ISender
+abstract class BaseSender implements ISender
 {
+	use SmartObject;
+
 	/** @var callable[] function (IMessage $message); Occurs before send SMS. */
 	public $onBeforeSend;
 

diff --git a/src/RM/SMSender/DI/SMSenderExtension.php b/src/RM/SMSender/DI/SMSenderExtension.php
@@ -2,6 +2,7 @@
 
 namespace RM\SMSender\DI;
 
+use Nette\Reflection\ClassType;
 use Nette\Configurator;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
@@ -36,7 +37,7 @@ public function beforeCompile()
 
 		foreach ($config as $method => $value) {
 			$tmp = new $config['senderClass'];
-			if ($tmp->getReflection()->hasMethod($method)) {
+			if ((new ClassType($tmp))->hasMethod($method)) {
 				$sender->addSetup($method, [$value]);
 			}
 		}

diff --git a/src/RM/SMSender/EuroSms/Message.php b/src/RM/SMSender/EuroSms/Message.php
@@ -2,7 +2,6 @@
 
 namespace RM\SMSender\EuroSms;
 
-use Nette\Object;
 use Nette\Utils\Strings;
 use RM\SMSender;
 use RM\SMSender\InvalidArgumentException;

diff --git a/src/RM/SMSender/Message.php b/src/RM/SMSender/Message.php
@@ -2,13 +2,12 @@
 
 namespace RM\SMSender;
 
-use Nette\Object;
 use RM\SMSender\IMessage;
 
 /**
  * Basic implementation of Message.
  */
-class Message extends Object implements IMessage
+class Message implements IMessage
 {
 	/** @var string */
 	protected $from;

diff --git a/src/RM/SMSender/MessageFactory.php b/src/RM/SMSender/MessageFactory.php
@@ -2,9 +2,9 @@
 
 namespace RM\SMSender;
 
-use Nette\Object;
+use Nette\Reflection\ClassType;
 
-class MessageFactory extends Object implements IMessageFactory
+class MessageFactory implements IMessageFactory
 {
 	/**
 	 * @var string
@@ -24,7 +24,7 @@ public function create()
 	{
 		$message = new $this->class;
 		foreach ($this->params as $method => $value) {
-			if ($message->getReflection()->hasMethod($method)) {
+			if ((new ClassType($message))->hasMethod($method)) {
 				$message->$method($value);
 			}
 		}

diff --git a/tests/php-unix.ini b/tests/php-unix.ini
@@ -1 +1,3 @@
 extension=json.so
+extension=iconv.so
+extension=tokenizer.so