Apply fixes from StyleCI

src/Description/Description.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Description/DescriptionEnhancerInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Description/DescriptionFactory.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Description/Descriptor.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Description/Enhancer/Doctrine/PhpcrOdmEnhancer.php

@@ -3,21 +3,21 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Description\Enhancer\Doctrine;
 
-use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
+use Doctrine\Common\Util\ClassUtils;
+use Doctrine\ODM\PHPCR\Mapping\ClassMetadataFactory;
 use Symfony\Cmf\Component\Resource\Description\Description;
+use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
 use Symfony\Cmf\Component\Resource\Description\Descriptor;
 use Symfony\Cmf\Component\Resource\Puli\Api\PuliResource;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
-use Doctrine\ODM\PHPCR\Mapping\ClassMetadataFactory;
-use Doctrine\Common\Util\ClassUtils;
 
 /**
  * Add descriptors from the Doctrine PHPCR ODM.

src/Description/Enhancer/Sonata/AdminEnhancer.php

@@ -3,21 +3,21 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Description\Enhancer\Sonata;
 
-use Sonata\AdminBundle\Admin\Pool;
 use Doctrine\Common\Util\ClassUtils;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
+use Sonata\AdminBundle\Admin\Pool;
 use Symfony\Cmf\Component\Resource\Description\Description;
+use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
 use Symfony\Cmf\Component\Resource\Description\Descriptor;
 use Symfony\Cmf\Component\Resource\Puli\Api\PuliResource;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * Add links and meta-info from Sonata Admin.
@@ -59,15 +59,15 @@ public function enhance(Description $description)
         $class = ClassUtils::getClass($object);
         $admin = $this->pool->getAdminByClass($class);
 
-        $links = array();
+        $links = [];
 
         $routeCollection = $admin->getRoutes();
 
         foreach ($routeCollection->getElements() as $code => $route) {
             $routeName = $route->getDefault('_sonata_name');
-            $url = $this->urlGenerator->generate($routeName, array(
+            $url = $this->urlGenerator->generate($routeName, [
                 $admin->getIdParameter() => $admin->getUrlsafeIdentifier($object),
-            ), true);
+            ], true);
 
             $routeRole = substr($code, strlen($admin->getCode()) + 1);
 

src/Description/Enhancer/Sylius/ResourceEnhancer.php

@@ -3,26 +3,26 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Description\Enhancer\Sylius;
 
+use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactory;
+use Sylius\Component\Resource\Metadata\Metadata;
 use Sylius\Component\Resource\Metadata\RegistryInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
 use Symfony\Cmf\Component\Resource\Description\Description;
-use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
+use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
+use Symfony\Cmf\Component\Resource\Description\Descriptor;
 use Symfony\Cmf\Component\Resource\Puli\Api\PuliResource;
-use Sylius\Bundle\ResourceBundle\Controller\RequestConfigurationFactory;
+use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Cmf\Component\Resource\Description\Descriptor;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\HttpFoundation\Request;
-use Sylius\Component\Resource\Metadata\Metadata;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * Add descriptors from the Sylius Resource component.
@@ -86,7 +86,6 @@ public function enhance(Description $description)
         ];
 
         foreach ($map as $descriptor => $action) {
-
             // note that some resources may not have routes
             // registered with sonata (f.e. folder resources)
             // so we ignore route-not-found exceptions.

src/Repository/AbstractPhpcrRepository.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,13 +12,13 @@
 namespace Symfony\Cmf\Component\Resource\Repository;
 
 use DTL\Glob\FinderInterface;
+use DTL\Glob\GlobHelper;
+use Symfony\Cmf\Component\Resource\Puli\AbstractRepository;
 use Symfony\Cmf\Component\Resource\Puli\Api\ResourceRepository;
 use Symfony\Cmf\Component\Resource\Puli\ArrayResourceCollection;
-use Webmozart\PathUtil\Path;
-use Symfony\Cmf\Component\Resource\Puli\AbstractRepository;
 use Symfony\Cmf\Component\Resource\Repository\Api\EditableRepository;
-use DTL\Glob\GlobHelper;
 use Webmozart\Assert\Assert;
+use Webmozart\PathUtil\Path;
 
 /**
  * Abstract repository for both PHPCR and PHPCR-ODM repositories.

src/Repository/Api/EditableRepository.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -28,12 +28,12 @@ interface EditableRepository extends ResourceRepository
      *
      * All resources passed to this method must implement {@link PuliResource}.
      *
-     * @param string                          $path     The path at which to
-     *                                                  add the resource.
-     * @param PuliResource|ResourceCollection $resource The resource(s) to add
-     *                                                  at that path.
+     * @param string                          $path     the path at which to
+     *                                                  add the resource
+     * @param PuliResource|ResourceCollection $resource the resource(s) to add
+     *                                                  at that path
      *
-     * @throws \InvalidArgumentException if the path is invalid. The path must 
+     * @throws \InvalidArgumentException if the path is invalid. The path must
      *                                   be a non-empty string starting with "/"
      * @throws \RuntimeException         if the resource is invalid
      */
