ObjectMixin -> ObjectHelpers

composer.json

@@ -19,7 +19,7 @@
 		"ext-tokenizer": "*",
 		"nette/neon": "^2.3.3 || ~3.0.0",
 		"nette/php-generator": "^3.0",
-		"nette/utils": "^2.4.3 || ~3.0.0"
+		"nette/utils": "^2.5 || ~3.0.0"
 	},
 	"require-dev": {
 		"nette/tester": "^2.0",

src/DI/Compiler.php

@@ -213,7 +213,7 @@ public function processExtensions()
 			throw new Nette\DeprecatedException("Extensions '$extra' were added while container was being compiled.");
 
 		} elseif ($extra = key(array_diff_key($this->config, self::$reserved, $this->extensions))) {
-			$hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys(self::$reserved + $this->extensions), $extra);
+			$hint = Nette\Utils\ObjectHelpers::getSuggestion(array_keys(self::$reserved + $this->extensions), $extra);
 			throw new Nette\InvalidStateException(
 				"Found section '$extra' in configuration, but corresponding extension is missing"
 				. ($hint ? ", did you mean '$hint'?" : '.')
@@ -328,7 +328,7 @@ public static function loadDefinition(ServiceDefinition $definition, $config, st
 		$known = ['type', 'class', 'factory', 'arguments', 'setup', 'autowired', 'dynamic', 'inject', 'parameters', 'implement', 'run', 'tags', 'alteration'];
 		if ($error = array_diff(array_keys($config), $known)) {
 			$hints = array_filter(array_map(function ($error) use ($known) {
-				return Nette\Utils\ObjectMixin::getSuggestion($known, $error);
+				return Nette\Utils\ObjectHelpers::getSuggestion($known, $error);
 			}, $error));
 			$hint = $hints ? ", did you mean '" . implode("', '", $hints) . "'?" : '.';
 			throw new Nette\InvalidStateException(sprintf("Unknown key '%s' in definition of service$hint", implode("', '", $error)));

src/DI/CompilerExtension.php

@@ -70,7 +70,7 @@ public function validateConfig(array $expected, array $config = null, string $na
 		}
 		if ($extra = array_diff_key((array) $config, $expected)) {
 			$name = $name ?: $this->name;
-			$hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys($expected), key($extra));
+			$hint = Nette\Utils\ObjectHelpers::getSuggestion(array_keys($expected), key($extra));
 			$extra = $hint ? key($extra) : implode(", $name.", array_keys($extra));
 			throw new Nette\InvalidStateException("Unknown configuration option $name.$extra" . ($hint ? ", did you mean $name.$hint?" : '.'));
 		}

src/DI/ContainerBuilder.php

@@ -418,7 +418,7 @@ private function resolveImplement(ServiceDefinition $def, $name)
 					}
 					$def->getFactory()->arguments[$arg->getPosition()] = self::literal('$' . $arg->getName());
 				} elseif (!$def->getSetup()) {
-					$hint = Nette\Utils\ObjectMixin::getSuggestion(array_keys($ctorParams), $param->getName());
+					$hint = Nette\Utils\ObjectHelpers::getSuggestion(array_keys($ctorParams), $param->getName());
 					throw new ServiceCreationException("Unused parameter \${$param->getName()} when implementing method $methodName" . ($hint ? ", did you mean \${$hint}?" : '.'));
 				}
 				$nullable = $hint && $param->allowsNull() && (!$param->isDefaultValueAvailable() || $param->getDefaultValue() !== null);