Merge pull request ezsystems#1356 from ezsystems/cs

EZP-24612: Further CS fixes
ezpublishlegacy · Jul 30, 2015 · c8024d2 · c8024d2
2 parents 68ae802 + a8e272b
commit c8024d2
Show file tree

Hide file tree

Showing 2,509 changed files with 192 additions and 2,706 deletions.
diff --git a/.php_cs b/.php_cs
@@ -13,10 +13,10 @@ return Symfony\CS\Config\Config::create()
         '-phpdoc_to_comment',
         '-spaces_cast',
         '-blankline_after_open_tag',
+        '-single_blank_line_before_namespace',
     ])
     ->finder(
         Symfony\CS\Finder\DefaultFinder::create()
-            ->name('*.php')
             ->in(__DIR__)
             ->exclude([
                 'bin/.travis',
@@ -25,7 +25,6 @@ return Symfony\CS\Config\Config::create()
                 'var',
                 'vendor',
                 'eZ/Bundle/EzPublishCoreBundle/Tests/DependencyInjection/Fixtures',
-                'eZ/Bundle/EzPublishSolrSearchEngineBundle/Tests/DependencyInjection/Fixtures',
                 'eZ/Publish/API/Repository/Tests/FieldType/_fixtures',
                 'eZ/Publish/API/Repository/Tests/_fixtures',
                 'eZ/Publish/Core/FieldType/Tests/RichText/Converter/Xslt/_fixtures',
@@ -50,5 +49,6 @@ return Symfony\CS\Config\Config::create()
                 'eZ/Publish/Core/Search/Legacy/Tests/_fixtures',
                 'eZ/Publish/SPI/Tests/FieldType/_fixtures',
             ])
+            ->files()->name('*.php')
     )
 ;
diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/CacheFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/CacheFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Publish\Core\MVC\ConfigResolverInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidRepositoryException.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidRepositoryException.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception;
 
 use InvalidArgumentException;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidSearchEngine.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidSearchEngine.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception;
 
 use InvalidArgumentException;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidStorageEngine.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/Exception/InvalidStorageEngine.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception;
 
 use InvalidArgumentException;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/LazyRepositoryFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/LazyRepositoryFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Publish\API\Repository\Repository;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/RepositoryConfigurationProvider.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/RepositoryConfigurationProvider.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception\InvalidRepositoryException;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/RepositoryFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/RepositoryFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Publish\Core\MVC\ConfigResolverInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/SearchEngineFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/SearchEngineFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception\InvalidSearchEngine;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/StorageConnectionFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/StorageConnectionFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use Symfony\Component\DependencyInjection\ContainerAware;

diff --git a/eZ/Bundle/EzPublishCoreBundle/ApiLoader/StorageEngineFactory.php b/eZ/Bundle/EzPublishCoreBundle/ApiLoader/StorageEngineFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\ApiLoader;
 
 use eZ\Bundle\EzPublishCoreBundle\ApiLoader\Exception\InvalidStorageEngine;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Assetic/AssetFactory.php b/eZ/Bundle/EzPublishCoreBundle/Assetic/AssetFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Assetic;
 
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\DynamicSettingParserInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Cache/Http/InstantCachePurger.php b/eZ/Bundle/EzPublishCoreBundle/Cache/Http/InstantCachePurger.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Cache\Http;
 
 use eZ\Publish\Core\MVC\Symfony\Cache\Http\InstantCachePurger as BasePurger;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Cache/Http/VarnishProxyClientFactory.php b/eZ/Bundle/EzPublishCoreBundle/Cache/Http/VarnishProxyClientFactory.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Cache\Http;
 
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\DynamicSettingParserInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Command/TestInitDbCommand.php b/eZ/Bundle/EzPublishCoreBundle/Command/TestInitDbCommand.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Composer/ScriptHandler.php b/eZ/Bundle/EzPublishCoreBundle/Composer/ScriptHandler.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Composer;
 
 use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as DistributionBundleScriptHandler;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Console/Application.php b/eZ/Bundle/EzPublishCoreBundle/Console/Application.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Console;
 
 use eZ\Publish\Core\MVC\Symfony\Event\ScopeChangeEvent;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Controller.php b/eZ/Bundle/EzPublishCoreBundle/Controller.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller as BaseController;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Controller/PageController.php b/eZ/Bundle/EzPublishCoreBundle/Controller/PageController.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Controller;
 
 use eZ\Bundle\EzPublishCoreBundle\FieldType\Page\PageService as CoreBundlePageService;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Converter/ContentParamConverter.php b/eZ/Bundle/EzPublishCoreBundle/Converter/ContentParamConverter.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Converter;
 
 use eZ\Publish\API\Repository\ContentService;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Converter/LocationParamConverter.php b/eZ/Bundle/EzPublishCoreBundle/Converter/LocationParamConverter.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Converter;
 
 use eZ\Publish\API\Repository\LocationService;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Converter/RepositoryParamConverter.php b/eZ/Bundle/EzPublishCoreBundle/Converter/RepositoryParamConverter.php
@@ -6,7 +6,6 @@
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\Converter;
 
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/AsseticPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/AsseticPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/BinaryContentDownloadPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/BinaryContentDownloadPass.php
@@ -3,7 +3,6 @@
 /**
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/BlockViewPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/BlockViewPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 /**

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ChainConfigResolverPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ChainConfigResolverPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ChainRoutingPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ChainRoutingPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ComplexSettingsPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ComplexSettingsPass.php
@@ -6,7 +6,6 @@
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributd with this source code.
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ComplexSettings\ComplexSettingParserInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ConfigResolverParameterPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ConfigResolverParameterPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\DynamicSettingParserInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ContentViewPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ContentViewPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 /**

diff --git a/...PublishCoreBundle/DependencyInjection/Compiler/FieldTypeParameterProviderRegistryPass.php b/...PublishCoreBundle/DependencyInjection/Compiler/FieldTypeParameterProviderRegistryPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/FragmentPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/FragmentPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/HttpCachePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/HttpCachePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/IdentityDefinerPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/IdentityDefinerPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ImaginePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ImaginePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Alias;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LegacyStorageEnginePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LegacyStorageEnginePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LocalePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LocalePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LocationViewPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/LocationViewPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 /**

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RegisterSearchEnginePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RegisterSearchEnginePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RegisterStorageEnginePass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RegisterStorageEnginePass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/...ndle/EzPublishCoreBundle/DependencyInjection/Compiler/RichTextEzxmlInputConverterPass.php b/...ndle/EzPublishCoreBundle/DependencyInjection/Compiler/RichTextEzxmlInputConverterPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RichTextHtml5ConverterPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/RichTextHtml5ConverterPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/SecurityPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/SecurityPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/SignalSlotPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/SignalSlotPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/StorageConnectionPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/StorageConnectionPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ViewPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/ViewPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

diff --git a/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/XmlTextConverterPass.php b/eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Compiler/XmlTextConverterPass.php
@@ -8,7 +8,6 @@
  *
  * @version //autogentag//
  */
-
 namespace eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;