@@ -42,11 +42,11 @@ public function add($path, $resource);
     /**
      * Removes all resources matching the given query.
      *
-     * @param string $query    A resource query.
+     * @param string $query    a resource query
      * @param string $language The language of the query. All implementations
      *                         must support the language "glob".
      *
-     * @return int The number of resources removed from the repository.
+     * @return int the number of resources removed from the repository
      *
      * @throws \InvalidArgumentException if the query is invalid
      * @throws \RuntimeException         if the language is not supported
@@ -56,7 +56,7 @@ public function remove($query, $language = 'glob');
     /**
      * Removes all resources from the repository.
      *
-     * @return int The number of resources removed from the repository.
+     * @return int the number of resources removed from the repository
      */
     public function clear();
 

src/Repository/PhpcrOdmRepository.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -87,7 +87,7 @@ public function findByTag($tag)
      */
     public function getTags()
     {
-        return array();
+        return [];
     }
 
     /**

src/Repository/PhpcrRepository.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -87,7 +87,7 @@ public function findByTag($tag)
      */
     public function getTags()
     {
-        return array();
+        return [];
     }
 
     /**

src/Repository/Resource/CmfResource.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Repository/Resource/Metadata/PhpcrMetadata.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Repository\Resource\Metadata;
 
-use Symfony\Cmf\Component\Resource\Puli\Api\ResourceMetadata;
 use PHPCR\NodeInterface;
+use Symfony\Cmf\Component\Resource\Puli\Api\ResourceMetadata;
 
 /**
  * Metadata for PHPCR node.

src/Repository/Resource/PhpcrOdmResource.php

@@ -3,18 +3,18 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Repository\Resource;
 
-use Puli\Repository\Api\Resource\Resource;
+use Doctrine\Common\Util\ClassUtils;
 use PHPCR\DocumentInterface;
 use PHPCR\Util\PathHelper;
-use Doctrine\Common\Util\ClassUtils;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Resource representing a PHPCR document.

src/Repository/Resource/PhpcrResource.php

@@ -3,16 +3,16 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Repository\Resource;
 
-use Puli\Repository\Api\Resource\Resource;
 use PHPCR\NodeInterface;
+use Puli\Repository\Api\Resource\Resource;
 use Symfony\Cmf\Component\Resource\Repository\Resource\Metadata\PhpcrMetadata;
 
 /**

src/RepositoryRegistryInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

tests/Unit/Description/DescriptionFactoryTest.php

@@ -3,17 +3,17 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Symfony\Cmf\Component\Resource\Tests\Unit\Repository;
 
+use Prophecy\Argument;
 use Symfony\Cmf\Component\Resource\Description\Description;
 use Symfony\Cmf\Component\Resource\Description\DescriptionEnhancerInterface;
-use Prophecy\Argument;
 use Symfony\Cmf\Component\Resource\Description\DescriptionFactory;
 use Symfony\Cmf\Component\Resource\Puli\Api\PuliResource;
 

tests/Unit/Description/DescriptionTest.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -50,14 +50,13 @@ public function testGetSet()
             Descriptor::TYPE_ALIAS => 'page',
             Descriptor::LINK_EDIT_HTML => '/path/to/edit',
             'custom.key' => 'Hello',
-
         ], $this->description->all());
     }
 
     /**
      * It should throw an exception if a non-scalar value is set.
      *
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Only scalar and array values are allowed as descriptor values, got "object" when setting descriptor "hello"
      */
     public function testSetNonScalar()