Add new files loader

Makefile

@@ -63,6 +63,7 @@ phpstan: vendor-bin/phpstan/vendor
 
 cs:             ## Run the CS Fixer
 cs:	vendor-bin/php-cs-fixer/vendor
+	rm -rf fixtures/Bridge/Symfony/Application/cache/*
 	$(PHP_CS_FIXER) fix
 
 

fixtures/Integration/another_dummy.yml

@@ -0,0 +1,2 @@
+stdClass:
+    another_dummy: {}

fixtures/Integration/dummy.yml

@@ -0,0 +1,2 @@
+stdClass:
+    dummy: {}

fixtures/Loader/IsolatedLoader.php

@@ -15,13 +15,14 @@
 
 use Nelmio\Alice\DataLoaderInterface;
 use Nelmio\Alice\FileLoaderInterface;
+use Nelmio\Alice\FilesLoaderInterface;
 use Nelmio\Alice\ObjectSet;
 
 /**
  * Make use of NativeLoader for easy usage but ensure than no state is kept between each usage, perfect for isolated
  * tests.
  */
-class IsolatedLoader implements FileLoaderInterface, DataLoaderInterface
+class IsolatedLoader implements FilesLoaderInterface, FileLoaderInterface, DataLoaderInterface
 {
     /**
      * @inheritdoc
@@ -31,6 +32,14 @@ public function loadData(array $data, array $parameters = [], array $objects = [
         return (new NativeLoader())->loadData($data, $parameters, $objects);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function loadFiles(array $files, array $parameters = [], array $objects = []): ObjectSet
+    {
+        return (new NativeLoader())->loadFiles($files, $parameters, $objects);
+    }
+
     /**
      * @inheritdoc
      */

fixtures/Loader/NonIsolatedSymfonyLoader.php

@@ -15,10 +15,11 @@
 
 use Nelmio\Alice\DataLoaderInterface;
 use Nelmio\Alice\FileLoaderInterface;
+use Nelmio\Alice\FilesLoaderInterface;
 use Nelmio\Alice\ObjectSet;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class NonIsolatedSymfonyLoader implements FileLoaderInterface, DataLoaderInterface
+class NonIsolatedSymfonyLoader implements FilesLoaderInterface, FileLoaderInterface, DataLoaderInterface
 {
     /**
      * @var ContainerInterface
@@ -38,6 +39,14 @@ public function loadData(array $data, array $parameters = [], array $objects = [
         return $this->container->get('nelmio_alice.data_loader')->loadData($data, $parameters, $objects);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function loadFiles(array $files, array $parameters = [], array $objects = []): ObjectSet
+    {
+        return $this->container->get('nelmio_alice.files_loader')->loadFiles($files, $parameters, $objects);
+    }
+
     /**
      * @inheritdoc
      */

src/Bridge/Symfony/Resources/config/loader.xml

@@ -22,6 +22,7 @@
             <argument type="service" id="nelmio_alice.generator" />
         </service>
 
+
         <service id="nelmio_alice.file_loader" public="true"
                  alias="nelmio_alice.file_loader.simple" />
 
@@ -31,6 +32,16 @@
             <argument type="service" id="nelmio_alice.data_loader" />
         </service>
 
+
+        <service id="nelmio_alice.files_loader" public="true"
+                 alias="nelmio_alice.files_loader.simple" />
+
+        <service id="nelmio_alice.files_loader.simple"
+                 class="Nelmio\Alice\Loader\SimpleFilesLoader">
+            <argument type="service" id="nelmio_alice.file_parser" />
+            <argument type="service" id="nelmio_alice.data_loader" />
+        </service>
+
     </services>
 
 </container>

src/FilesLoaderInterface.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Alice package.
+ *
+ * (c) Nelmio <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Nelmio\Alice;
+
+use Nelmio\Alice\Throwable\LoadingThrowable;
+
+/**
+ * Main interface of the library.
+ */
+interface FilesLoaderInterface
+{
+    /**
+     * Loads a collection of fixture files.
+     *
+     * @param string[] $files       Files to load.
+     * @param array    $parameters Additional parameters to inject.
+     * @param array    $objects    Additional objects to inject.
+     *
+     * @throws LoadingThrowable
+     *
+     * @return ObjectSet Contains the list of objects and parameters loaded and injected.
+     */
+    public function loadFiles(array $files, array $parameters = [], array $objects = []): ObjectSet;
+}

src/Loader/NativeLoader.php

@@ -19,6 +19,7 @@
 use Nelmio\Alice\Faker\Provider\AliceProvider;
 use Nelmio\Alice\FileLoaderInterface;
 use Nelmio\Alice\FileLocator\DefaultFileLocator;
+use Nelmio\Alice\FilesLoaderInterface;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\Chainable\CollectionDenormalizerWithTemporaryFixture;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\Chainable\NullListNameDenormalizer;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\Chainable\NullRangeNameDenormalizer;
@@ -171,6 +172,7 @@
  *
  * @method DataLoaderInterface getDataLoader()
  * @method FileLoaderInterface getFileLoader()
+ * @method FilesLoaderInterface getFilesLoader()
  * @method FixtureBuilderInterface getFixtureBuilder()
  * @method GeneratorInterface getGenerator()
  * @method ParserInterface getParser()
@@ -198,7 +200,7 @@
  * @method CallerInterface getCaller()
  * @method CallProcessorInterface getCallProcessor()
  */
-class NativeLoader implements FileLoaderInterface, DataLoaderInterface
+class NativeLoader implements FilesLoaderInterface, FileLoaderInterface, DataLoaderInterface
 {
     use IsAServiceTrait;
 
@@ -219,6 +221,11 @@ class NativeLoader implements FileLoaderInterface, DataLoaderInterface
      */
     private $fileLoader;
 
+    /**
+     * @var FilesLoaderInterface
+     */
+    private $filesLoader;
+
     /**
      * @var DataLoaderInterface
      */
@@ -229,6 +236,15 @@ public function __construct(FakerGenerator $fakerGenerator = null)
         $this->fakerGenerator = (null === $fakerGenerator) ? $this->getFakerGenerator() : $fakerGenerator;
         $this->dataLoader = $this->getDataLoader();
         $this->fileLoader = $this->getFileLoader();
+        $this->filesLoader = $this->getFilesLoader();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function loadFiles(array $files, array $parameters = [], array $objects = []): ObjectSet
+    {
+        return $this->filesLoader->loadFiles($files, $parameters, $objects);
     }
 
     /**
@@ -263,6 +279,14 @@ protected function createFileLoader(): FileLoaderInterface
         );
     }
 
+    protected function createFilesLoader(): FilesLoaderInterface
+    {
+        return new SimpleFilesLoader(
+            $this->getParser(),
+            $this->dataLoader
+        );
+    }
+
     protected function createFixtureBuilder(): FixtureBuilderInterface
     {
         return new SimpleBuilder(

src/Loader/SimpleFilesLoader.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Alice package.
+ *
+ * (c) Nelmio <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Nelmio\Alice\Loader;
+
+use Nelmio\Alice\DataLoaderInterface;
+use Nelmio\Alice\FilesLoaderInterface;
+use Nelmio\Alice\IsAServiceTrait;
+use Nelmio\Alice\ObjectSet;
+use Nelmio\Alice\Parser\IncludeProcessor\IncludeDataMerger;
+use Nelmio\Alice\Parser\IncludeProcessorInterface;
+use Nelmio\Alice\ParserInterface;
+
+final class SimpleFilesLoader implements FilesLoaderInterface
+{
+    use IsAServiceTrait;
+
+    /**
+     * @var DataLoaderInterface
+     */
+    private $dataLoader;
+
+    /**
+     * @var IncludeProcessorInterface
+     */
+    private $dataMerger;
+
+    /**
+     * @var ParserInterface
+     */
+    private $parser;
+
+    public function __construct(ParserInterface $parser, DataLoaderInterface $dataLoader)
+    {
+        $this->parser = $parser;
+        $this->dataMerger = new IncludeDataMerger();
+        $this->dataLoader = $dataLoader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function loadFiles(array $files, array $parameters = [], array $objects = []): ObjectSet
+    {
+        $data = array_reduce(
+            array_unique($files),
+            function (array $data, string $file): array {
+                $fileData = $this->parser->parse($file);
+
+                return $this->dataMerger->mergeInclude($data, $fileData);
+            },
+            []
+        );
+
+        return $this->dataLoader->loadData($data, $parameters, $objects);
+    }
+}

src/Parser/RuntimeCacheParser.php

@@ -72,9 +72,11 @@ public function parse(string $file): array
         }
 
         $data = $this->parser->parse($realPath);
+
         if (array_key_exists('include', $data)) {
             $data = $this->includeProcessor->process($this, $file, $data);
         }
+
         $this->cache[$realPath] = $data;
 
         return $data;

tests/FixtureBuilder/Denormalizer/Fixture/Chainable/SimpleDenormalizerTest.php

@@ -25,7 +25,6 @@
 use Nelmio\Alice\FixtureBag;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\ChainableFixtureDenormalizerInterface;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\DummySpecificationBagDenormalizer;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\FakeSpecificationBagDenormalizer;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationsDenormalizerInterface;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParser\DummyFlagParser;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParserInterface;

tests/FixtureBuilder/Denormalizer/Fixture/SimpleFixtureBagDenormalizerTest.php

@@ -17,7 +17,6 @@
 use Nelmio\Alice\Definition\FlagBag;
 use Nelmio\Alice\FixtureBag;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FixtureBagDenormalizerInterface;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParser\FakeFlagParser;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParserInterface;
 use Nelmio\Alice\FixtureInterface;
 use PHPUnit\Framework\TestCase;

tests/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Arguments/SimpleArgumentsDenormalizerTest.php

@@ -16,7 +16,6 @@
 use Nelmio\Alice\Definition\Fixture\FakeFixture;
 use Nelmio\Alice\Definition\Flag\ElementFlag;
 use Nelmio\Alice\Definition\FlagBag;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\Value\FakeValueDenormalizer;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\ValueDenormalizerInterface;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParserInterface;
 use PHPUnit\Framework\TestCase;

tests/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Constructor/ConstructorDenormalizerTest.php

@@ -15,7 +15,6 @@
 
 use Nelmio\Alice\Definition\Fixture\FakeFixture;
 use Nelmio\Alice\Definition\MethodCall\SimpleMethodCall;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\Arguments\FakeArgumentsDenormalizer;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\ArgumentsDenormalizerInterface;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\FlagParser\FakeFlagParser;
 use PHPUnit\Framework\TestCase;

tests/FixtureBuilder/Denormalizer/Fixture/SpecificationBagDenormalizer/Property/SimplePropertyDenormalizerTest.php

@@ -16,7 +16,6 @@
 use Nelmio\Alice\Definition\Fixture\FakeFixture;
 use Nelmio\Alice\Definition\FlagBag;
 use Nelmio\Alice\Definition\Property;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\Value\FakeValueDenormalizer;
 use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\SpecificationBagDenormalizer\ValueDenormalizerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;

tests/FixtureBuilder/Denormalizer/SimpleDenormalizerTestTest.php

@@ -16,8 +16,6 @@
 use Nelmio\Alice\Definition\Fixture\DummyFixture;
 use Nelmio\Alice\FixtureBag;
 use Nelmio\Alice\FixtureBuilder\BareFixtureSet;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Fixture\FakeFixtureBagDenormalizer;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\Parameter\FakeParameterBagDenormalizer;
 use Nelmio\Alice\FixtureBuilder\DenormalizerInterface;
 use Nelmio\Alice\ParameterBag;
 use PHPUnit\Framework\TestCase;

tests/FixtureBuilder/SimpleBuilderTest.php

@@ -14,7 +14,6 @@
 namespace Nelmio\Alice\FixtureBuilder;
 
 use Nelmio\Alice\FixtureBag;
-use Nelmio\Alice\FixtureBuilder\Denormalizer\FakeDenormalizer;
 use Nelmio\Alice\FixtureBuilderInterface;
 use Nelmio\Alice\FixtureSet;
 use Nelmio\Alice\ObjectBag;

tests/Generator/DoublePassGeneratorTest.php

@@ -18,7 +18,6 @@
 use Nelmio\Alice\Entity\StdClassFactory;
 use Nelmio\Alice\FixtureBag;
 use Nelmio\Alice\FixtureSet;
-use Nelmio\Alice\Generator\Resolver\FixtureSet\FakeFixtureSetResolver;
 use Nelmio\Alice\GeneratorInterface;
 use Nelmio\Alice\ObjectBag;
 use Nelmio\Alice\ObjectSet;

tests/Generator/ObjectGenerator/SimpleObjectGeneratorTest.php

@@ -16,12 +16,9 @@
 use Nelmio\Alice\Definition\Fixture\SimpleFixture;
 use Nelmio\Alice\Definition\Object\SimpleObject;
 use Nelmio\Alice\Definition\SpecificationBagFactory;
-use Nelmio\Alice\Generator\Caller\FakeCaller;
 use Nelmio\Alice\Generator\CallerInterface;
 use Nelmio\Alice\Generator\GenerationContext;
-use Nelmio\Alice\Generator\Hydrator\FakeHydrator;
 use Nelmio\Alice\Generator\HydratorInterface;
-use Nelmio\Alice\Generator\Instantiator\FakeInstantiator;
 use Nelmio\Alice\Generator\InstantiatorInterface;
 use Nelmio\Alice\Generator\ObjectGeneratorInterface;
 use Nelmio\Alice\Generator\ResolvedFixtureSetFactory;

tests/Generator/Resolver/FixtureSet/SimpleFixtureSetResolverTest.php

@@ -19,8 +19,6 @@
 use Nelmio\Alice\FixtureSet;
 use Nelmio\Alice\Generator\FixtureSetResolverInterface;
 use Nelmio\Alice\Generator\ResolvedFixtureSet;
-use Nelmio\Alice\Generator\Resolver\FakeFixtureBagResolver;
-use Nelmio\Alice\Generator\Resolver\FakeParameterBagResolver;
 use Nelmio\Alice\Generator\Resolver\FixtureBagResolverInterface;
 use Nelmio\Alice\Generator\Resolver\ParameterBagResolverInterface;
 use Nelmio\Alice\ObjectBag;

tests/Generator/Resolver/Parameter/RemoveConflictingParametersParameterBagResolverTest.php

@@ -13,7 +13,6 @@
 
 namespace Nelmio\Alice\Generator\Resolver\Parameter;
 
-use Nelmio\Alice\Generator\Resolver\FakeParameterBagResolver;
 use Nelmio\Alice\Generator\Resolver\ParameterBagResolverInterface;
 use Nelmio\Alice\ParameterBag;
 use PHPUnit\Framework\TestCase;

tests/Generator/Resolver/Parameter/SimpleParameterBagResolverTest.php

@@ -13,7 +13,6 @@
 
 namespace Nelmio\Alice\Generator\Resolver\Parameter;
 
-use Nelmio\Alice\Generator\Resolver\FakeParameterResolver;
 use Nelmio\Alice\Generator\Resolver\ParameterBagResolverInterface;
 use Nelmio\Alice\Generator\Resolver\ParameterResolverInterface;
 use Nelmio\Alice\Generator\Resolver\ResolvingContext;

tests/IsAServiceTraitTest.php

@@ -13,7 +13,6 @@
 
 namespace Nelmio\Alice;
 
-use Nelmio\Alice\Throwable\Exception\UnclonableException;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Throwable;