Use included puli-light

Author: wouterj

CmfResourceBundle.php

@@ -23,7 +23,7 @@ class CmfResourceBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         $extension = $container->getExtension('cmf_resource');
-        $extension->addRepositoryFactory('filesystem', new FilesystemFactory());
+        //$extension->addRepositoryFactory('filesystem', new FilesystemFactory());
         $extension->addRepositoryFactory('doctrine_phpcr', new DoctrinePhpcrFactory());
         $extension->addRepositoryFactory('doctrine_phpcr_odm', new DoctrinePhpcrOdmFactory());
 

Registry/RepositoryRegistry.php

@@ -12,7 +12,7 @@
 namespace Symfony\Cmf\Bundle\ResourceBundle\Registry;
 
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
-use Puli\Repository\Api\ResourceRepository;
+use Symfony\Cmf\Component\Resource\Puli\Api\ResourceRepository;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

Tests/Functional/FilesystemRepositoryTest.php

@@ -17,6 +17,7 @@ class FilesystemRepositoryTest extends BaseTestCase
 {
     public function setUp()
     {
+        $this->markTestSkipped('Puli Filesystem is not available.');
         $this->repositoryRegistry = $this->getContainer()->get('cmf_resource.registry');
     }
 

Tests/Resources/app/config/resource.yml

@@ -12,6 +12,6 @@ cmf_resource:
             type: doctrine_phpcr_odm
             basepath: /cmf/articles
 
-        my_filesystem:
-            type: filesystem
-            base_dir: %kernel.root_dir%/../filesystem
+#        my_filesystem:
+#            type: filesystem
+#            base_dir: %kernel.root_dir%/../filesystem

Tests/Unit/DependencyInjection/CmfResourceExtensionTest.php

@@ -11,15 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\ResourceBundle\Tests\Unit\DependencyInjection;
 
+use Prophecy\Argument;
 use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\CmfResourceExtension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\RepositoryFactoryInterface;
+use Symfony\Cmf\Component\Resource\Puli\Api\ResourceRepository;
 use Symfony\Component\DependencyInjection\Definition;
-use Prophecy\Argument;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
-use Puli\Repository\Api\ResourceRepository;
 
 class CmfResourceExtensionTest extends \PHPUnit_Framework_TestCase
 {

Tests/Unit/DependencyInjection/Repository/Factory/FactoryTestCase.php

@@ -18,7 +18,7 @@ abstract class FactoryTestCase extends \PHPUnit_Framework_TestCase
 {
     protected $resolver;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->resolver = new OptionsResolver();
     }

Tests/Unit/DependencyInjection/Repository/Factory/FilesystemFactoryTest.php

@@ -16,6 +16,11 @@
 
 class FilesystemFactoryTest extends FactoryTestCase
 {
+    protected function setUp()
+    {
+        $this->markTestSkipped('Puli Filesystem is not available.');
+    }
+
     /**
      * It should add a repository to the container.
      * It should configure the base dir.

Tests/Unit/Registry/RepositoryRegistryTest.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceBundle\Tests\Unit\Registry;
 
-use Puli\Repository\Api\ResourceRepository;
+use Symfony\Cmf\Component\Resource\Puli\Api\ResourceRepository;
 use Symfony\Cmf\Bundle\ResourceBundle\Registry\RepositoryRegistry;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 

Twig/DescriptionExtension.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceBundle\Twig;
 
-use Puli\Repository\Api\Resource\PuliResource;
+use Symfony\Cmf\Component\Resource\Puli\Api\PuliResource;
 use Symfony\Cmf\Component\Resource\Description\DescriptionFactory;
 
 /**

composer.json

@@ -9,18 +9,18 @@
             "homepage": "https://github.com/symfony-cmf/symfony-cmf/contributors"
         }
     ],
-    "minimum-stability": "dev",
     "require": {
         "php": "^5.5.9|^7.0",
         "symfony/framework-bundle": "^2.7|3.*",
         "symfony/options-resolver": "^2.7|3.*",
-        "symfony-cmf/resource": "^1.0",
-        "puli/repository": "@beta"
+        "symfony-cmf/resource": "dev-include-puli as 1.0.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^1.3|^2.0",
         "doctrine/phpcr-odm": "^1.2|^2.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.2)",
         "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents"