From e03ebf7b0b0032108ea931556ea7810125300e6f Mon Sep 17 00:00:00 2001
From: Volodymyr Sevostianov <vsevostianov@ebay.com>
Date: Wed, 23 Sep 2015 11:53:53 +0300
Subject: [PATCH] MAGETWO-42835: Bundled js files are not loaded if minified
- tests fixes
---
lib/internal/Magento/Framework/View/Asset/File.php | 6 +++---
.../Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/internal/Magento/Framework/View/Asset/File.php b/lib/internal/Magento/Framework/View/Asset/File.php
index adb0cdb4da1..2aa6cdd733c 100644
--- a/lib/internal/Magento/Framework/View/Asset/File.php
+++ b/lib/internal/Magento/Framework/View/Asset/File.php
@@ -57,9 +57,9 @@ class File implements MergeableInterface
/**
* @param Source $source
* @param ContextInterface $context
- * @param $filePath
- * @param $module
- * @param $contentType
+ * @param string $filePath
+ * @param string $module
+ * @param string $contentType
* @param Minification $minification
* @param Filesystem $filesystem
*/
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php
index ee5421d413d..ae449ed77db 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php
@@ -9,7 +9,7 @@ use Magento\Framework\View\Asset\Bundle\Manager;
class ManagerTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Framework\View\Asset\Bundle\Manager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
protected $manager;
/** @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
--
GitLab