Applied fixes from FlintCI

sonata-project · Jan 22, 2019 · 6c763f8 · 6c763f8
1 parent 2c02013
commit 6c763f8
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 43 deletions.
diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
@@ -1039,7 +1039,7 @@ public function addSubClass($subClass)
             __METHOD__
         ), E_USER_DEPRECATED);
 
-        if (!\in_array($subClass, $this->subClasses)) {
+        if (!\in_array($subClass, $this->subClasses, true)) {
             $this->subClasses[] = $subClass;
         }
     }
@@ -2510,7 +2510,7 @@ public function getPagerType()
      */
     public function determinedPerPageValue($perPage)
     {
-        return \in_array($perPage, $this->perPageOptions);
+        return \in_array($perPage, $this->perPageOptions, true);
     }
 
     public function isAclEnabled()
@@ -2607,7 +2607,7 @@ public function configureActionButtons($action, $object = null)
     {
         $list = [];
 
-        if (\in_array($action, ['tree', 'show', 'edit', 'delete', 'list', 'batch'])
+        if (\in_array($action, ['tree', 'show', 'edit', 'delete', 'list', 'batch'], true)
             && $this->hasAccess('create')
             && $this->hasRoute('create')
         ) {
@@ -2618,7 +2618,7 @@ public function configureActionButtons($action, $object = null)
             ];
         }
 
-        if (\in_array($action, ['show', 'delete', 'acl', 'history'])
+        if (\in_array($action, ['show', 'delete', 'acl', 'history'], true)
             && $this->canAccessObject('edit', $object)
             && $this->hasRoute('edit')
         ) {
@@ -2629,7 +2629,7 @@ public function configureActionButtons($action, $object = null)
             ];
         }
 
-        if (\in_array($action, ['show', 'edit', 'acl'])
+        if (\in_array($action, ['show', 'edit', 'acl'], true)
             && $this->canAccessObject('history', $object)
             && $this->hasRoute('history')
         ) {
@@ -2640,7 +2640,7 @@ public function configureActionButtons($action, $object = null)
             ];
         }
 
-        if (\in_array($action, ['edit', 'history'])
+        if (\in_array($action, ['edit', 'history'], true)
             && $this->isAclEnabled()
             && $this->canAccessObject('acl', $object)
             && $this->hasRoute('acl')
@@ -2652,7 +2652,7 @@ public function configureActionButtons($action, $object = null)
             ];
         }
 
-        if (\in_array($action, ['edit', 'history', 'acl'])
+        if (\in_array($action, ['edit', 'history', 'acl'], true)
             && $this->canAccessObject('show', $object)
             && \count($this->getShow()) > 0
             && $this->hasRoute('show')
@@ -2664,7 +2664,7 @@ public function configureActionButtons($action, $object = null)
             ];
         }
 
-        if (\in_array($action, ['show', 'edit', 'delete', 'acl', 'batch'])
+        if (\in_array($action, ['show', 'edit', 'delete', 'acl', 'batch'], true)
             && $this->hasAccess('list')
             && $this->hasRoute('list')
         ) {

diff --git a/src/Admin/Pool.php b/src/Admin/Pool.php
@@ -272,7 +272,7 @@ public function getAdminByAdminCode($adminCode)
      */
     public function getInstance($id)
     {
-        if (!\in_array($id, $this->adminServiceIds)) {
+        if (!\in_array($id, $this->adminServiceIds, true)) {
             $msg = sprintf('Admin service "%s" not found in admin pool.', $id);
             $shortest = -1;
             $closest = null;

diff --git a/src/Block/AdminListBlockService.php b/src/Block/AdminListBlockService.php
@@ -60,7 +60,7 @@ public function execute(BlockContextInterface $blockContext, Response $response
 
         $visibleGroups = [];
         foreach ($dashboardGroups as $name => $dashboardGroup) {
-            if (!$settings['groups'] || \in_array($name, $settings['groups'])) {
+            if (!$settings['groups'] || \in_array($name, $settings['groups'], true)) {
                 $visibleGroups[] = $dashboardGroup;
             }
         }

diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -78,7 +78,7 @@ class CRUDController implements ContainerAwareInterface
     // BC for Symfony 3.3 where ControllerTrait exists but does not contain get() and has() methods.
     public function __call($method, $arguments)
     {
-        if (\in_array($method, ['get', 'has'])) {
+        if (\in_array($method, ['get', 'has'], true)) {
             return \call_user_func_array([$this->container, $method], $arguments);
         }
 
@@ -966,7 +966,7 @@ public function exportAction(Request $request)
             $exporter = $this->get('sonata.exporter.exporter');
         }
 
-        if (!\in_array($format, $allowedExportFormats)) {
+        if (!\in_array($format, $allowedExportFormats, true)) {
             throw new \RuntimeException(
                 sprintf(
                     'Export in format `%s` is not allowed for class: `%s`. Allowed formats are: `%s`',

diff --git a/src/Datagrid/ListMapper.php b/src/Datagrid/ListMapper.php
@@ -88,7 +88,7 @@ public function add($name, $type = null, array $fieldDescriptionOptions = [])
         }
 
         // Ensure batch and action pseudo-fields are tagged as virtual
-        if (\in_array($type, ['actions', 'batch', 'select'])) {
+        if (\in_array($type, ['actions', 'batch', 'select'], true)) {
             $fieldDescriptionOptions['virtual_field'] = true;
         }
 

diff --git a/src/DependencyInjection/Compiler/ExtensionCompilerPass.php b/src/DependencyInjection/Compiler/ExtensionCompilerPass.php
@@ -201,7 +201,7 @@ protected function flattenExtensionConfiguration(array $config)
      */
     protected function hasTrait(\ReflectionClass $class, $traitName)
     {
-        if (\in_array($traitName, $class->getTraitNames())) {
+        if (\in_array($traitName, $class->getTraitNames(), true)) {
             return true;
         }
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -107,7 +107,7 @@ public function getConfigTreeBuilder()
                             ->info('Perhaps one of the three options: show, fade, hide.')
                             ->validate()
                                 ->ifTrue(function ($v) {
-                                    return !\in_array($v, ['show', 'fade', 'hide']);
+                                    return !\in_array($v, ['show', 'fade', 'hide'], true);
                                 })
                                 ->thenInvalid('Configuration value of "global_search.empty_boxes" must be one of show, fade or hide.')
                             ->end()

diff --git a/src/DependencyInjection/SonataAdminExtension.php b/src/DependencyInjection/SonataAdminExtension.php
@@ -341,7 +341,7 @@ public function prepend(ContainerBuilder $container)
         foreach ($diExtraConfigs as $diExtraConfig) {
             if (isset($diExtraConfig['annotation_patterns'])) {
                 // don't add our own pattern if user has already done so
-                if (false !== array_search($sonataAdminPattern, $diExtraConfig['annotation_patterns'])) {
+                if (false !== array_search($sonataAdminPattern, $diExtraConfig['annotation_patterns'], true)) {
                     return;
                 }
                 $annotationPatternsConfigured = true;
@@ -488,8 +488,8 @@ private function mergeArray(array $array, array $addArray, array $removeArray =
             array_push($array, $toAdd);
         }
         foreach ($removeArray as $toRemove) {
-            if (\in_array($toRemove, $array)) {
-                array_splice($array, array_search($toRemove, $array), 1);
+            if (\in_array($toRemove, $array, true)) {
+                array_splice($array, array_search($toRemove, $array, true), 1);
             }
         }
 

diff --git a/src/Form/DataTransformer/LegacyModelsToArrayTransformer.php b/src/Form/DataTransformer/LegacyModelsToArrayTransformer.php
@@ -56,7 +56,7 @@ public function transform($collection)
 
             foreach ($collection as $entity) {
                 // identify choices by their collection key
-                $key = array_search($entity, $availableEntities);
+                $key = array_search($entity, $availableEntities, true);
                 $array[] = $key;
             }
         } else {

diff --git a/src/Form/FormMapper.php b/src/Form/FormMapper.php
@@ -199,7 +199,7 @@ public function removeGroup($group, $tab = 'default', $deleteEmptyTab = false)
         unset($groups[$group]);
 
         $tabs = $this->getTabs();
-        $key = array_search($group, $tabs[$tab]['groups']);
+        $key = array_search($group, $tabs[$tab]['groups'], true);
 
         if (false !== $key) {
             unset($tabs[$tab]['groups'][$key]);

diff --git a/src/Mapper/BaseGroupedMapper.php b/src/Mapper/BaseGroupedMapper.php
@@ -145,7 +145,7 @@ public function with($name, array $options = [])
             $tabs = $this->getTabs();
         }
 
-        if ($this->currentGroup && isset($tabs[$this->currentTab]) && !\in_array($this->currentGroup, $tabs[$this->currentTab]['groups'])) {
+        if ($this->currentGroup && isset($tabs[$this->currentTab]) && !\in_array($this->currentGroup, $tabs[$this->currentTab]['groups'], true)) {
             $tabs[$this->currentTab]['groups'][] = $this->currentGroup;
         }
 

diff --git a/src/Model/AuditManager.php b/src/Model/AuditManager.php
@@ -48,7 +48,7 @@ public function setReader($serviceId, array $classes)
     public function hasReader($class)
     {
         foreach ($this->readers as $classes) {
-            if (\in_array($class, $classes)) {
+            if (\in_array($class, $classes, true)) {
                 return true;
             }
         }
@@ -59,7 +59,7 @@ public function hasReader($class)
     public function getReader($class)
     {
         foreach ($this->readers as $readerId => $classes) {
-            if (\in_array($class, $classes)) {
+            if (\in_array($class, $classes, true)) {
                 return $this->container->get($readerId);
             }
         }

diff --git a/src/Route/DefaultRouteGenerator.php b/src/Route/DefaultRouteGenerator.php
@@ -158,7 +158,7 @@ private function loadCache(AdminInterface $admin): void
             return;
         }
 
-        if (\in_array($admin->getCode(), $this->loaded)) {
+        if (\in_array($admin->getCode(), $this->loaded, true)) {
             return;
         }
 

diff --git a/src/Route/RouteCollection.php b/src/Route/RouteCollection.php
@@ -207,7 +207,7 @@ public function clearExcept($routeList)
 
         $elements = $this->elements;
         foreach ($elements as $key => $element) {
-            if (!\in_array($key, $routeCodeList)) {
+            if (!\in_array($key, $routeCodeList, true)) {
                 unset($this->elements[$key]);
             }
         }

diff --git a/src/Security/Handler/AclSecurityHandler.php b/src/Security/Handler/AclSecurityHandler.php
@@ -210,7 +210,7 @@ public function addObjectClassAces(AclInterface $acl, array $roleInformation = [
 
             foreach ($permissions as $permission) {
                 // add only the object permissions
-                if (\in_array($permission, $this->getObjectPermissions())) {
+                if (\in_array($permission, $this->getObjectPermissions(), true)) {
                     $builder->add($permission);
                     $hasRole = true;
                 }

diff --git a/src/Show/ShowMapper.php b/src/Show/ShowMapper.php
@@ -129,7 +129,7 @@ public function removeGroup($group, $tab = 'default', $deleteEmptyTab = false)
         unset($groups[$group]);
 
         $tabs = $this->getTabs();
-        $key = array_search($group, $tabs[$tab]['groups']);
+        $key = array_search($group, $tabs[$tab]['groups'], true);
 
         if (false !== $key) {
             unset($tabs[$tab]['groups'][$key]);

diff --git a/src/Twig/Extension/SonataAdminExtension.php b/src/Twig/Extension/SonataAdminExtension.php
@@ -475,7 +475,7 @@ final public function getCanonicalizedLocaleForMoment(array $context)
         }
 
         foreach (self::MOMENT_UNSUPPORTED_LOCALES as $language => $locales) {
-            if ($language === $lang && !\in_array($locale, $locales)) {
+            if ($language === $lang && !\in_array($locale, $locales, true)) {
                 $locale = $language;
             }
         }

diff --git a/src/Util/AdminAclManipulator.php b/src/Util/AdminAclManipulator.php
@@ -81,7 +81,7 @@ public function addAdminClassAces(
 
                 foreach ($permissions as $permission) {
                     // add only the admin permissions
-                    if (\in_array($permission, $securityHandler->getAdminPermissions())) {
+                    if (\in_array($permission, $securityHandler->getAdminPermissions(), true)) {
                         $builder->add($permission);
                         $roleAdminPermissions[] = $permission;
                     }

diff --git a/src/Util/AdminObjectAclData.php b/src/Util/AdminObjectAclData.php
@@ -272,7 +272,7 @@ public function getUserPermissions()
 
         if (!$this->isOwner()) {
             foreach (self::$ownerPermissions as $permission) {
-                $key = array_search($permission, $permissions);
+                $key = array_search($permission, $permissions, true);
                 if (false !== $key) {
                     unset($permissions[$key]);
                 }

diff --git a/src/Util/AdminObjectAclManipulator.php b/src/Util/AdminObjectAclManipulator.php
@@ -254,7 +254,7 @@ protected function buildForm(AdminObjectAclData $data, FormBuilderInterface $for
                 if (
                     self::ACL_ROLES_FORM_NAME === $formBuilder->getName()
                     && isset($securityInformation[$aclValue])
-                    && false !== array_search($permission, $securityInformation[$aclValue])
+                    && false !== array_search($permission, $securityInformation[$aclValue], true)
                 ) {
                     $attr['disabled'] = 'disabled';
                 }

diff --git a/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php b/tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
@@ -186,7 +186,7 @@ public function testProcessResultingConfig(): void
         $this->assertContains('sonata_post_admin', $adminGroups['sonata_group_one']['items'][0]['admin']);
         $this->assertContains('sonata_news_admin', $adminGroups['sonata_group_one']['items']);
         $this->assertContains('sonata_news_admin', $adminGroups['sonata_group_one']['item_adds']);
-        $this->assertFalse(\in_array('sonata_article_admin', $adminGroups['sonata_group_one']['items']));
+        $this->assertFalse(\in_array('sonata_article_admin', $adminGroups['sonata_group_one']['items'], true));
         $this->assertContains('ROLE_ONE', $adminGroups['sonata_group_one']['roles']);
 
         $this->assertArrayHasKey('sonata_group_two', $adminGroups);

diff --git a/tests/Form/Widget/BaseWidgetTest.php b/tests/Form/Widget/BaseWidgetTest.php
@@ -68,7 +68,7 @@ protected function getEnvironment()
      */
     protected function getRenderingEngine(\Twig_Environment $environment = null)
     {
-        if (!\in_array($this->type, ['form', 'filter'])) {
+        if (!\in_array($this->type, ['form', 'filter'], true)) {
             throw new \Exception('Please override $this->type in your test class specifying template to use (either form or filter)');
         }
 

diff --git a/tests/Security/Handler/RoleSecurityHandlerTest.php b/tests/Security/Handler/RoleSecurityHandlerTest.php
@@ -80,27 +80,27 @@ public function testIsGranted($expected, array $superAdminRoles, $adminCode, $op
         $this->authorizationChecker->expects($this->any())
             ->method('isGranted')
             ->will($this->returnCallback(function (array $attributes, $object) {
-                if (\in_array('ROLE_BATMAN', $attributes)) {
+                if (\in_array('ROLE_BATMAN', $attributes, true)) {
                     return true;
                 }
 
-                if (\in_array('ROLE_IRONMAN', $attributes)) {
+                if (\in_array('ROLE_IRONMAN', $attributes, true)) {
                     return true;
                 }
 
-                if (\in_array('ROLE_AUTH_EXCEPTION', $attributes)) {
+                if (\in_array('ROLE_AUTH_EXCEPTION', $attributes, true)) {
                     throw new AuthenticationCredentialsNotFoundException();
                 }
 
-                if (\in_array('ROLE_FOO_BAR_ABC', $attributes)) {
+                if (\in_array('ROLE_FOO_BAR_ABC', $attributes, true)) {
                     return true;
                 }
 
-                if (\in_array('ROLE_FOO_BAR_DEF', $attributes) && is_a($object, 'stdClass')) {
+                if (\in_array('ROLE_FOO_BAR_DEF', $attributes, true) && is_a($object, 'stdClass')) {
                     return true;
                 }
 
-                if (\in_array('ROLE_FOO_BAR_BAZ_ALL', $attributes)) {
+                if (\in_array('ROLE_FOO_BAR_BAZ_ALL', $attributes, true)) {
                     return true;
                 }
 

diff --git a/tests/Util/AdminObjectAclDataTest.php b/tests/Util/AdminObjectAclDataTest.php
@@ -169,8 +169,8 @@ public function testGetUserPermissions(): void
             $this->assertInternalType('string', $permission);
         }
 
-        $this->assertTrue(false !== array_search('OWNER', $adminObjectAclDataOwner->getUserPermissions()));
-        $this->assertTrue(false !== array_search('MASTER', $adminObjectAclDataOwner->getUserPermissions()));
+        $this->assertTrue(false !== array_search('OWNER', $adminObjectAclDataOwner->getUserPermissions(), true));
+        $this->assertTrue(false !== array_search('MASTER', $adminObjectAclDataOwner->getUserPermissions(), true));
 
         $adminObjectAclData = $this->createAdminObjectAclData(false);
         $this->assertInternalType('array', $adminObjectAclData->getUserPermissions());
@@ -179,8 +179,8 @@ public function testGetUserPermissions(): void
             $this->assertInternalType('string', $permission);
         }
 
-        $this->assertFalse(array_search('OWNER', $adminObjectAclData->getUserPermissions()));
-        $this->assertFalse(array_search('MASTER', $adminObjectAclData->getUserPermissions()));
+        $this->assertFalse(array_search('OWNER', $adminObjectAclData->getUserPermissions(), true));
+        $this->assertFalse(array_search('MASTER', $adminObjectAclData->getUserPermissions(), true));
     }
 
     public function testIsOwner(): void