Merge pull request #10 from jakubkulhan/sf4

Symfony 4.0 support, dropped autoscanning

.travis.yml

@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - nightly
 
 cache:
   directories:
@@ -16,14 +14,19 @@ env:
     - PREFER_LOWEST="--prefer-lowest"
     - PREFER_LOWEST=""
 
+matrix:
+  allow_failures:
+    - php: nightly
+
+
 install:
   - composer update $PREFER_LOWEST
 
 before_script:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then PHPUNIT_FLAGS="--coverage-clover coverage.xml"; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then PHPUNIT_FLAGS="--coverage-clover coverage.xml"; fi
 
 script:
   - phpunit $PHPUNIT_FLAGS
 
 after_script:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi

Annotation/Component.php

@@ -8,11 +8,4 @@
  */
 class Component
 {
-
-	/** @var string service ID */
-	public $name;
-
-	/** @var string service environments */
-	public $env;
-
 }

DependencyInjection/ClassMultiMap.php

@@ -1,9 +1,9 @@
 <?php
 namespace Skrz\Bundle\AutowiringBundle\DependencyInjection;
 
-use ReflectionClass;
 use Skrz\Bundle\AutowiringBundle\Exception\MultipleValuesException;
 use Skrz\Bundle\AutowiringBundle\Exception\NoValueException;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Maps from class name, all its parents, and implemented interfaces to certain value
@@ -13,16 +13,28 @@
 class ClassMultiMap
 {
 
-	/** @var string[] */
+	/** @var ContainerBuilder */
+	private $containerBuilder;
+
+	/** @var string[][] */
 	private $classes = [];
 
+	public function __construct(ContainerBuilder $containerBuilder)
+	{
+		$this->containerBuilder = $containerBuilder;
+	}
+
 	/**
 	 * @param string $className
 	 * @param string $value
+	 * @return void
 	 */
-	public function put($className, $value)
+	public function put(string $className, string $value)
 	{
-		$reflectionClass = new ReflectionClass($className);
+		$reflectionClass = $this->containerBuilder->getReflectionClass($className, false);
+		if ($reflectionClass === null) {
+			return;
+		}
 
 		foreach ($reflectionClass->getInterfaceNames() as $interfaceName) {
 			if (!isset($this->classes[$interfaceName])) {
@@ -43,7 +55,7 @@ public function put($className, $value)
 	 * @param string $className
 	 * @return string
 	 */
-	public function getSingle($className)
+	public function getSingle(string $className): string
 	{
 		if (!isset($this->classes[$className])) {
 			throw new NoValueException(sprintf("Key '%s'.", $className));
@@ -62,7 +74,7 @@ public function getSingle($className)
 	 * @param string $className
 	 * @return string[]
 	 */
-	public function getMulti($className)
+	public function getMulti(string $className): array
 	{
 		if (!isset($this->classes[$className])) {
 			return [];
@@ -71,4 +83,12 @@ public function getMulti($className)
 		return $this->classes[$className];
 	}
 
+	/**
+	 * @return string[][]
+	 */
+	public function all(): array
+	{
+		return $this->classes;
+	}
+
 }