Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 156e77b

Browse files
dantleechdantleech
committed
Removed unnecessary stuff, fixed tests
1 parent f158e18 commit 156e77b

18 files changed

+70
-407
lines changed

‎Controller/ResourceController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function resourceAction($repositoryName, $path)
4747
$context = SerializationContext::create();
4848
$context->enableMaxDepthChecks();
4949
$context->setSerializeNull(true);
50-
$context->addExclusionStrategy(new GlobalDepthExclusionStrategy(2));
5150
$json = $this->serializer->serialize(
5251
$resource,
5352
'json',

‎DependencyInjection/CmfResourceRestExtension.php

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,13 @@
1919
use Symfony\Component\Config\Definition\Processor;
2020
use Symfony\Component\Config\Loader\LoaderInterface;
2121

22-
class CmfResourceRestExtension extends Extension implements PrependExtensionInterface
22+
class CmfResourceRestExtension extends Extension
2323
{
2424
private $nativeEnhancers = array(
2525
'payload',
2626
'sonata_admin',
2727
);
2828

29-
public function prepend(ContainerBuilder $container)
30-
{
31-
$container->prependExtensionConfig('jms_serializer', array(
32-
'metadata' => array(
33-
'directories' => array(
34-
array(
35-
'path' => __DIR__ . '/../Resources/config/serializer',
36-
'namespace_prefix' => 'Symfony\Cmf\Component\Resource\Repository\Resource',
37-
),
38-
array(
39-
'path' => __DIR__ . '/../Resources/config/serializer',
40-
'namespace_prefix' => 'Puli\Repository\Resource',
41-
),
42-
array(
43-
'path' => __DIR__ . '/../Resources/config/serializer',
44-
'namespace_prefix' => 'PHPCR',
45-
),
46-
),
47-
),
48-
));
49-
}
50-
5129
/**
5230
* {@inheritDoc}
5331
*/

‎Enhancer/SonataAdminEnhancer.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,28 @@
1818
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
1919

2020
/**
21-
* Add links and metainfo from Sonata Admin
21+
* Add links and meta-info from Sonata Admin
2222
*
2323
* @author Daniel Leech <[email protected]>
2424
*/
2525
class SonataAdminEnhancer implements EnhancerInterface
2626
{
27+
/**
28+
* @var Pool
29+
*/
2730
private $pool;
31+
32+
/**
33+
* @var UrlGeneratorInterface
34+
*/
2835
private $urlGenerator;
2936

37+
/**
38+
* __construct
39+
*
40+
* @param Pool $pool
41+
* @param UrlGeneratorInterface $urlGenerator
42+
*/
3043
public function __construct(Pool $pool, UrlGeneratorInterface $urlGenerator)
3144
{
3245
$this->pool = $pool;

‎Helper/PathHelper.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Registry/PayloadAliasRegistry.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Puli\Repository\Api\Resource\Resource;
1818
use Puli\Repository\Api\ResourceRepository;
1919
use Puli\Repository\Api\Resource\CompositeResource;
20+
use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
2021

2122
/**
2223
* Registry for resource payload aliases

‎Resources/config/resource-rest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<parameters>
88
<parameter key="cmf_resource_rest.controller.resource.class">Symfony\Cmf\Bundle\ResourceRestBundle\Controller\ResourceController</parameter>
9-
<parameter key="cmf_resource_rest.path_helper.class">Symfony\Cmf\Bundle\ResourceRestBundle\Helper\PathHelper</parameter>
109
<parameter key="cmf_resource_rest.registry.payload_alias.class">Symfony\Cmf\Bundle\ResourceRestBundle\Registry\PayloadAliasRegistry</parameter>
1110
<parameter key="cmf_resource_rest.registry.enhancer.class">Symfony\Cmf\Bundle\ResourceRestBundle\Registry\EnhancerRegistry</parameter>
1211
</parameters>
@@ -19,8 +18,6 @@
1918
<argument type="service" id="hateoas.generator.symfony" />
2019
</service>
2120

22-
<service id="cmf_resource_rest.path_helper" class="%cmf_resource_rest.path_helper.class%" />
23-
2421
<service id="cmf_resource_rest.registry.payload_alias" class="%cmf_resource_rest.registry.payload_alias.class%">
2522
<argument type="service" id="cmf_resource.registry" />
2623
<argument type="collection" />

‎Resources/config/serializer.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<tag name="jms_serializer.subscribing_handler"/>
2222
</service>
2323

24-
<service id="cmf_resource_rest.serializer.jms.handler.resource_collection" class="%cmf_resource_rest.serializer.jms.handler.resource_collection.class%">
25-
<tag name="jms_serializer.subscribing_handler"/>
26-
</service>
27-
2824
<service id="cmf_resource_rest.serializer.jms.handler.phpcr_node" class="%cmf_resource_rest.serializer.jms.handler.phpcr_node.class%">
2925
<tag name="jms_serializer.subscribing_handler"/>
3026
</service>
@@ -36,14 +32,5 @@
3632
<service id="cmf_resource_rest.serializer.jms.subscriber.resource" class="%cmf_resource_rest.serializer.jms.subscriber.resource.class%">
3733
<tag name="jms_serializer.event_subscriber" />
3834
</service>
39-
40-
<service id="cmf_resource_rest.serializer.jms.subscriber.resource_collection" class="%cmf_resource_rest.serializer.jms.subscriber.resource_collection.class%">
41-
<tag name="jms_serializer.event_subscriber" />
42-
</service>
43-
44-
<service id="cmf_resource_rest.serializer.jms.subscriber.resource_collection" class="%cmf_resource_rest.serializer.jms.subscriber.resource_collection.class%">
45-
<tag name="jms_serializer.event_subscriber" />
46-
</service>
47-
4835
</services>
4936
</container>

‎Serializer/Jms/EventSubscriber/ResourceCollectionSubscriber.php

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎Serializer/Jms/Exclusion/GlobalDepthExclusionStrategy.php

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎Serializer/Jms/Handler/ResourceCollectionHandler.php

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)