Merge branch 'develop'

* develop:
  test to build a stack of more than 3 services
  allow the lowest stack service to be from a dependency
  add codecov
  throw a custom exception when service not found
  remove the fixtures folder from the coverage report

.travis.yml

@@ -7,3 +7,5 @@ script: vendor/bin/phpunit --coverage-clover=coverage.clover
 after_script:
     - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
     - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+after_success:
+    - bash <(curl -s https://codecov.io/bash)

phpunit.xml.dist

@@ -13,6 +13,7 @@
             <exclude>
                 <directory>./tests</directory>
                 <directory>./vendor</directory>
+                <directory>./fixtures</directory>
             </exclude>
         </whitelist>
     </filter>

src/Exception/ServiceNotFound.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types = 1);
+
+namespace Innmind\Compose\Exception;
+
+final class ServiceNotFound extends LogicException
+{
+}

src/Services.php

@@ -12,7 +12,8 @@
     Compilation,
     Exception\ArgumentNotProvided,
     Exception\ArgumentNotDefined,
-    Exception\CircularDependency
+    Exception\CircularDependency,
+    Exception\ServiceNotFound,
 };
 use Innmind\Immutable\{
     Sequence,
@@ -84,22 +85,29 @@ public function expose(Name $name, Name $as): self
 
     public function stack(Name $name, Name $highest, Name $lower, Name ...$rest): self
     {
-        $stack = Sequence::of($lower, ...$rest)->reverse();
+        $stack = Sequence::of($highest, $lower, ...$rest)->reverse();
         $stacked = Sequence::of(
-            $this->get($stack->first())
+            $this->decorate(
+                $stack->get(1),
+                $stack->first(),
+                $stack->size() === 2 ? $name : null
+            )
         );
 
-        $stacked = $stack->drop(1)->reduce(
+        $stacked = $stack->drop(2)->dropEnd(1)->reduce(
             $stacked,
             function(Sequence $stacked, Name $decorator): Sequence {
                 return $stacked->add(
                     $this->decorate($decorator, $stacked->last()->name())
                 );
             }
         );
-        $stacked = $stacked->add(
-            $this->decorate($highest, $stacked->last()->name(), $name)
-        );
+
+        if ($stack->size() > 2) {
+            $stacked = $stacked->add(
+                $this->decorate($highest, $stacked->last()->name(), $name)
+            );
+        }
 
         $self = clone $this;
         $self->definitions = $stacked->reduce(
@@ -201,8 +209,16 @@ public function get(Name $name): Service
         try {
             return $this->definitions->get((string) $name);
         } catch (\Exception $e) {
+            //pass
+        }
+
+        try {
             return $this->exposed->get((string) $name);
+        } catch (\Exception $e) {
+            //pass
         }
+
+        throw new ServiceNotFound((string) $name);
     }
 
     /**

tests/ServicesTest.php

@@ -20,6 +20,7 @@
     Definition\Dependency,
     Exception\CircularDependency,
     Exception\ArgumentNotProvided,
+    Exception\ServiceNotFound,
     Compilation\Services as CompiledServices
 };
 use Innmind\Immutable\{
@@ -415,6 +416,12 @@ public function testStack()
                 new Name('low'),
                 Construct::fromString(Str::of(Low::class))
             ),
+            new Service(
+                new Name('middle'),
+                Construct::fromString(Str::of(Middle::class)),
+                $this->args->load('@decorated'),
+                $this->args->load('foo')
+            ),
             new Service(
                 new Name('high'),
                 Construct::fromString(Str::of(High::class)),
@@ -425,6 +432,7 @@ public function testStack()
         $services2 = $services->stack(
             new Name('stack'),
             new Name('high'),
+            new Name('middle'),
             new Name('dep.bar'),
             new Name('low')
         );
@@ -434,7 +442,7 @@ public function testStack()
         $this->assertFalse($services->has(new Name('stack')));
         $this->assertTrue($services2->has(new Name('stack')));
         $this->assertSame(
-            'high|middle|low|middle|high',
+            'high|foo|middle|low|middle|foo|high',
             $services2->build(new Name('stack'))()
         );
     }
@@ -550,4 +558,51 @@ public function testCompile()
 
         $this->assertInstanceOf(CompiledServices::class, $services->compile());
     }
+
+    public function testThrowWhenTryingToGetUnknownService()
+    {
+        $this->expectException(ServiceNotFound::class);
+        $this->expectExceptionMessage('foo');
+
+        (new Services(
+            new Arguments,
+            new Dependencies
+        ))->get(new Name('foo'));
+    }
+
+    public function testTheLowestStackServiceCanComeFromADependeny()
+    {
+        $services = new Services(
+            new Arguments,
+            new Dependencies(
+                new Dependency(
+                    new Name('dep'),
+                    new Services(
+                        new Arguments,
+                        new Dependencies,
+                        (new Service(
+                            new Name('foo'),
+                            Construct::fromString(Str::of(Low::class))
+                        ))->exposeAs(new Name('bar'))
+                    )
+                )
+            ),
+            new Service(
+                new Name('middle'),
+                Construct::fromString(Str::of(Middle::class)),
+                $this->args->load('@decorated')
+            )
+        );
+
+        $services2 = $services->stack(
+            new Name('stack'),
+            new Name('middle'),
+            new Name('dep.bar')
+        );
+
+        $this->assertSame(
+            'middle|low|middle',
+            $services2->build(new Name('stack'))()
+        );
+    }
 }