Fix deprecated ObjectMixin method (#326)

* fix deprecated Nette ObjectMixin methods * fix phpstan + indentation
Kdyby · Aug 10, 2018 · 95f6e35 · 95f6e35
1 parent d81cbcb
commit 95f6e35
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		"kdyby/doctrine-cache": "^2.6.1",
 		"kdyby/strict-objects": "^1.0",
 		"nette/di": "^2.4@dev",
-		"nette/utils": "^2.4@dev",
+		"nette/utils": "^2.5@dev",
 		"nette/finder": "^2.4@dev"
 	},
 	"require-dev": {

diff --git a/src/Kdyby/Doctrine/Connection.php b/src/Kdyby/Doctrine/Connection.php
@@ -143,12 +143,7 @@ public function insert($tableExpression, array $data, array $types = [])
 
 
 	/**
-	 * @param string $query
-	 * @param array $params
-	 * @param array $types
-	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile $qcp
-	 * @return \Doctrine\DBAL\Driver\Statement
-	 * @throws DBALException
+	 * {@inheritdoc}
 	 */
 	public function executeQuery($query, array $params = [], $types = [], Doctrine\DBAL\Cache\QueryCacheProfile $qcp = NULL)
 	{

diff --git a/src/Kdyby/Doctrine/Diagnostics/Panel.php b/src/Kdyby/Doctrine/Diagnostics/Panel.php
@@ -388,8 +388,7 @@ public static function renderException($e, Nette\DI\Container $dic)
 
 			if ($invalidTable = Strings::match($e->getMessage(), '~table \'(.*?)\'~i')) {
 				foreach ($em->getMetadataFactory()->getAllMetadata() as $class) {
-					/** @var Kdyby\Doctrine\Mapping\ClassMetadata $class */
-					if ($class->getTableName() === $invalidTable[1]) {
+					if ($class instanceof Doctrine\ORM\Mapping\ClassMetadata && $class->getTableName() === $invalidTable[1]) {
 						$refl = $class->getReflectionClass();
 						break;
 					}

diff --git a/src/Kdyby/Doctrine/Entities/MagicAccessors.php b/src/Kdyby/Doctrine/Entities/MagicAccessors.php
@@ -8,15 +8,14 @@
 
 namespace Kdyby\Doctrine\Entities;
 
-use Doctrine;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
 use Kdyby;
 use Kdyby\Doctrine\Collections\ReadOnlyCollectionWrapper;
 use Kdyby\Doctrine\MemberAccessException;
 use Kdyby\Doctrine\UnexpectedValueException;
 use Nette;
 use Nette\Utils\Callback;
+use Nette\Utils\ObjectHelpers;
 use Nette\Utils\ObjectMixin;
 
 
@@ -261,7 +260,7 @@ public function __call($name, $args)
 	 */
 	public static function __callStatic($name, $args)
 	{
-		ObjectMixin::callStatic(get_called_class(), $name, $args);
+		ObjectHelpers::strictStaticCall(get_called_class(), $name);
 		return NULL;
 	}
 
@@ -428,7 +427,10 @@ public function __isset($name)
 	 */
 	public function __unset($name)
 	{
-		ObjectMixin::remove($this, $name);
+		$class = get_class($this);
+		if (!ObjectHelpers::hasProperty($class, $name)) {
+			throw new Nette\MemberAccessException("Cannot unset the property $class::\$$name.");
+		}
 	}