Alias are not fetched, imroved coverage

Author: egulias

Tag/TagFetcher.php

@@ -21,11 +21,7 @@ public function fetch(FilterList $filters, $showPrivate = false)
         $definitions = $this->builder->getDefinitions();
 
         foreach ($definitions as $definition) {
-            if ($this->showOnyPublic($definition, $showPrivate)) {
-                continue;
-            }
-
-            if ($definition instanceof Alias) {
+            if ($this->DontShowPrivate($definition, $showPrivate)) {
                 continue;
             }
 
@@ -35,9 +31,9 @@ public function fetch(FilterList $filters, $showPrivate = false)
         return $this->tags;
     }
 
-    private function showOnyPublic(Definition $definition, $showPrivate = false)
+    private function DontShowPrivate(Definition $definition, $showPrivate = false)
     {
-        if ($showPrivate && !$definition->isPublic()) {
+        if (!$showPrivate && !$definition->isPublic()) {
             return true;
         }
 

Tests/Tag/Filter/AttributeValueTest.php

@@ -21,7 +21,16 @@ public function testFilterByNotExistentAttribute()
         $attributeName = 'test';
         $string = 'value';
         $tag = new Tag('dummy_tag', array($attributeName => 'value'));
-        $filter = new Filter\AttributeValue($attributeName, 'not-exists');
+        $filter = new Filter\AttributeValue('fake-name', 'not-exists');
+        $this->assertFalse($filter->isValid($tag));
+    }
+
+    public function testFilterAttributeIsNotValid()
+    {
+        $attributeName = 'test';
+        $string = 'value2';
+        $tag = new Tag('dummy_tag', array($attributeName => 'value'));
+        $filter = new Filter\AttributeValue($attributeName, $string);
         $this->assertFalse($filter->isValid($tag));
     }
 }

Tests/Tag/TagFetcherTest.php

@@ -75,4 +75,58 @@ public function testFetchTagsFilteredWithMany()
         $this->assertCount(1, $tags);
         $this->assertCount(1, $tags['custom_tag_name']);
     }
+
+    public function testFetchTagsDefinitionHasNoTags()
+    {
+        $container = new ContainerBuilder();
+        $container->register('dummy_service', 'Egulias\Tests\ServiceDummy');
+
+        $fetcher = new TagFetcher($container);
+
+        $filters = new FilterList();
+        $filters->append(new Name('custom_tag_name'));
+        $tags = $fetcher->fetch($filters);
+
+        $this->assertCount(0, $tags);
+    }
+
+    public function testFetchTagsFromPublicDefinitionsOnly()
+    {
+        $container = new ContainerBuilder();
+        $definition1 = $container->register('dummy_service', 'Egulias\Tests\ServiceDummy');
+        $definition1
+            ->addTag('custom_tag_name', array('method' => 'name', 'number' => 8, 'another' => 'attribute'))
+            ->setPublic(true);
+        $definition2 = $container->register('another_dummy_service', 'Egulias\Tests\Service2Dummy');
+        $definition2
+            ->addTag('custom_tag_name', array('method' => 'name', 'number' => 10, 'another' => 'attribute'))
+            ->setPublic(false);
+
+        $fetcher = new TagFetcher($container);
+
+        $filters = new FilterList();
+        $filters->append(new Name('custom_tag_name'));
+        $tags = $fetcher->fetch($filters);
+
+        $this->assertCount(1, $tags);
+        $this->assertCount(1, $tags['custom_tag_name']);
+    }
+
+    public function testFetchTagsDefinitionIsAlias()
+    {
+        $container = new ContainerBuilder();
+        $definition1 = $container->register('dummy_service', 'Egulias\Tests\ServiceDummy');
+        $definition1
+            ->addTag('custom_tag_name', array('method' => 'name', 'number' => 8, 'another' => 'attribute'))
+            ->setPublic(true);
+        $container->setAlias('alias_service', 'dummy_service');
+        $fetcher = new TagFetcher($container);
+
+        $filters = new FilterList();
+        $filters->append(new Name('custom_tag_name'));
+        $tags = $fetcher->fetch($filters);
+
+        $this->assertCount(1, $tags);
+        $this->assertCount(1, $tags['custom_tag_name']);
+    }
 }

composer.json

@@ -12,7 +12,6 @@
   }
   ],
     "require":      {
-        "symfony/event-dispatcher": "~2.3",
         "symfony/dependency-injection": "~2.3"
     },
     "require-dev": {