Applied cs fixer

dantleech · dantleech · commit bf52f3173388 · 2015-03-04T09:46:14.000Z
diff --git a/Controller/ResourceController.php b/Controller/ResourceController.php
@@ -4,10 +4,8 @@
 
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Hateoas\UrlGenerator\UrlGeneratorInterface;
 use JMS\Serializer\SerializerInterface;
 use JMS\Serializer\SerializationContext;
-use Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\Exclusion\GlobalDepthExclusionStrategy;
 
 class ResourceController
 {
diff --git a/DependencyInjection/CmfResourceRestExtension.php b/DependencyInjection/CmfResourceRestExtension.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
diff --git a/DependencyInjection/Compiler/EnhancerPass.php b/DependencyInjection/Compiler/EnhancerPass.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 /**
diff --git a/Enhancer/PayloadEnhancer.php b/Enhancer/PayloadEnhancer.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use JMS\Serializer\Context;
 use Puli\Repository\Api\Resource\Resource;
 
 /**
diff --git a/Enhancer/SonataAdminEnhancer.php b/Enhancer/SonataAdminEnhancer.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use JMS\Serializer\Context;
 use Puli\Repository\Api\Resource\Resource;
 use Sonata\AdminBundle\Admin\Pool;
 use Doctrine\Common\Util\ClassUtils;
@@ -69,7 +68,7 @@ public function enhance(array $data, Resource $resource)
         foreach ($routeCollection->getElements() as $code => $route) {
             $routeName = $route->getDefault('_sonata_name');
             $url = $this->urlGenerator->generate($routeName, array(
-                $admin->getIdParameter() => $admin->getUrlsafeIdentifier($object)
+                $admin->getIdParameter() => $admin->getUrlsafeIdentifier($object),
             ), true);
 
             $routeRole = substr($code, strlen($admin->getCode()) + 1);
@@ -83,4 +82,3 @@ public function enhance(array $data, Resource $resource)
         return $data;
     }
 }
-
diff --git a/Registry/EnhancerRegistry.php b/Registry/EnhancerRegistry.php
@@ -11,11 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
-use Symfony\Cmf\Component\Resource\RepositoryFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Puli\Repository\Api\Resource\Resource;
-use Puli\Repository\Api\ResourceRepository;
 
 /**
  * Registry for resource enhancers
@@ -48,8 +45,7 @@ public function __construct(
         ContainerInterface $container,
         $enhancerMap = array(),
         $aliasMap = array()
-    )
-    {
+    ) {
         $this->container = $container;
         $this->enhancerMap = $enhancerMap;
         $this->aliasMap = $aliasMap;
diff --git a/Registry/PayloadAliasRegistry.php b/Registry/PayloadAliasRegistry.php
@@ -11,12 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
-use Symfony\Cmf\Component\Resource\RepositoryFactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Puli\Repository\Api\Resource\Resource;
-use Puli\Repository\Api\ResourceRepository;
-use Puli\Repository\Api\Resource\CompositeResource;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
 
 /**
@@ -73,15 +69,15 @@ public function getPayloadAlias(Resource $resource)
         }
 
         if (null === $type) {
-            return null;
+            return;
         }
 
         if (!isset($this->aliasesByRepository[$repositoryType])) {
-            return null;
+            return;
         }
 
         if (!isset($this->aliasesByRepository[$repositoryType][$type])) {
-            return null;
+            return;
         }
 
         return $this->aliasesByRepository[$repositoryType][$type];
diff --git a/Resources/config/enhancer.payload.xml b/Resources/config/enhancer.payload.xml
@@ -17,4 +17,3 @@
 
     </services>
 </container>
-
diff --git a/Serializer/Jms/EventSubscriber/ResourceSubscriber.php b/Serializer/Jms/EventSubscriber/ResourceSubscriber.php
@@ -12,15 +12,10 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\EventSubscriber;
 
 use JMS\Serializer\EventDispatcher\EventSubscriberInterface;
-use PHPCR\NodeInterface;
 use JMS\Serializer\EventDispatcher\Events;
 use JMS\Serializer\EventDispatcher\PreSerializeEvent;
 use Puli\Repository\Api\ResourceCollection;
-use JMS\Serializer\EventDispatcher\ObjectEvent;
 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;
 
 /**
  * Force instaces of ResourceCollection to type "ResourceCollection"
diff --git a/Serializer/Jms/Handler/ResourceHandler.php b/Serializer/Jms/Handler/ResourceHandler.php
@@ -107,4 +107,3 @@ private function doSerializeResource(Resource $resource, $depth = 0)
         return $data;
     }
 }
-
diff --git a/Tests/Resources/TestBundle/Document/Article.php b/Tests/Resources/TestBundle/Document/Article.php
@@ -3,7 +3,6 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Resources\TestBundle\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
-use Hateoas\Configuration\Annotation as Hateoas;
 
 /**
  * @PHPCR\Document()
diff --git a/Tests/Resources/app/AppKernel.php b/Tests/Resources/app/AppKernel.php
@@ -34,7 +34,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.php');
 
         if ($this->getEnvironment() !== 'behat' && file_exists(ResourceContext::getConfigurationFile())) {
-
             $loader->import(ResourceContext::getConfigurationFile());
         }
     }
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
@@ -1,6 +1,5 @@
 <?php
 
-use Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Features\Context\ResourceContext;
 
 $container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\ResourceRestBundle');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/parameters.yml');
diff --git a/Tests/Unit/DependencyInjection/CmfResourceRestExtensionTest.php b/Tests/Unit/DependencyInjection/CmfResourceRestExtensionTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Bundle\ResourceBundle\Tests\Unit\DependencyInjection;
 
-
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Symfony\Cmf\Bundle\ResourceRestBundle\DependencyInjection\CmfResourceRestExtension;
 use Symfony\Cmf\Bundle\ResourceRestBundle\DependencyInjection\Compiler\EnhancerPass;
@@ -56,4 +55,3 @@ public function testExtension($config)
         $this->compile();
     }
 }
-
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -44,7 +44,7 @@ public function testConfig($source)
             'payload_alias_map' => array(
                 'article' => array(
                     'repository' => 'doctrine_phpcr_odm',
-                    'type' => 'Namespace\Article'
+                    'type' => 'Namespace\Article',
                 ),
             ),
             'enhancer_map' => array(
diff --git a/Tests/Unit/Enhancer/SonataAdminEnhancerTest.php b/Tests/Unit/Enhancer/SonataAdminEnhancerTest.php
@@ -8,7 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
- 
+
 namespace Unit\Enhancer;
 
 use Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer\SonataAdminEnhancer;
@@ -26,7 +26,7 @@ public function setUp()
         $this->pool = $this->prophesize('Sonata\AdminBundle\Admin\Pool');
         $this->visitor = $this->prophesize('JMS\Serializer\GenericSerializationVisitor');
         $this->generator = $this->prophesize('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
-        $this->payload = new \stdClass;
+        $this->payload = new \stdClass();
         $this->resource = $this->prophesize('Puli\Repository\Api\Resource\Resource');
         $this->route1 = $this->prophesize('Symfony\Component\Routing\Route');
         $this->route2 = $this->prophesize('Symfony\Component\Routing\Route');
@@ -87,7 +87,7 @@ public function testEnhancer()
             'sonata_links' => array(
                 'edit' => 'http://edit',
                 'delete' => 'http://delete',
-            )
+            ),
         ), $result);
     }
 }
diff --git a/Tests/Unit/Registry/EnhancerRegistryTest.php b/Tests/Unit/Registry/EnhancerRegistryTest.php
@@ -63,5 +63,3 @@ private function createRegistry($enhancerMap, $aliasMap)
         return new EnhancerRegistry($this->container->reveal(), $enhancerMap, $aliasMap);
     }
 }
-
-
diff --git a/Tests/Unit/Registry/PayloadAliasRegistryTest.php b/Tests/Unit/Registry/PayloadAliasRegistryTest.php
@@ -66,4 +66,3 @@ private function createRegistry($aliases)
         return new PayloadAliasRegistry($this->repositoryRegistry->reveal(), $aliases);
     }
 }
-
diff --git a/Tests/Unit/Serializer/Jms/EventSubscriber/PhpcrNodeSubscriberTest.php b/Tests/Unit/Serializer/Jms/EventSubscriber/PhpcrNodeSubscriberTest.php
@@ -36,4 +36,3 @@ public function testPreSerialize()
         $this->subscriber->onPreSerialize($this->event->reveal());
     }
 }
-
diff --git a/Tests/Unit/Serializer/Jms/Handler/ResourceHandlerTest.php b/Tests/Unit/Serializer/Jms/Handler/ResourceHandlerTest.php
@@ -30,7 +30,7 @@ public function setUp()
         $this->childResource = $this->prophesize('Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource');
 
         $this->repository = $this->prophesize('Puli\Repository\Api\ResourceRepository');
-        $this->payload = new \stdClass;
+        $this->payload = new \stdClass();
         $this->context = $this->prophesize('JMS\Serializer\Context');
 
         $this->handler = new ResourceHandler(
@@ -51,7 +51,7 @@ public function testHandler()
         $this->resource->getPath()->willReturn('/path/to');
         $this->resource->getRepositoryPath()->willReturn('/repository/path');
         $this->resource->listChildren()->willReturn(array(
-            $this->childResource
+            $this->childResource,
         ));
 
         $this->payloadAliasRegistry->getPayloadAlias($this->childResource->reveal())->willReturn('alias');
@@ -63,29 +63,29 @@ public function testHandler()
         ));
 
         $this->enhancerRegistry->getEnhancers('repo')->willReturn(array(
-            $this->enhancer
+            $this->enhancer,
         ));
         $this->enhancer->enhance(Argument::type('array'), Argument::type('Puli\Repository\Api\Resource\Resource'))
             ->will(function ($data, $resource) {
                 return $data[0];
             });
 
-        $expected = array (
+        $expected = array(
             'repository_alias' => 'repo',
             'repository_type' => 'repo_type',
             'payload_alias' => 'alias',
             'payload_type' => 'payload_type',
             'path' => '/path/to',
             'repository_path' => '/repository/path',
             'children' => array(
-                array (
+                array(
                     'repository_alias' => 'repo',
                     'repository_type' => 'repo_type',
                     'payload_alias' => 'alias',
                     'payload_type' => 'payload_type',
                     'path' => '/path/to/child',
                     'repository_path' => '/child/repository/path',
-                    'children' => array()
+                    'children' => array(),
                 ),
             ),
         );

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,8 @@`
`4`	`4`
`5`	`5`	`use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;`
`6`	`6`	`use Symfony\Component\HttpFoundation\Response;`
`7`		`-use Hateoas\UrlGenerator\UrlGeneratorInterface;`
`8`	`7`	`use JMS\Serializer\SerializerInterface;`
`9`	`8`	`use JMS\Serializer\SerializationContext;`
`10`		`-use Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\Exclusion\GlobalDepthExclusionStrategy;`
`11`	`9`
`12`	`10`	`class ResourceController`
`13`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;`
`13`	`13`
`14`		`-use Symfony\Cmf\Component\Resource\RepositoryFactoryInterface;`
`15`		`-use Symfony\Component\DependencyInjection\ContainerInterface;`
`16`	`14`	`use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;`
`17`	`15`	`use Puli\Repository\Api\Resource\Resource;`
`18`		`-use Puli\Repository\Api\ResourceRepository;`
`19`		`-use Puli\Repository\Api\Resource\CompositeResource;`
`20`	`16`	`use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;`
`21`	`17`
`22`	`18`	`/**`
`@@ -73,15 +69,15 @@ public function getPayloadAlias(Resource $resource)`
`73`	`69`	`}`
`74`	`70`
`75`	`71`	`if (null === $type) {`
`76`		`- return null;`
	`72`	`+ return;`
`77`	`73`	`}`
`78`	`74`
`79`	`75`	`if (!isset($this->aliasesByRepository[$repositoryType])) {`
`80`		`- return null;`
	`76`	`+ return;`
`81`	`77`	`}`
`82`	`78`
`83`	`79`	`if (!isset($this->aliasesByRepository[$repositoryType][$type])) {`
`84`		`- return null;`
	`80`	`+ return;`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`return $this->aliasesByRepository[$repositoryType][$type];`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,3 @@`
`17`	`17`
`18`	`18`	`</services>`
`19`	`19`	`</container>`
`20`		`-`
Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,3 @@ private function doSerializeResource(Resource $resource, $depth = 0)`
`107`	`107`	`return $data;`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`-`