diff --git a/.travis.yml b/.travis.yml
index c5256e73f9c..6835dc6fd9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
       if [[ $RUN_RECTOR == true ]]; then
           bin/rector process src --set symfony40 --dry-run
           composer docs
-          php bin/check_class_existance_in_yaml_configs.php
+          php bin/check_services_in_yaml_configs.php
       fi
 
     # Eat your own dog food
diff --git a/bin/check_class_existance_in_yaml_configs.php b/bin/check_class_existance_in_yaml_configs.php
deleted file mode 100644
index 175df249a8d..00000000000
--- a/bin/check_class_existance_in_yaml_configs.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php declare(strict_types=1);
-
-use Nette\Utils\Strings;
-use Rector\Exception\ShouldNotHappenException;
-use Rector\NodeTypeResolver\ClassExistenceStaticHelper;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\SplFileInfo;
-use Symfony\Component\Yaml\Yaml;
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$finder = (new Finder())->name('*.yaml')
-    ->in(__DIR__ . '/../config')
-    ->files();
-
-/** @var SplFileInfo $splFileInfo */
-foreach ($finder as $splFileInfo) {
-    $yamlContent = Yaml::parseFile($splFileInfo->getRealPath());
-    if (! isset($yamlContent['services'])) {
-        continue;
-    }
-
-    foreach (array_keys($yamlContent['services']) as $service) {
-        // configuration → skip
-        if (Strings::startsWith($service, '_')) {
-            continue;
-        }
-
-        // autodiscovery → skip
-        if (Strings::endsWith($service, '\\')) {
-            continue;
-        }
-
-        if (ClassExistenceStaticHelper::doesClassLikeExist($service)) {
-            continue;
-        }
-
-        throw new ShouldNotHappenException(sprintf(
-            'Service "%s" from config "%s" was not found. Check if it really exists or is even autoload, please',
-            $service,
-            $splFileInfo->getRealPath()
-        ));
-    }
-}
-
-echo 'All configs have existing services - good job!' . PHP_EOL;
diff --git a/bin/check_services_in_yaml_configs.php b/bin/check_services_in_yaml_configs.php
new file mode 100644
index 00000000000..637be6a8152
--- /dev/null
+++ b/bin/check_services_in_yaml_configs.php
@@ -0,0 +1,127 @@
+<?php declare(strict_types=1);
+
+use Nette\Utils\Strings;
+use Rector\Exception\ShouldNotHappenException;
+use Rector\NodeTypeResolver\ClassExistenceStaticHelper;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
+use Symfony\Component\Yaml\Yaml;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+$yamlConfigFileProvider = new YamlConfigFileProvider();
+$serviceConfigurationValidator = new ServiceConfigurationValidator();
+
+foreach ($yamlConfigFileProvider->provider() as $configFileInfo) {
+    $yamlContent = Yaml::parseFile($configFileInfo->getRealPath());
+    if (! isset($yamlContent['services'])) {
+        continue;
+    }
+
+    foreach ($yamlContent['services'] as $service => $serviceConfiguration) {
+        // configuration → skip
+        if (Strings::startsWith($service, '_')) {
+            continue;
+        }
+
+        // autodiscovery → skip
+        if (Strings::endsWith($service, '\\')) {
+            continue;
+        }
+
+        if (! ClassExistenceStaticHelper::doesClassLikeExist($service)) {
+            throw new ShouldNotHappenException(sprintf(
+                'Service "%s" from config "%s" was not found. Check if it really exists or is even autoload, please',
+                $service,
+                $configFileInfo->getRealPath()
+            ));
+        }
+
+        $serviceConfigurationValidator->validate($service, $serviceConfiguration, $configFileInfo);
+    }
+}
+
+
+class YamlConfigFileProvider
+{
+    /**
+     * @return SplFileInfo[]
+     */
+    public function provider(): array
+    {
+        $finder = (new Finder())->name('*.yaml')
+            ->in(__DIR__ . '/../config')
+            ->files();
+
+        return iterator_to_array($finder->getIterator());
+    }
+}
+
+class ServiceConfigurationValidator
+{
+    /**
+     * @param mixed $configuration
+     */
+    public function validate(string $serviceClass, $configuration, SplFileInfo $configFileInfo): void
+    {
+        if (! is_array($configuration)) {
+            return;
+        }
+
+        foreach (array_keys($configuration) as $key) {
+            if (! $this->isArgumentName($key)) {
+                continue;
+            }
+
+            $constructorParameterNames = $this->resolveClassConstructorArgumentNames($serviceClass);
+            if (in_array($key, $constructorParameterNames, true)) {
+                continue;
+            }
+
+            throw new ShouldNotHappenException(sprintf(
+                'Service "%s" has unused argument "%s" in config "%s".%sCorrect it to one of existing arguments "%s".',
+                $serviceClass,
+                $key,
+                $configFileInfo->getRealPath(),
+                PHP_EOL,
+                implode('", "', $constructorParameterNames)
+            ));
+        }
+    }
+
+    /**
+     * @param mixed $key
+     */
+    private function isArgumentName($key): bool
+    {
+        if (! is_string($key)) {
+            return false;
+        }
+
+        return Strings::startsWith($key, '$');
+    }
+
+    /**
+     * @return string[]
+     */
+    private function resolveClassConstructorArgumentNames(string $class): array
+    {
+        $reflectionClass = new ReflectionClass($class);
+        $constructorReflection = $reflectionClass->getConstructor();
+
+        if ($constructorReflection === null) {
+            return [];
+        }
+
+        $constructorParameterNames = [];
+        foreach ($constructorReflection->getParameters() as $parameterReflection) {
+            $constructorParameterNames[] = '$' . $parameterReflection->getName();
+        }
+
+        sort($constructorParameterNames);
+
+        return $constructorParameterNames;
+    }
+}
+
+echo 'All configs have existing services - good job!' . PHP_EOL;
diff --git a/config/set/jms/jms-decouple.yaml b/config/set/jms/jms-decouple.yaml
index bc73a57f624..5d197e81d1f 100644
--- a/config/set/jms/jms-decouple.yaml
+++ b/config/set/jms/jms-decouple.yaml
@@ -1,3 +1,4 @@
 services:
     Rector\Rector\Property\InjectAnnotationClassRector:
-        $annotationClass: 'JMS\DiExtraBundle\Annotation\Inject'
+        $annotationClasses:
+            - 'JMS\DiExtraBundle\Annotation\Inject'
diff --git a/config/set/php-di/php-di-decouple.yaml b/config/set/php-di/php-di-decouple.yaml
index a0d60e7f950..a2b800ec1e1 100644
--- a/config/set/php-di/php-di-decouple.yaml
+++ b/config/set/php-di/php-di-decouple.yaml
@@ -1,3 +1,4 @@
 services:
     Rector\Rector\Property\InjectAnnotationClassRector:
-        $annotationClass: 'Inject'
+        $annotationClasses:
+            - 'DI\Annotation\Inject'