Merge pull request #3004 from acrobat/fix-typehint-issues

[AllBundles] Fixed undefined class warnings in typehints
Kunstmaan · Oct 25, 2021 · 120e234 · 120e234
2 parents 9ad94c1 + 1a3a872
commit 120e234
Show file tree

Hide file tree

Showing 40 changed files with 74 additions and 110 deletions.
diff --git a/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php b/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php
@@ -19,7 +19,7 @@
 class ApplyAclCommand extends ContainerAwareCommand
 {
     /**
-     * @var EntityManager
+     * @var EntityManagerInterface
      */
     private $em = null;
 

diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\AdminBundle\Helper\FormWidgets;
 
 use Doctrine\ORM\EntityManager;
+use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php
@@ -5,6 +5,7 @@
 use Doctrine\ORM\EntityManager;
 use Kunstmaan\AdminBundle\Entity\AbstractEntity;
 use Kunstmaan\AdminBundle\Entity\AclChangeset;
+use Kunstmaan\AdminBundle\Entity\BaseUser;
 use Kunstmaan\AdminBundle\Entity\Role;
 use Kunstmaan\UtilitiesBundle\Helper\Shell\Shell;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;

diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/OAuth/OAuthUserFinder.php b/src/Kunstmaan/AdminBundle/Helper/Security/OAuth/OAuthUserFinder.php
@@ -9,7 +9,7 @@
  */
 class OAuthUserFinder implements OAuthUserFinderInterface
 {
-    /** @var EntityManager */
+    /** @var EntityManagerInterface */
     private $em;
 
     /** @var string */

diff --git a/src/Kunstmaan/AdminBundle/Service/AclManager.php b/src/Kunstmaan/AdminBundle/Service/AclManager.php
@@ -5,8 +5,10 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\AdminBundle\Entity\AclChangeset;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin;
+use Kunstmaan\AdminBundle\Repository\AclChangesetRepository;
 use Kunstmaan\NodeBundle\Entity\Node;
 use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
+use Symfony\Component\Security\Acl\Model\AclInterface;
 use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface;
 use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface;
 
@@ -41,7 +43,6 @@ public function updateNodeAcl(Node $originalNode, Node $nodeNewPage)
         $newAcl = $this->aclProvider->createAcl($newIdentity);
 
         $aces = $originalAcl->getObjectAces();
-        /* @var EntryInterface $ace */
         foreach ($aces as $ace) {
             $securityIdentity = $ace->getSecurityIdentity();
             if ($securityIdentity instanceof RoleSecurityIdentity) {
@@ -60,11 +61,10 @@ public function updateNodesAclToRole(array $nodes, $role, $mask)
         foreach ($nodes as $node) {
             $objectIdentity = $this->objectIdentityRetrievalStrategy->getObjectIdentity($node);
 
-            /** @var Acl $acl */
+            /** @var AclInterface $acl */
             $acl = $this->aclProvider->findAcl($objectIdentity);
             $securityIdentity = new RoleSecurityIdentity($role);
 
-            /** @var Entry $ace */
             foreach ($acl->getObjectAces() as $index => $ace) {
                 if (!$ace->getSecurityIdentity()->equals($securityIdentity)) {
                     continue;

diff --git a/src/Kunstmaan/AdminListBundle/DependencyInjection/Configuration.php b/src/Kunstmaan/AdminListBundle/DependencyInjection/Configuration.php
@@ -2,6 +2,7 @@
 
 namespace Kunstmaan\AdminListBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

diff --git a/src/Kunstmaan/AdminListBundle/Tests/AdminList/FilterType/ORM/BooleanFilterTypeTest.php b/src/Kunstmaan/AdminListBundle/Tests/AdminList/FilterType/ORM/BooleanFilterTypeTest.php
@@ -3,16 +3,10 @@
 namespace Kunstmaan\AdminListBundle\Tests\AdminList\FilterType\ORM;
 
 use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\BooleanFilterType;
-use Kunstmaan\AdminListBundle\Tests\UnitTester;
 use Symfony\Component\HttpFoundation\Request;
 
 class BooleanFilterTypeTest extends BaseOrmFilterTest
 {
-    /**
-     * @var UnitTester
-     */
-    protected $tester;
-
     /**
      * @var BooleanFilterType
      */

diff --git a/src/Kunstmaan/AdminListBundle/Tests/AdminList/FilterType/ORM/DateFilterTypeTest.php b/src/Kunstmaan/AdminListBundle/Tests/AdminList/FilterType/ORM/DateFilterTypeTest.php
@@ -4,17 +4,11 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\DateFilterType;
-use Kunstmaan\AdminListBundle\Tests\UnitTester;
 use ReflectionClass;
 use Symfony\Component\HttpFoundation\Request;
 
 class DateFilterTypeTest extends BaseOrmFilterTest
 {
-    /**
-     * @var UnitTester
-     */
-    protected $tester;
-
     /**
      * @var DateFilterType
      */

diff --git a/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/AbstractAnalyticsCommandHelper.php b/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/AbstractAnalyticsCommandHelper.php
@@ -4,14 +4,16 @@
 
 use Doctrine\ORM\EntityManager;
 use Kunstmaan\DashboardBundle\Entity\AnalyticsOverview;
+use Kunstmaan\DashboardBundle\Helper\Google\Analytics\ConfigHelper;
+use Kunstmaan\DashboardBundle\Helper\Google\Analytics\QueryHelper;
 use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class AbstractAnalyticsCommandHelper
 {
     /** @var ConfigHelper */
     protected $configHelper;
 
-    /** @var GooglequeryHelper */
+    /** @var QueryHelper */
     protected $query;
 
     /** @var EntityManager */

diff --git a/src/Kunstmaan/DashboardBundle/Entity/AnalyticsConfig.php b/src/Kunstmaan/DashboardBundle/Entity/AnalyticsConfig.php
@@ -75,7 +75,7 @@ class AnalyticsConfig extends AbstractEntity
      *
      * @param array $overviews
      *
-     * @return AnalyticsDailyOverviews
+     * @return self
      */
     public function setOverviews($overviews)
     {
@@ -99,7 +99,7 @@ public function getOverviews()
      *
      * @param array $segments
      *
-     * @return AnalyticsDailysegments
+     * @return self
      */
     public function setSegments($segments)
     {
@@ -133,7 +133,7 @@ public function getName()
      *
      * @param string $name
      *
-     * @return Analyticsname
+     * @return self
      */
     public function setName($name)
     {

diff --git a/src/Kunstmaan/DashboardBundle/Entity/AnalyticsOverview.php b/src/Kunstmaan/DashboardBundle/Entity/AnalyticsOverview.php
@@ -157,7 +157,7 @@ public function getConfig()
      *
      * @param int $config
      *
-     * @return AnalyticsTopReferrals
+     * @return self
      */
     public function setConfig($config)
     {
@@ -181,7 +181,7 @@ public function getSegment()
      *
      * @param int $segment
      *
-     * @return AnalyticsTopReferrals
+     * @return self
      */
     public function setSegment($segment)
     {

diff --git a/src/Kunstmaan/DashboardBundle/Entity/AnalyticsSegment.php b/src/Kunstmaan/DashboardBundle/Entity/AnalyticsSegment.php
@@ -100,7 +100,7 @@ public function getConfig()
      *
      * @param int $config
      *
-     * @return AnalyticsTopReferrals
+     * @return self
      */
     public function setConfig($config)
     {

diff --git a/src/Kunstmaan/DashboardBundle/Helper/Google/Analytics/ConfigHelper.php b/src/Kunstmaan/DashboardBundle/Helper/Google/Analytics/ConfigHelper.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Kunstmaan\DashboardBundle\Entity\AnalyticsConfig;
+use Kunstmaan\DashboardBundle\Repository\AnalyticsConfigRepository;
 
 class ConfigHelper
 {

diff --git a/src/Kunstmaan/DashboardBundle/Helper/Google/Analytics/ServiceHelper.php b/src/Kunstmaan/DashboardBundle/Helper/Google/Analytics/ServiceHelper.php
@@ -10,7 +10,7 @@ class ServiceHelper
     /** @var Google_AnalyticsService */
     private $service;
 
-    /** @var GoogleClientHelper */
+    /** @var ClientHelper */
     private $clientHelper;
 
     public function __construct(ClientHelper $clientHelper)

diff --git a/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php b/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php
@@ -20,6 +20,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
  * The controller which will handle everything related with form pages and form submissions

diff --git a/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php b/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php
@@ -5,6 +5,7 @@
 use Doctrine\ORM\EntityManager;
 use Kunstmaan\FormBundle\Entity\AbstractFormPage;
 use Kunstmaan\NodeBundle\Event\ConfigureActionMenuEvent;
+use Symfony\Component\Routing\Router;
 use Symfony\Component\Routing\RouterInterface;
 
 /**

diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultPagePartsCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultPagePartsCommand.php
@@ -4,6 +4,7 @@
 
 use Kunstmaan\GeneratorBundle\Generator\DefaultPagePartGenerator;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * Generates the default pageparts

diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php
@@ -6,6 +6,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * Generates a default website based on Kunstmaan bundles

diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateFormPagePartsCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateFormPagePartsCommand.php
@@ -4,6 +4,7 @@
 
 use Kunstmaan\GeneratorBundle\Generator\DefaultPagePartGenerator;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * Generates the default form pageparts

diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php
@@ -4,6 +4,7 @@
 
 use Kunstmaan\GeneratorBundle\Generator\LayoutGenerator;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * Generates de default layout

diff --git a/src/Kunstmaan/GeneratorBundle/Command/GeneratePagePartCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GeneratePagePartCommand.php
@@ -4,6 +4,7 @@
 
 use Kunstmaan\GeneratorBundle\Generator\PagePartGenerator;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * Generates a new pagepart

diff --git a/src/Kunstmaan/LeadGenerationBundle/Entity/Rule/AbstractRule.php b/src/Kunstmaan/LeadGenerationBundle/Entity/Rule/AbstractRule.php
@@ -4,7 +4,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Kunstmaan\LeadGenerationBundle\Entity\Popup\AbstractPopup;
-use Kunstmaan\LeadGenerationBundle\Form\AbstractRuleAdminType;
+use Kunstmaan\LeadGenerationBundle\Form\Rule\AbstractRuleAdminType;
 use Kunstmaan\LeadGenerationBundle\Service\RuleServiceInterface;
 
 /**

diff --git a/src/Kunstmaan/LeadGenerationBundle/Entity/Rule/AfterXScrollPercentRule.php b/src/Kunstmaan/LeadGenerationBundle/Entity/Rule/AfterXScrollPercentRule.php
@@ -34,7 +34,7 @@ public function getPercentage()
     /**
      * @param int $percentage
      *
-     * @return AfterXScrollPercent
+     * @return self
      */
     public function setPercentage($percentage)
     {

diff --git a/src/Kunstmaan/MediaBundle/Command/RenameSoftDeletedCommand.php b/src/Kunstmaan/MediaBundle/Command/RenameSoftDeletedCommand.php
@@ -6,6 +6,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Kunstmaan\MediaBundle\Entity\Media;
 use Kunstmaan\MediaBundle\Helper\File\FileHandler;
+use Kunstmaan\MediaBundle\Helper\MediaManager;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -105,7 +106,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         foreach ($fileRenameQueue as $row) {
-            list($oldFileUrl, $newFileUrl, $handler) = $row;
+            [$oldFileUrl, $newFileUrl, $handler] = $row;
             $handler->fileSystem->rename(
                 preg_replace('~^' . preg_quote($handler->mediaPath, '~') . '~', '/', $oldFileUrl),
                 preg_replace('~^' . preg_quote($handler->mediaPath, '~') . '~', '/', $newFileUrl)

diff --git a/src/Kunstmaan/NodeBundle/Entity/QueuedNodeTranslationAction.php b/src/Kunstmaan/NodeBundle/Entity/QueuedNodeTranslationAction.php
@@ -130,7 +130,7 @@ public function setDate(\DateTime $date)
     /**
      * Get date
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getDate()
     {

diff --git a/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php b/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php
@@ -92,7 +92,7 @@ public function getTemplate()
     /**
      * @param string $identifier
      *
-     * @return TabInterface
+     * @return self
      */
     public function setIdentifier($identifier)
     {
@@ -112,7 +112,7 @@ public function getIdentifier()
     /**
      * @param HasNodeInterface $page
      *
-     * @return PermissionTab
+     * @return self
      */
     public function setPage($page)
     {
@@ -132,7 +132,7 @@ public function getPage()
     /**
      * @param PermissionAdmin $permissionAdmin
      *
-     * @return PermissionTab
+     * @return self
      */
     public function setPermissionAdmin($permissionAdmin)
     {
@@ -152,7 +152,7 @@ public function getPermissionAdmin()
     /**
      * @param PermissionMapInterface $permissionMap
      *
-     * @return PermissionTab
+     * @return self
      */
     public function setPermissionMap($permissionMap)
     {

diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
@@ -3,6 +3,7 @@
 namespace Kunstmaan\NodeBundle\Helper;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Kunstmaan\AdminBundle\Entity\BaseUser;
 use Kunstmaan\AdminBundle\Helper\DomainConfigurationInterface;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper;
 use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap;

diff --git a/src/Kunstmaan/NodeBundle/Tests/Helper/NodeHelperTest.php b/src/Kunstmaan/NodeBundle/Tests/Helper/NodeHelperTest.php
@@ -26,6 +26,7 @@
 use Kunstmaan\NodeBundle\Repository\NodeTranslationRepository;
 use Kunstmaan\NodeBundle\Repository\NodeVersionRepository;
 use Kunstmaan\NodeBundle\ValueObject\PageTab;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
@@ -86,25 +87,25 @@ public function configureOptions(OptionsResolver $resolver)
 
 class NodeHelperTest extends TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject|EntityManagerInterface */
+    /** @var MockObject|EntityManagerInterface */
     private $em;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|NodeRepository */
+    /** @var MockObject|NodeRepository */
     private $repository;
 
     /** @var NodeHelper */
     private $nodeHelper;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|NodeAdminPublisher */
+    /** @var MockObject|NodeAdminPublisher */
     private $nodeAdminPublisher;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|EventDispatcher */
+    /** @var MockObject|EventDispatcher */
     private $eventDispatcher;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|TokenStorageInterface */
+    /** @var MockObject|TokenStorageInterface */
     private $tokenStorage;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|CloneHelper */
+    /** @var MockObject|CloneHelper */
     private $cloneHelper;
 
     /** @var string */
@@ -318,7 +319,7 @@ public function testPrepareNodeVersionForDraft()
         $nodeTranslation->setLang($this->locale);
         $nodeTranslation->addNodeVersion($nodeVersion);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|NodeHelper $nodeHelper */
+        /** @var MockObject|NodeHelper $nodeHelper */
         $nodeHelper = $this->getMockBuilder(NodeHelper::class)
             ->setConstructorArgs([
                 $this->em,