ServiceDefinition::setImplementType() and getImplementType() renamed to setImplementMode() & getImplementMode()

Author: dg

src/DI/ContainerBuilder.php

@@ -406,7 +406,7 @@ private function resolveImplement(ServiceDefinition $def, $name)
 		if (count($rc->getMethods()) !== 1 || !$method || $method->isStatic()) {
 			throw new ServiceCreationException("Interface $interface used in service '$name' must have just one non-static method create() or get().");
 		}
-		$def->setImplementType($methodName = $rc->hasMethod('create') ? 'create' : 'get');
+		$def->setImplementMode($methodName = $rc->hasMethod('create') ? $def::IMPLEMENT_MODE_CREATE : $def::IMPLEMENT_MODE_GET);
 
 		if (!$def->getClass() && !$def->getEntity()) {
 			$returnType = PhpReflection::getReturnType($method);
@@ -552,7 +552,7 @@ public function complete()
 			$this->currentService = NULL;
 			$entity = $def->getFactory()->getEntity();
 			$serviceRef = $this->getServiceName($entity);
-			$factory = $serviceRef && !$def->getFactory()->arguments && !$def->getSetup() && $def->getImplementType() !== 'create'
+			$factory = $serviceRef && !$def->getFactory()->arguments && !$def->getSetup() && $def->getImplementMode() !== $def::IMPLEMENT_MODE_CREATE
 				? new Statement(['@' . self::THIS_CONTAINER, 'getService'], [$serviceRef])
 				: $def->getFactory();
 
@@ -799,7 +799,7 @@ private function generateService($name)
 
 		$entity = $def->getFactory()->getEntity();
 		$serviceRef = $this->getServiceName($entity);
-		$factory = $serviceRef && !$def->getFactory()->arguments && !$def->getSetup() && $def->getImplementType() !== 'create'
+		$factory = $serviceRef && !$def->getFactory()->arguments && !$def->getSetup() && $def->getImplementMode() !== $def::IMPLEMENT_MODE_CREATE
 			? new Statement(['@' . self::THIS_CONTAINER, 'getService'], [$serviceRef])
 			: $def->getFactory();
 
@@ -839,7 +839,7 @@ private function generateService($name)
 			->addParameter('container')
 				->setTypeHint($this->className);
 
-		$factoryClass->addMethod($def->getImplementType())
+		$factoryClass->addMethod($def->getImplementMode())
 			->setParameters($this->convertParameters($def->parameters))
 			->setBody(str_replace('$this', '$this->container', $code))
 			->setReturnType(PHP_VERSION_ID >= 70000 ? $def->getClass() : NULL);

src/DI/ServiceDefinition.php

@@ -19,6 +19,10 @@
  */
 class ServiceDefinition
 {
+	const
+		IMPLEMENT_MODE_CREATE = 'create',
+		IMPLEMENT_MODE_GET = 'get';
+
 	use Nette\SmartObject;
 
 	/** @var string|NULL  class or interface name */
@@ -46,7 +50,7 @@ class ServiceDefinition
 	private $implement;
 
 	/** @var string|NULL  create | get */
-	private $implementType;
+	private $implementMode;
 
 	/** @var callable */
 	private $notifier = 'pi'; // = noop
@@ -284,22 +288,38 @@ public function getImplement()
 	 * @param  string
 	 * @return self
 	 */
-	public function setImplementType($type)
+	public function setImplementMode($mode)
 	{
-		if (!in_array($type, ['get', 'create'], TRUE)) {
+		if (!in_array($mode, [self::IMPLEMENT_MODE_CREATE, self::IMPLEMENT_MODE_GET], TRUE)) {
 			throw new Nette\InvalidArgumentException('Argument must be get|create.');
 		}
-		$this->implementType = $type;
+		$this->implementMode = $mode;
 		return $this;
 	}
 
 
 	/**
 	 * @return string|NULL
 	 */
+	public function getImplementMode()
+	{
+		return $this->implementMode;
+	}
+
+
+	/** @deprecated */
+	public function setImplementType($type)
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use setImplementMode()', E_USER_DEPRECATED);
+		return $this->setImplementMode($type);
+	}
+
+
+	/** @deprecated */
 	public function getImplementType()
 	{
-		return $this->implementType;
+		trigger_error(__METHOD__ . '() is deprecated, use getImplementMode()', E_USER_DEPRECATED);
+		return $this->implementMode;
 	}