Merge pull request #38 from symfony-cmf/include-puli

Use included puli-light

Author: wouterj

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - hhvm
 
@@ -11,32 +9,34 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache/files
+    - .phpunit
 
 env:
-  - SYMFONY_VERSION=2.7.*
+  matrix: SYMFONY_VERSION=3.2.*
+  global: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
     - php: 5.6
-      env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-  allow_failures:
-    - env: SYMFONY_VERSION=2.8.*
-    - env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.1
+      env: SYMFONY_VERSION=3.3.* DEPS=dev
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
   - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
   - composer self-update
+  - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
 
-install: composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
+install: composer update --prefer-dist $COMPOSER_FLAGS
 
 before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit --coverage-text
+script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

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());
 

README.md

@@ -27,7 +27,7 @@ provide the context with which to resolve the documents.
 
 ## Requirements 
 
-* Symfony 2.2.x
+* Symfony 2.8+
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation

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;