Allow risky fixers

ezecosystem · Feb 8, 2017 · 267ae9c · 267ae9c
1 parent a6c3598
commit 267ae9c
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 28 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,10 +1,10 @@
 <?php
 
 return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(false)
+    ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
-        // '@Symfony:risky' => true,
+        '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
         'combine_consecutive_unsets' => true,
         'concat_space' => ['spacing' => 'one'],
@@ -16,10 +16,10 @@ return PhpCsFixer\Config::create()
         'phpdoc_align' => false,
         'phpdoc_order' => true,
         'phpdoc_no_alias_tag' => false,
-        // 'psr4' => true,
+        'psr4' => true,
         'semicolon_after_instruction' => true,
-        // 'strict_comparison' => true,
-        // 'strict_param' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

diff --git a/Controller/Admin/TagController.php b/Controller/Admin/TagController.php
@@ -501,7 +501,7 @@ public function translationAction(Request $request, Tag $tag)
         } elseif ($request->request->has('UpdateMainTranslationButton')) {
             $newMainTranslation = $request->request->get('MainLocale');
 
-            if (!in_array($newMainTranslation, $tag->languageCodes)) {
+            if (!in_array($newMainTranslation, $tag->languageCodes, true)) {
                 $this->addFlashMessage('errors', 'no_translation', array('%locale%', $newMainTranslation));
             } else {
                 $tagUpdateStruct->mainLanguageCode = $newMainTranslation;

diff --git a/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php b/Core/FieldType/Tags/TagsStorage/Gateway/LegacyStorage.php
@@ -237,7 +237,7 @@ protected function loadFieldData($fieldId, $versionNo)
                 $tagList[$tagId]['keywords'][$row['eztags_keyword_locale']] = $row['eztags_keyword_keyword'];
             }
 
-            if (!in_array(array($row['eztags_keyword_locale']), $tagList[$tagId]['language_codes'])) {
+            if (!in_array(array($row['eztags_keyword_locale']), $tagList[$tagId]['language_codes'], true)) {
                 $tagList[$tagId]['language_codes'][] = $row['eztags_keyword_locale'];
             }
         }

diff --git a/Core/FieldType/Tags/Type.php b/Core/FieldType/Tags/Type.php
@@ -223,7 +223,7 @@ public function fromPersistenceValue(FieldValue $fieldValue)
      */
     public function isEmptyValue(SPIValue $value)
     {
-        return $value === null || $value->tags == $this->getEmptyValue()->tags;
+        return $value === null || $value->tags === $this->getEmptyValue()->tags;
     }
 
     /**

diff --git a/Core/Limitation/TagLimitationType.php b/Core/Limitation/TagLimitationType.php
@@ -141,7 +141,14 @@ public function evaluate(APILimitationValue $value, UserReference $currentUser,
             return false;
         }
 
-        return in_array($object->id, $value->limitationValues);
+        $limitationValues = array_map(
+            function ($value) {
+                return (int) $value;
+            },
+            $value->limitationValues
+        );
+
+        return in_array($object->id, $limitationValues, true);
     }
 
     /**

diff --git a/Core/Pagination/Pagerfanta/View/TagsAdminView.php b/Core/Pagination/Pagerfanta/View/TagsAdminView.php
@@ -136,8 +136,8 @@ protected function calculateStartAndEndPage()
             $endPage = $nbPages;
         }
 
-        $this->startPage = $startPage;
-        $this->endPage = $endPage;
+        $this->startPage = (int) $startPage;
+        $this->endPage = (int) $endPage;
     }
 
     /**
@@ -184,7 +184,7 @@ protected function getPages()
         $pages['first_page'] = $this->startPage > 1 ? $this->generateUrl(1) : false;
         $pages['mobile_first_page'] = $this->pagerfanta->getCurrentPage() > 2 ? $this->generateUrl(1) : false;
 
-        $pages['second_page'] = $this->startPage == 3 ? $this->generateUrl(2) : false;
+        $pages['second_page'] = $this->startPage === 3 ? $this->generateUrl(2) : false;
 
         $pages['separator_before'] = $this->startPage > 3 ? true : false;
 
@@ -197,7 +197,7 @@ protected function getPages()
 
         $pages['separator_after'] = $this->endPage < $this->pagerfanta->getNbPages() - 2 ? true : false;
 
-        $pages['second_to_last_page'] = $this->endPage == $this->pagerfanta->getNbPages() - 2 ?
+        $pages['second_to_last_page'] = $this->endPage === $this->pagerfanta->getNbPages() - 2 ?
             $this->generateUrl($this->pagerfanta->getNbPages() - 1) :
             false;
 

diff --git a/Core/Persistence/Legacy/Tags/Gateway/DoctrineDatabase.php b/Core/Persistence/Legacy/Tags/Gateway/DoctrineDatabase.php
@@ -921,7 +921,7 @@ public function moveSubtree(array $sourceTagData, array $destinationParentTagDat
             );
 
             $newParentId = $row['parent_id'];
-            if ($row['path_string'] === $sourceTagData['path_string'] || $row['main_tag_id'] == $sourceTagData['id']) {
+            if ($row['path_string'] === $sourceTagData['path_string'] || (int) $row['main_tag_id'] === (int) $sourceTagData['id']) {
                 $newParentId = (int) implode('', array_slice(explode('/', $newPathString), -3, 1));
             }
 

diff --git a/Core/REST/Server/Controller/Tags.php b/Core/REST/Server/Controller/Tags.php
@@ -76,7 +76,7 @@ public function loadTag($tagPath)
             $this->extractTagIdFromPath($tagPath)
         );
 
-        if (trim($tag->pathString, '/') != $tagPath) {
+        if (trim($tag->pathString, '/') !== $tagPath) {
             throw new Exceptions\NotFoundException(
                 "Could not find tag with path string $tagPath"
             );

diff --git a/Core/Repository/TagsService.php b/Core/Repository/TagsService.php
@@ -826,9 +826,9 @@ public function copySubtree(Tag $tag, Tag $targetParentTag = null)
             throw new InvalidArgumentException('tag', 'Source tag is a synonym');
         }
 
-        if (!$targetParentTag instanceof Tag && $tag->parentTagId == 0) {
+        if (!$targetParentTag instanceof Tag && $tag->parentTagId === 0) {
             throw new InvalidArgumentException('targetParentTag', 'Tag is already located at the root of the tree');
-        } elseif ($targetParentTag instanceof Tag && $tag->parentTagId == $targetParentTag->id) {
+        } elseif ($targetParentTag instanceof Tag && $tag->parentTagId === $targetParentTag->id) {
             throw new InvalidArgumentException('targetParentTag', 'Target parent tag is already the parent of the given tag');
         }
 
@@ -887,9 +887,9 @@ public function moveSubtree(Tag $tag, Tag $targetParentTag = null)
             throw new InvalidArgumentException('tag', 'Source tag is a synonym');
         }
 
-        if (!$targetParentTag instanceof Tag && $tag->parentTagId == 0) {
+        if (!$targetParentTag instanceof Tag && $tag->parentTagId === 0) {
             throw new InvalidArgumentException('targetParentTag', 'Tag is already located at the root of the tree');
-        } elseif ($targetParentTag instanceof Tag && $tag->parentTagId == $targetParentTag->id) {
+        } elseif ($targetParentTag instanceof Tag && $tag->parentTagId === $targetParentTag->id) {
             throw new InvalidArgumentException('targetParentTag', 'Target parent tag is already the parent of the given tag');
         }
 

diff --git a/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/Tags/TagKeyword.php b/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/Tags/TagKeyword.php
@@ -107,7 +107,7 @@ public function handle(CriteriaConverter $converter, SelectQuery $query, Criteri
             }
         }
 
-        if ($criterion->operator == Criterion\Operator::LIKE) {
+        if ($criterion->operator === Criterion\Operator::LIKE) {
             $subSelect->where(
                 $subSelect->expr->like(
                     $this->dbHandler->quoteColumn('keyword', 'eztags_keyword'),

diff --git a/DependencyInjection/NetgenTagsExtension.php b/DependencyInjection/NetgenTagsExtension.php
@@ -49,11 +49,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         $activatedBundles = array_keys($container->getParameter('kernel.bundles'));
 
-        if (in_array('EzSystemsEzPlatformSolrSearchEngineBundle', $activatedBundles)) {
+        if (in_array('EzSystemsEzPlatformSolrSearchEngineBundle', $activatedBundles, true)) {
             $loader->load('storage_engines/solr/criterion_visitors.yml');
         }
 
-        if (in_array('EzPublishLegacySearchEngineBundle', $activatedBundles)) {
+        if (in_array('EzPublishLegacySearchEngineBundle', $activatedBundles, true)) {
             $loader->load('storage_engines/legacy/search_query_handlers.yml');
         }
 

diff --git a/Tests/Core/FieldType/TagsTest.php b/Tests/Core/FieldType/TagsTest.php
@@ -36,7 +36,7 @@ class TagsTest extends FieldTypeTest
      */
     public function getTagsServiceLoadTagValues($tagId)
     {
-        if ($tagId < 0 || $tagId == PHP_INT_MAX) {
+        if ($tagId < 0 || $tagId === PHP_INT_MAX) {
             throw new NotFoundException('tag', $tagId);
         }
 

diff --git a/Tests/Core/Limitation/TagLimitationTypeTest.php b/Tests/Core/Limitation/TagLimitationTypeTest.php
@@ -314,6 +314,7 @@ public function providerForTestEvaluate()
     /**
      * @depends testConstruct
      * @dataProvider providerForTestEvaluate
+     *
      * @param mixed $expected
      */
     public function testEvaluate(TagLimitation $limitation, ValueObject $object, $expected, TagLimitationType $limitationType)

diff --git a/Tests/Core/Persistence/Legacy/Content/LanguageHandlerMock.php b/Tests/Core/Persistence/Legacy/Content/LanguageHandlerMock.php
@@ -71,8 +71,9 @@ public function update(Language $struct)
      */
     public function load($id)
     {
+        $id = (int) $id;
         foreach ($this->languages as $language) {
-            if ($language->id == $id) {
+            if ($language->id === $id) {
                 return $language;
             }
         }
@@ -91,7 +92,7 @@ public function load($id)
     public function loadByLanguageCode($languageCode)
     {
         foreach ($this->languages as $language) {
-            if ($language->languageCode == $languageCode) {
+            if ($language->languageCode === $languageCode) {
                 return $language;
             }
         }

diff --git a/Tests/Core/Repository/Service/Integration/TagsBase.php b/Tests/Core/Repository/Service/Integration/TagsBase.php
@@ -90,10 +90,10 @@ public function testIsPropertySet()
     {
         $tag = new Tag();
         $value = isset($tag->notDefined);
-        $this->assertEquals(false, $value);
+        $this->assertFalse($value);
 
         $value = isset($tag->id);
-        $this->assertEquals(true, $value);
+        $this->assertTrue($value);
     }
 
     /**

diff --git a/View/Builder/ParametersFilter/CurrentPage.php b/View/Builder/ParametersFilter/CurrentPage.php
@@ -32,7 +32,7 @@ public function addCurrentPage(FilterViewBuilderParametersEvent $event)
         $parameterBag = $event->getParameters();
 
         $route = $parameterBag->get('_route');
-        if (!in_array($route, array(TagRouter::TAG_URL_ROUTE_NAME, TagUrlGenerator::INTERNAL_TAG_ROUTE))) {
+        if (!in_array($route, array(TagRouter::TAG_URL_ROUTE_NAME, TagUrlGenerator::INTERNAL_TAG_ROUTE), true)) {
             return;
         }