Merge pull request #32 from symfony-cmf/upgraded_to_puli_latest

Upgraded to latest version of Puli

Author: dantleech

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -22,7 +21,7 @@ matrix:
     - php: hhvm
   include:
     - php: 5.6
-      env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
+      env: SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
     - php: 5.6

Enhancer/EnhancerInterface.php

@@ -12,7 +12,7 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
 use JMS\Serializer\Context;
-use Puli\Repository\Api\Resource\Resource;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Enhancer classes enhance the REST response for resources.
@@ -31,5 +31,5 @@ interface EnhancerInterface
      * @param Context Serialization context
      * @param resource The resource being serialized
      */
-    public function enhance(array $data, Resource $resource);
+    public function enhance(array $data, PuliResource $resource);
 }

Enhancer/PayloadEnhancer.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use Puli\Repository\Api\Resource\Resource;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Serialize the payload.
@@ -23,7 +23,7 @@ class PayloadEnhancer implements EnhancerInterface
     /**
      * {@inheritdoc}
      */
-    public function enhance(array $data, Resource $resource)
+    public function enhance(array $data, PuliResource $resource)
     {
         $payload = $resource->getPayload();
         $data['payload'] = $payload;

Enhancer/SonataAdminEnhancer.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use Puli\Repository\Api\Resource\Resource;
 use Sonata\AdminBundle\Admin\Pool;
 use Doctrine\Common\Util\ClassUtils;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Add links and meta-info from Sonata Admin.
@@ -48,7 +48,7 @@ public function __construct(Pool $pool, UrlGeneratorInterface $urlGenerator)
     /**
      * {@inheritdoc}
      */
-    public function enhance(array $data, Resource $resource)
+    public function enhance(array $data, PuliResource $resource)
     {
         $object = $resource->getPayload();
 

Registry/EnhancerRegistry.php

@@ -12,7 +12,6 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Registry for resource enhancers.

Registry/PayloadAliasRegistry.php

@@ -12,8 +12,8 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
-use Puli\Repository\Api\Resource\Resource;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Registry for resource payload aliases.
@@ -58,7 +58,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getPayloadAlias(Resource $resource)
+    public function getPayloadAlias(PuliResource $resource)
     {
         $repositoryType = $this->repositoryRegistry->getRepositoryType(
             $resource->getRepository()

Serializer/Jms/EventSubscriber/ResourceSubscriber.php

@@ -15,7 +15,7 @@
 use JMS\Serializer\EventDispatcher\Events;
 use JMS\Serializer\EventDispatcher\PreSerializeEvent;
 use Puli\Repository\Api\ResourceCollection;
-use Puli\Repository\Api\Resource\Resource;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Force instaces of ResourceCollection to type "ResourceCollection".
@@ -41,8 +41,8 @@ public function onPreSerialize(PreSerializeEvent $event)
     {
         $object = $event->getObject();
 
-        if ($object instanceof Resource) {
-            $event->setType('Puli\Repository\Api\Resource\Resource');
+        if ($object instanceof PuliResource) {
+            $event->setType('Puli\Repository\Api\Resource\PuliResource');
         }
     }
 }

Serializer/Jms/Handler/ResourceHandler.php

@@ -18,11 +18,11 @@
 use PHPCR\NodeInterface;
 use PHPCR\Util\PathHelper;
 use Puli\Repository\Api\Resource\BodyResource;
-use Puli\Repository\Api\Resource\Resource;
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\PayloadAliasRegistry;
 use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\EnhancerRegistry;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
+use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Handle PHPCR resource serialization.
@@ -51,7 +51,7 @@ public static function getSubscribingMethods()
             array(
                 'event' => GraphNavigator::DIRECTION_SERIALIZATION,
                 'format' => 'json',
-                'type' => 'Puli\Repository\Api\Resource\Resource',
+                'type' => 'Puli\Repository\Api\Resource\PuliResource',
                 'method' => 'serializeResource',
             ),
         );
@@ -65,15 +65,15 @@ public static function getSubscribingMethods()
      */
     public function serializeResource(
         JsonSerializationVisitor $visitor,
-        Resource $resource,
+        PuliResource $resource,
         array $type,
         Context $context
     ) {
         $data = $this->doSerializeResource($resource);
         $context->accept($data);
     }
 
-    private function doSerializeResource(Resource $resource, $depth = 0)
+    private function doSerializeResource(PuliResource $resource, $depth = 0)
     {
         $data = array();
         $repositoryAlias = $this->registry->getRepositoryAlias($resource->getRepository());

Tests/Resources/app/config/config.php

@@ -11,7 +11,7 @@
 
 $container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\ResourceRestBundle');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/parameters.yml');
-$loader->import(CMF_TEST_CONFIG_DIR.'/dist/framework.yml');
+$loader->import(CMF_TEST_CONFIG_DIR.'/dist/framework.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/monolog.yml');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/doctrine.yml');
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');

Tests/Unit/Serializer/Jms/Handler/ResourceHandlerTest.php

@@ -64,7 +64,7 @@ public function testHandler()
         $this->enhancerRegistry->getEnhancers('repo')->willReturn(array(
             $this->enhancer,
         ));
-        $this->enhancer->enhance(Argument::type('array'), Argument::type('Puli\Repository\Api\Resource\Resource'))
+        $this->enhancer->enhance(Argument::type('array'), Argument::type('Puli\Repository\Api\Resource\PuliResource'))
             ->will(function ($data, $resource) {
                 return $data[0];
             });