Migrate to PHP-CS-Fixer v2

ezpublishlegacy · Feb 8, 2017 · a6c3598 · a6c3598
1 parent 6ec1f96
commit a6c3598
Show file tree

Hide file tree

Showing 84 changed files with 950 additions and 948 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,27 +1,29 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingLinter(false)
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        'phpdoc_order',
-        'long_array_syntax',
-        '-short_array_syntax',
-        '-psr0',
-        '-concat_without_spaces',
-        '-phpdoc_params',
-        '-phpdoc_to_comment',
-        '-spaces_cast',
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(false)
+    ->setRules([
+        '@Symfony' => true,
+        // '@Symfony:risky' => true,
+        'array_syntax' => array('syntax' => 'long'),
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_align' => false,
+        'phpdoc_order' => true,
+        'phpdoc_no_alias_tag' => false,
+        // 'psr4' => true,
+        'semicolon_after_instruction' => true,
+        // 'strict_comparison' => true,
+        // 'strict_param' => true,
     ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude(['vendor', 'node_modules'])
             ->in(__DIR__)
-            ->exclude([
-                'vendor',
-                'node_modules',
-            ])
-            ->files()->name('*.php')
     )
 ;
diff --git a/API/Repository/TagsService.php b/API/Repository/TagsService.php
@@ -2,10 +2,10 @@
 
 namespace Netgen\TagsBundle\API\Repository;
 
+use Netgen\TagsBundle\API\Repository\Values\Tags\SynonymCreateStruct;
 use Netgen\TagsBundle\API\Repository\Values\Tags\Tag;
 use Netgen\TagsBundle\API\Repository\Values\Tags\TagCreateStruct;
 use Netgen\TagsBundle\API\Repository\Values\Tags\TagUpdateStruct;
-use Netgen\TagsBundle\API\Repository\Values\Tags\SynonymCreateStruct;
 
 interface TagsService
 {

diff --git a/API/Repository/Values/Content/Query/Criterion/TagId.php b/API/Repository/Values/Content/Query/Criterion/TagId.php
@@ -3,9 +3,9 @@
 namespace Netgen\TagsBundle\API\Repository\Values\Content\Query\Criterion;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator\Specifications;
 use eZ\Publish\API\Repository\Values\Content\Query\CriterionInterface;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
 
 /**
  * A criterion that matches content based on tag ID that is located in one of the fields.

diff --git a/API/Repository/Values/Content/Query/Criterion/TagKeyword.php b/API/Repository/Values/Content/Query/Criterion/TagKeyword.php
@@ -3,10 +3,10 @@
 namespace Netgen\TagsBundle\API\Repository\Values\Content\Query\Criterion;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator\Specifications;
-use eZ\Publish\API\Repository\Values\Content\Query\CriterionInterface;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator\Specifications;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Value;
+use eZ\Publish\API\Repository\Values\Content\Query\CriterionInterface;
 
 /**
  * A criterion that matches content based on tag keyword that is located in one of the fields.

diff --git a/API/Repository/Values/Tags/Tag.php b/API/Repository/Values/Tags/Tag.php
@@ -102,44 +102,6 @@ class Tag extends ValueObject
      */
     protected $languageCodes = array();
 
-    /**
-     * Returns the keyword in the given language.
-     *
-     * If no language is given, the keyword in main language of the tag if present, otherwise null
-     *
-     * @param string $languageCode
-     *
-     * @return string
-     */
-    public function getKeyword($languageCode = null)
-    {
-        if ($languageCode === null) {
-            $languageCode = $this->mainLanguageCode;
-        }
-
-        if (isset($this->keywords[$languageCode])) {
-            return $this->keywords[$languageCode];
-        }
-
-        return null;
-    }
-
-    /**
-     * Function where list of properties are returned.
-     *
-     * Override to add dynamic properties
-     *
-     * @uses \parent::getProperties()
-     *
-     * @param array $dynamicProperties
-     *
-     * @return array
-     */
-    protected function getProperties($dynamicProperties = array('keyword'))
-    {
-        return parent::getProperties($dynamicProperties);
-    }
-
     /**
      * Magic getter for retrieving convenience properties.
      *
@@ -173,6 +135,28 @@ public function __isset($property)
         return parent::__isset($property);
     }
 
+    /**
+     * Returns the keyword in the given language.
+     *
+     * If no language is given, the keyword in main language of the tag if present, otherwise null
+     *
+     * @param string $languageCode
+     *
+     * @return string
+     */
+    public function getKeyword($languageCode = null)
+    {
+        if ($languageCode === null) {
+            $languageCode = $this->mainLanguageCode;
+        }
+
+        if (isset($this->keywords[$languageCode])) {
+            return $this->keywords[$languageCode];
+        }
+
+        return null;
+    }
+
     /**
      * Returns if the current tag has a parent or not.
      *
@@ -192,4 +176,20 @@ public function isSynonym()
     {
         return $this->mainTagId > 0;
     }
+
+    /**
+     * Function where list of properties are returned.
+     *
+     * Override to add dynamic properties
+     *
+     * @uses \parent::getProperties()
+     *
+     * @param array $dynamicProperties
+     *
+     * @return array
+     */
+    protected function getProperties($dynamicProperties = array('keyword'))
+    {
+        return parent::getProperties($dynamicProperties);
+    }
 }
diff --git a/API/Repository/Values/Tags/TagStruct.php b/API/Repository/Values/Tags/TagStruct.php
@@ -15,6 +15,13 @@ abstract class TagStruct extends ValueObject
      */
     public $mainLanguageCode;
 
+    /**
+     * A global unique ID of the tag.
+     *
+     * @var string
+     */
+    public $remoteId;
+
     /**
      * Tag keywords in the target languages
      * Eg. array( "cro-HR" => "Hrvatska", "eng-GB" => "Croatia" ).
@@ -25,13 +32,6 @@ abstract class TagStruct extends ValueObject
      */
     protected $keywords;
 
-    /**
-     * A global unique ID of the tag.
-     *
-     * @var string
-     */
-    public $remoteId;
-
     /**
      * Returns keywords available in the struct.
      *

diff --git a/ApiLoader/LegacyTagsHandlerFactory.php b/ApiLoader/LegacyTagsHandlerFactory.php
@@ -3,12 +3,12 @@
 namespace Netgen\TagsBundle\ApiLoader;
 
 use eZ\Publish\Core\Persistence\Database\DatabaseHandler;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Handler;
-use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Mapper;
 use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Gateway\DoctrineDatabase;
 use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Gateway\ExceptionConversion;
+use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Handler;
+use Netgen\TagsBundle\Core\Persistence\Legacy\Tags\Mapper;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class LegacyTagsHandlerFactory implements ContainerAwareInterface
 {

diff --git a/Controller/Admin/RelatedContentController.php b/Controller/Admin/RelatedContentController.php
@@ -35,7 +35,7 @@ public function relatedContentAction(Request $request, Tag $tag)
     {
         $this->denyAccessUnlessGranted('ez:tags:read');
 
-        $currentPage = (int)$request->query->get('page');
+        $currentPage = (int) $request->query->get('page');
         $configResolver = $this->getConfigResolver();
 
         $pager = $this->createPager(

diff --git a/Controller/Admin/TagController.php b/Controller/Admin/TagController.php
@@ -5,6 +5,8 @@
 use eZ\Publish\API\Repository\ContentTypeService;
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\SearchService;
+use eZ\Publish\API\Repository\Values\Content\Query;
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use eZ\Publish\API\Repository\Values\Content\Search\SearchHit;
 use Netgen\TagsBundle\API\Repository\TagsService;
 use Netgen\TagsBundle\API\Repository\Values\Content\Query\Criterion\TagId;
@@ -18,8 +20,6 @@
 use Netgen\TagsBundle\Form\Type\TagUpdateType;
 use Pagerfanta\Adapter\AdapterInterface;
 use Symfony\Component\HttpFoundation\Request;
-use eZ\Publish\API\Repository\Values\Content\Query;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class TagController extends Controller
@@ -89,7 +89,7 @@ public function showTagAction(Request $request, Tag $tag = null)
         if (!$tag instanceof Tag || !$tag->isSynonym()) {
             $configResolver = $this->getConfigResolver();
 
-            $currentPage = (int)$request->query->get('page');
+            $currentPage = (int) $request->query->get('page');
             $pager = $this->createPager(
                 $this->tagChildrenAdapter,
                 $currentPage,

diff --git a/Core/FieldType/Tags/FormMapper.php b/Core/FieldType/Tags/FormMapper.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\TagsBundle\Core\FieldType\Tags;
 
-use Netgen\TagsBundle\Form\Type\TagTreeType;
 use EzSystems\RepositoryForms\Data\FieldDefinitionData;
 use EzSystems\RepositoryForms\FieldType\FieldDefinitionFormMapperInterface;
+use Netgen\TagsBundle\Form\Type\TagTreeType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;

diff --git a/Core/FieldType/Tags/SearchField.php b/Core/FieldType/Tags/SearchField.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\TagsBundle\Core\FieldType\Tags;
 
+use eZ\Publish\SPI\FieldType\Indexable;
 use eZ\Publish\SPI\Persistence\Content\Field;
 use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition;
-use eZ\Publish\SPI\FieldType\Indexable;
 use eZ\Publish\SPI\Search;
 
 class SearchField implements Indexable

diff --git a/Core/FieldType/Tags/TagsStorage.php b/Core/FieldType/Tags/TagsStorage.php
@@ -3,8 +3,8 @@
 namespace Netgen\TagsBundle\Core\FieldType\Tags;
 
 use eZ\Publish\Core\FieldType\GatewayBasedStorage;
-use eZ\Publish\SPI\Persistence\Content\VersionInfo;
 use eZ\Publish\SPI\Persistence\Content\Field;
+use eZ\Publish\SPI\Persistence\Content\VersionInfo;
 
 /**
  * Converter for Tags field type external storage.

diff --git a/Core/FieldType/Tags/TagsStorage/Gateway.php b/Core/FieldType/Tags/TagsStorage/Gateway.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\TagsBundle\Core\FieldType\Tags\TagsStorage;
 
-use eZ\Publish\SPI\Persistence\Content\VersionInfo;
-use eZ\Publish\SPI\Persistence\Content\Field;
 use eZ\Publish\Core\FieldType\StorageGateway;
+use eZ\Publish\SPI\Persistence\Content\Field;
+use eZ\Publish\SPI\Persistence\Content\VersionInfo;
 
 abstract class Gateway extends StorageGateway
 {

diff --git a/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php b/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php
@@ -2,13 +2,13 @@
 
 namespace Netgen\TagsBundle\Core\FieldType\Tags\TagsStorage\Gateway;
 
-use Netgen\TagsBundle\Core\FieldType\Tags\TagsStorage\Gateway;
-use eZ\Publish\SPI\Persistence\Content\Field;
-use eZ\Publish\SPI\Persistence\Content\VersionInfo;
 use eZ\Publish\Core\Persistence\Database\DatabaseHandler;
+use eZ\Publish\SPI\Persistence\Content\Field;
 use eZ\Publish\SPI\Persistence\Content\Language\Handler as LanguageHandler;
-use RuntimeException;
+use eZ\Publish\SPI\Persistence\Content\VersionInfo;
+use Netgen\TagsBundle\Core\FieldType\Tags\TagsStorage\Gateway;
 use PDO;
+use RuntimeException;
 
 class LegacyStorage extends Gateway
 {
@@ -58,22 +58,6 @@ public function setConnection($connection)
         $this->connection = $connection;
     }
 
-    /**
-     * Returns the active connection.
-     *
-     * @throws \RuntimeException if no connection has been set, yet
-     *
-     * @return \eZ\Publish\Core\Persistence\Database\DatabaseHandler
-     */
-    protected function getConnection()
-    {
-        if ($this->connection === null) {
-            throw new RuntimeException('Missing database connection.');
-        }
-
-        return $this->connection;
-    }
-
     /**
      * Stores the tags in the database based on the given field data.
      *
@@ -150,6 +134,22 @@ public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds)
         $query->prepare()->execute();
     }
 
+    /**
+     * Returns the active connection.
+     *
+     * @throws \RuntimeException if no connection has been set, yet
+     *
+     * @return \eZ\Publish\Core\Persistence\Database\DatabaseHandler
+     */
+    protected function getConnection()
+    {
+        if ($this->connection === null) {
+            throw new RuntimeException('Missing database connection.');
+        }
+
+        return $this->connection;
+    }
+
     /**
      * Returns the data for the given $fieldId and $versionNo.
      *
@@ -217,18 +217,18 @@ protected function loadFieldData($fieldId, $versionNo)
 
         $tagList = array();
         foreach ($rows as $row) {
-            $tagId = (int)$row['eztags_id'];
+            $tagId = (int) $row['eztags_id'];
             if (!isset($tagList[$tagId])) {
                 $tagList[$tagId] = array();
-                $tagList[$tagId]['id'] = (int)$row['eztags_id'];
-                $tagList[$tagId]['parent_id'] = (int)$row['eztags_parent_id'];
-                $tagList[$tagId]['main_tag_id'] = (int)$row['eztags_main_tag_id'];
+                $tagList[$tagId]['id'] = (int) $row['eztags_id'];
+                $tagList[$tagId]['parent_id'] = (int) $row['eztags_parent_id'];
+                $tagList[$tagId]['main_tag_id'] = (int) $row['eztags_main_tag_id'];
                 $tagList[$tagId]['keywords'] = array();
-                $tagList[$tagId]['depth'] = (int)$row['eztags_depth'];
+                $tagList[$tagId]['depth'] = (int) $row['eztags_depth'];
                 $tagList[$tagId]['path_string'] = $row['eztags_path_string'];
-                $tagList[$tagId]['modified'] = (int)$row['eztags_modified'];
+                $tagList[$tagId]['modified'] = (int) $row['eztags_modified'];
                 $tagList[$tagId]['remote_id'] = $row['eztags_remote_id'];
-                $tagList[$tagId]['always_available'] = ((int)$row['eztags_language_mask'] & 1) ? true : false;
+                $tagList[$tagId]['always_available'] = ((int) $row['eztags_language_mask'] & 1) ? true : false;
                 $tagList[$tagId]['main_language_code'] = $this->languageHandler->load($row['eztags_main_language_id'])->languageCode;
                 $tagList[$tagId]['language_codes'] = array();
             }