[TESTS] PhpStan: fixed all issues in /lib

pimcore · Jul 12, 2019 · d688a67 · d688a67
1 parent 0755dbc
commit d688a67
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 93 deletions.
diff --git a/lib/Cache/Pool/AbstractCacheItemPool.php b/lib/Cache/Pool/AbstractCacheItemPool.php
@@ -17,6 +17,7 @@
 use Pimcore\Cache\Pool\Exception\InvalidArgumentException;
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareTrait;
+use Symfony\Contracts\Cache\ItemInterface;
 
 abstract class AbstractCacheItemPool implements PimcoreCacheItemPoolInterface
 {
@@ -505,8 +506,8 @@ private function doGet(PimcoreCacheItemPoolInterface $pool, string $key, callabl
         $metadata = $item instanceof PimcoreCacheItemInterface ? $item->getMetadata() : [];
 
         if (!$recompute && $metadata) {
-            $expiry = $metadata[PimcoreCacheItemInterface::METADATA_EXPIRY] ?? false;
-            $ctime = $metadata[PimcoreCacheItemInterface::METADATA_CTIME] ?? false;
+            $expiry = $metadata[ItemInterface::METADATA_EXPIRY] ?? false;
+            $ctime = $metadata[ItemInterface::METADATA_CTIME] ?? false;
 
             if ($recompute = $ctime && $expiry && $expiry <= microtime(true) - $ctime / 1000 * $beta * log(random_int(1, PHP_INT_MAX) / PHP_INT_MAX)) {
                 // force applying defaultLifetime to expiry

diff --git a/lib/Cache/Pool/CacheItem.php b/lib/Cache/Pool/CacheItem.php
@@ -17,8 +17,9 @@
 use Cache\TagInterop\TaggableCacheItemInterface;
 use Pimcore\Cache\Pool\Exception\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
+use Symfony\Contracts\Cache\ItemInterface;
 
-class CacheItem implements PimcoreCacheItemInterface
+class CacheItem implements PimcoreCacheItemInterface, ItemInterface
 {
     private const METADATA_EXPIRY_OFFSET = 1527506807;
     protected $key;
@@ -29,6 +30,7 @@ class CacheItem implements PimcoreCacheItemInterface
     protected $metadata = [];
     protected $previousTags = [];
     protected $tags = [];
+    protected $newMetadata = [];
 
     /**
      * @param string $key
@@ -100,10 +102,10 @@ public function getDefaultLifetime()
     /**
      * {@inheritdoc}
      */
-    public function tag($tags): PimcoreCacheItemInterface
+    public function tag($tags): ItemInterface
     {
-        if (!$this->isTaggable) {
-            throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
+        if (!isset($this->isTaggable) || !$this->isTaggable) {
+            throw new \LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
         }
         if (!\is_iterable($tags)) {
             $tags = [$tags];

diff --git a/lib/Console/AbstractConsoleCommandPlugin.php b/lib/Console/AbstractConsoleCommandPlugin.php
diff --git a/lib/Document/Tag/DelegatingTagHandler.php b/lib/Document/Tag/DelegatingTagHandler.php
@@ -18,7 +18,6 @@
 use Pimcore\Model\Document\Tag;
 use Pimcore\Model\Document\Tag\Area\Info;
 use Pimcore\Templating\Model\ViewModelInterface;
-use Pimcore\View;
 
 class DelegatingTagHandler implements TagHandlerInterface
 {
@@ -42,7 +41,7 @@ public function addHandler(TagHandlerInterface $handler)
     /**
      * Get the matching handler for a view
      *
-     * @param ViewModelInterface|View $view
+     * @param ViewModelInterface $view
      *
      * @return TagHandlerInterface
      */

diff --git a/lib/Document/Tag/NamingStrategy/Migration/RenderMigrationStrategy.php b/lib/Document/Tag/NamingStrategy/Migration/RenderMigrationStrategy.php
@@ -157,11 +157,11 @@ private function initializeUser(InputInterface $input)
         $user = User::getByName($username);
 
         if (!$user) {
-            throw new \InvalidArgumentException(sprintf('User "%s" could not be loaded'));
+            throw new \InvalidArgumentException(sprintf('User "%s" could not be loaded', $username));
         }
 
         if (!$user->isAdmin()) {
-            throw new \InvalidArgumentException(sprintf('User "%s" does not have admin rights'));
+            throw new \InvalidArgumentException(sprintf('User "%s" does not have admin rights', $username));
         }
 
         // See ElementListener. The UserLoader will be used to fetch the admin user when rendering

diff --git a/lib/Document/Tag/TagHandlerInterface.php b/lib/Document/Tag/TagHandlerInterface.php
@@ -17,14 +17,13 @@
 use Pimcore\Model\Document\Tag;
 use Pimcore\Model\Document\Tag\Area\Info;
 use Pimcore\Templating\Model\ViewModelInterface;
-use Pimcore\View;
 
 interface TagHandlerInterface
 {
     /**
      * Determine if handler supports the tag
      *
-     * @param ViewModelInterface|View $view
+     * @param ViewModelInterface $view
      *
      * @return bool
      */
@@ -60,7 +59,7 @@ public function renderAreaFrontend(Info $info);
     /**
      * Render a sub-action (snippet, renderlet)
      *
-     * @param ViewModelInterface|View $view
+     * @param ViewModelInterface $view
      * @param string $controller
      * @param string $action
      * @param string|null $parent Bundle

diff --git a/lib/Event/Model/Asset/ResolveUploadTargetEvent.php b/lib/Event/Model/Asset/ResolveUploadTargetEvent.php
@@ -14,12 +14,10 @@
 
 namespace Pimcore\Event\Model\Asset;
 
-use Pimcore\Event\Model\ElementEventInterface;
 use Pimcore\Event\Traits\ArgumentsAwareTrait;
-use Pimcore\Model\Asset;
 use Symfony\Component\EventDispatcher\Event;
 
-class ResolveUploadTargetEvent extends Event implements ElementEventInterface
+class ResolveUploadTargetEvent extends Event
 {
     use ArgumentsAwareTrait;
 
@@ -99,12 +97,4 @@ public function setParentId($parentId): void
     {
         $this->parentId = $parentId;
     }
-
-    /**
-     * @return Asset
-     */
-    public function getElement()
-    {
-        return $this->getAsset();
-    }
 }
diff --git a/lib/Event/Targeting/TargetingEvent.php b/lib/Event/Targeting/TargetingEvent.php
@@ -26,7 +26,7 @@ class TargetingEvent extends Event
     /**
      * @var VisitorInfo
      */
-    private $visitorInfo;
+    protected $visitorInfo;
 
     public function __construct(VisitorInfo $visitorInfo)
     {

diff --git a/lib/Google/Cse.php b/lib/Google/Cse.php
@@ -161,6 +161,8 @@ public function __construct($googleResponse = null)
      */
     public function readGoogleResponse(\Google_Service_Customsearch_Search $googleResponse)
     {
+        $items = [];
+
         $this->setRaw($googleResponse);
 
         // set search results

diff --git a/lib/Kernel.php b/lib/Kernel.php
@@ -94,7 +94,7 @@ public function getLogDir()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(function (ContainerBuilder $container) use ($loader) {
+        $loader->load(function (ContainerBuilder $container) {
             $this->registerExtensionConfigFileResources($container);
         });
 

diff --git a/lib/Mail.php b/lib/Mail.php
@@ -624,10 +624,11 @@ public function sendWithoutRendering(\Swift_Mailer $mailer = null)
         if ($event->hasArgument('mailer')) {
             $mailer = $event->getArgument('mailer');
             try {
-                $mailer->send($this, $emailaddress);
+                $failedRecipients = [];
+                $mailer->send($this, $failedRecipients);
             } catch (\Exception $e) {
                 $mailer->getTransport()->stop();
-                throw new \Exception($emailaddress[0].' - '.$e->getMessage());
+                throw new \Exception($failedRecipients[0].' - '.$e->getMessage());
             }
         }
 

diff --git a/lib/Migrations/SqlFileWriter.php b/lib/Migrations/SqlFileWriter.php
@@ -50,6 +50,7 @@ public function __construct(Configuration $configuration, $destPath, OutputWrite
             $this->throwInvalidArgumentException('Destination file must be specified.');
         }
 
+        $this->configuration = $configuration;
         $this->destPath = $destPath;
         $this->outputWriter = $outputWriter;
     }

diff --git a/lib/Placeholder.php b/lib/Placeholder.php
@@ -160,7 +160,7 @@ public function detectPlaceholders($contentString, $params, $document = null)
                         } elseif (!is_array($configArray)) {
                             throw new \Exception('The JSON string in the PlaceholderConfig should be an array.');
                         }
-                        $placeholderConfig = new \Pimcore\Config\Config($configArray, null, ['ignoreconstants' => true]);
+                        $placeholderConfig = new \Pimcore\Config\Config($configArray, null);
                     } catch (\Exception $e) {
                         Logger::warn('PlaceholderConfig is not a valid JSON string. PlaceholderConfig for ' . $placeholderClass . ' ignored.');
                         continue;

diff --git a/lib/Routing/Redirect/Csv.php b/lib/Routing/Redirect/Csv.php
@@ -173,7 +173,7 @@ private function processImportData(array $data, array &$stats)
         $redirect = null;
 
         if ($data['id']) {
-            $redirect = Redirect::getById($data['id'], true);
+            $redirect = Redirect::getById($data['id']);
             $stats['updated']++;
         } else {
             $redirect = new Redirect();

diff --git a/lib/Templating/Helper/HeadMeta.php b/lib/Templating/Helper/HeadMeta.php
@@ -201,7 +201,8 @@ public function __call($method, $args)
             $item = $this->createData($type, $args[0], $args[1], $args[2]);
 
             if ('offsetSet' == $action) {
-                return $this->offsetSet($index, $item);
+                $this->offsetSet($index, $item);
+                return $this;
             }
 
             $this->$action($item);
@@ -258,7 +259,7 @@ public function offsetSet($index, $value)
             throw new Exception('Invalid value passed to offsetSet; please use offsetSetName() or offsetSetHttpEquiv()');
         }
 
-        return $this->getContainer()->offsetSet($index, $value);
+        $this->getContainer()->offsetSet($index, $value);
     }
 
     /**
@@ -319,7 +320,7 @@ public function set($value)
             }
         }
 
-        return $this->append($value);
+        $this->append($value);
     }
 
     /**

diff --git a/lib/Templating/Helper/Placeholder.php b/lib/Templating/Helper/Placeholder.php
@@ -56,11 +56,6 @@ class Placeholder extends AbstractHelper
      */
     protected $_regKey = 'Placeholder';
 
-    /**
-     * @var ContainerService
-     */
-    protected $containerService;
-
     /**
      * @var Container[]
      */
@@ -71,18 +66,6 @@ public function getName()
         return 'placeholder';
     }
 
-    /**
-     * AbstractHelper constructor.
-     *
-     * @param ContainerService $containerService
-     *
-     * @internal param Container $container
-     */
-    public function __construct(ContainerService $containerService)
-    {
-        $this->containerService = $containerService;
-    }
-
     /**
      * Retrieve object instance; optionally add meta tag
      *

diff --git a/lib/Tool/ClassUtils.php b/lib/Tool/ClassUtils.php
@@ -51,7 +51,7 @@ public static function findClassName(\SplFileInfo $file): string
         $gettingClass = false;
 
         if (!$file->isReadable() || !file_exists($file->getPathname())) {
-            throw new \InvalidArgumentException(sprintf('File %s does not exist or is not readable'));
+            throw new \InvalidArgumentException(sprintf('File %s does not exist or is not readable', $file->getPathname()));
         }
 
         $content = '';

diff --git a/lib/Tool/RestClient/AbstractRestClient.php b/lib/Tool/RestClient/AbstractRestClient.php
@@ -782,10 +782,6 @@ public function getAssetById($id, $decode = true, $idMapper = null, $light = fal
                         $uri = $protocol . $this->getHost() . $tmpPath . '/thumb_' . $asset->getId() . '__' . $thumbnail;
                         $client->setUri($uri);
 
-                        if ($this->getLoggingEnabled()) {
-                            print '    =>' . $uri . "\n";
-                        }
-
                         $result = $client->request();
                         if ($result->getStatus() == 200) {
                             $data = $result->getBody();

diff --git a/lib/Translation/ImportDataExtractor/Xliff12DataExtractor.php b/lib/Translation/ImportDataExtractor/Xliff12DataExtractor.php
@@ -28,7 +28,7 @@ class Xliff12DataExtractor implements ImportDataExtractorInterface
     protected $xliffEscaper;
 
     /**
-     * @var TranslationItemResolver\
+     * @var TranslationItemResolverInterface
      */
     protected $translationItemResolver;
 

diff --git a/lib/Workflow/Manager.php b/lib/Workflow/Manager.php
@@ -21,7 +21,7 @@
 use Pimcore\Workflow\EventSubscriber\NotesSubscriber;
 use Pimcore\Workflow\Place\PlaceConfig;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Workflow\Exception\InvalidARgumentException;
+use Symfony\Component\Workflow\Exception\InvalidArgumentException;
 use Symfony\Component\Workflow\Exception\LogicException;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Registry;
@@ -201,7 +201,8 @@ public function getWorkflowIfExists($subject, string $workflowName): ?Workflow
     {
         try {
             $workflow = $this->workflowRegistry->get($subject, $workflowName);
-        } catch (InvalidARgumentException $e) { // workflow does not apply to given subject
+        } catch (InvalidArgumentException $e) {
+            // workflow does not apply to given subject
             return null;
         }
 

diff --git a/lib/Workflow/Place/OptionsProvider.php b/lib/Workflow/Place/OptionsProvider.php
@@ -41,7 +41,7 @@ public function __construct(Manager $workflowManager, TranslatorInterface $trans
 
     /**
      * @param array $context
-     * @param Data $fieldDefinition
+     * @param \Pimcore\Model\DataObject\ClassDefinition\Data $fieldDefinition
      *
      * @return array
      *

diff --git a/lib/Workflow/Transition.php b/lib/Workflow/Transition.php
@@ -30,8 +30,8 @@ class Transition extends \Symfony\Component\Workflow\Transition implements Notes
      * Transition constructor.
      *
      * @param string $name
-     * @param string|\string[] $froms
-     * @param string|\string[] $tos
+     * @param string|string[] $froms
+     * @param string|string[] $tos
      * @param array $options
      */
     public function __construct($name, $froms, $tos, $options = [])

diff --git a/phpstan.neon b/phpstan.neon
@@ -11,8 +11,13 @@ parameters:
         - '**/Generator/DoctrineCrudGenerator.php'
         - '**/EcommerceFrameworkBundle/Resources/views/Voucher/parts/paginator.html.php'
         - '**/EcommerceFrameworkBundle/Resources/views/Includes/paging.html.php'
+        - '**/Processor/PdfReactor8.php'
+        - '**/simple_html_dom.php'
+        - '**/PDFreactor.class.php'
 
     ignoreErrors:
+        - '/(snappy|lz4)_(un)?compress/'
+        - '/Instantiated class COM not found/'
         - '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children()/'
         - '/(OnlineShopVoucherToken|OnlineShopVoucherSeries|VoucherTokenTypeSingle|VoucherTokenTypePattern|OnlineShopOrder|OnlineShopOrderItem|OnlineShopTaxClass|TaxEntry|DataObject\\Customer)/'
         -
@@ -30,3 +35,6 @@ parameters:
         -
             message: '#Undefined variable: \$(this|view|app)#'
             path: '**/*.js.php'
+        -
+            message: '/Zend_Log/'
+            path: '**/Log/ApplicationLogger.php'