MAGETWO-33609: pull request for stories in this sprint

Dale Sikkema · Dale Sikkema · commit b6fcd37761f7 · 2015-02-11T15:15:04.000-06:00
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -8,7 +8,6 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -8,7 +8,6 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 class Security implements \Magento\Framework\Notification\MessageInterface
diff --git a/app/code/Magento/Email/Model/Source/Variables.php b/app/code/Magento/Email/Model/Source/Variables.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Email\Model\Source;
 
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 /**
diff --git a/app/code/Magento/Store/Model/SecureUrl.php b/app/code/Magento/Store/Model/SecureUrl.php
@@ -19,8 +19,6 @@ class SecureUrl implements \Magento\Framework\App\Router\SecureUrlInterface
     private $storeManager;
 
     /**
-     * @param \Magento\Framework\App\ResponseFactory $responseFactory
-     * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param StoreManagerInterface $storeManager
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Config/Backend/BaseurlTest.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Backend\Model\Config\Backend;
 
-use Magento\Framework\Store\StoreManagerInterface;
-use Magento\Store\Model\Store;
-
 /**
  * @magentoAppArea adminhtml
  */
@@ -43,7 +40,7 @@ public function validationDataProvider()
         return [
             ['any/path', 'http://example.com/'],
             ['any/path', 'http://example.com/uri/'],
-            [Store::XML_PATH_UNSECURE_BASE_URL, $basePlaceholder],
+            [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, $basePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL, $unsecurePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL, $unsecureSuffix],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_STATIC_URL, ''],
@@ -52,7 +49,7 @@ public function validationDataProvider()
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_MEDIA_URL, ''],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_MEDIA_URL, $unsecurePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_MEDIA_URL, $unsecureSuffix],
-            [Store::XML_PATH_SECURE_BASE_URL, $basePlaceholder],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, $basePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $securePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $secureSuffix],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_STATIC_URL, ''],
@@ -61,7 +58,7 @@ public function validationDataProvider()
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_MEDIA_URL, ''],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_MEDIA_URL, $securePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_MEDIA_URL, $secureSuffix],
-            [Store::XML_PATH_SECURE_BASE_URL, $unsecurePlaceholder],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, $unsecurePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $unsecurePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $unsecureSuffix],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_STATIC_URL, ''],
@@ -107,19 +104,19 @@ public function validationExceptionDataProvider()
             ['', 'example.com'],
             ['', 'http://example.com'],
             ['', 'http://example.com/uri'],
-            [Store::XML_PATH_UNSECURE_BASE_URL, ''],
-            [Store::XML_PATH_UNSECURE_BASE_URL, $baseSuffix],
-            [Store::XML_PATH_UNSECURE_BASE_URL, $unsecureSuffix],
-            [Store::XML_PATH_UNSECURE_BASE_URL, $unsecurePlaceholder],
+            [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, ''],
+            [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, $baseSuffix],
+            [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, $unsecureSuffix],
+            [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, $unsecurePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL, ''],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL, $baseSuffix],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL, $unsecureWrongSuffix],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_MEDIA_URL, $unsecureWrongSuffix],
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_STATIC_URL, $unsecureWrongSuffix],
-            [Store::XML_PATH_SECURE_BASE_URL, ''],
-            [Store::XML_PATH_SECURE_BASE_URL, $baseSuffix],
-            [Store::XML_PATH_SECURE_BASE_URL, $secureSuffix],
-            [Store::XML_PATH_SECURE_BASE_URL, $securePlaceholder],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, ''],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, $baseSuffix],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, $secureSuffix],
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, $securePlaceholder],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, ''],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $baseSuffix],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL, $secureWrongSuffix],
diff --git a/dev/tests/unit/filename b/dev/tests/unit/filename
diff --git a/dev/tests/unit/filename.csv b/dev/tests/unit/filename.csv
diff --git a/dev/tests/unit/filename.invalid_type b/dev/tests/unit/filename.invalid_type
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\AdminNotification\Model\System\Message;
 
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 class BaseurlTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php b/dev/tests/unit/testsuite/Magento/Setup/Model/UserConfigurationDataMapperTest.php
@@ -11,7 +11,6 @@
 use Magento\Directory\Model\Currency;
 use Magento\Setup\Module\Setup;
 use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManager;
 
 class UserConfigurationDataMapperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Processor/PlaceholderTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Store\Model\Config\Processor;
 
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 class PlaceholderTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -10,7 +10,6 @@
 
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\Store\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Store\Model\Store;
 
 /**
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfo.php b/lib/internal/Magento/Framework/Url/SecurityInfo.php
@@ -7,9 +7,6 @@
  */
 namespace Magento\Framework\Url;
 
-use Magento\Framework\Store\StoreManagerInterface;
-use Magento\Store\Model\Store;
-
 class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
 {
     /**
@@ -52,7 +49,7 @@ public function __construct(
     public function isSecure($url)
     {
         if (!$this->_scopeConfig->getValue(
-            Store::XML_PATH_SECURE_IN_FRONTEND,
+            \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
             \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
         )
         ) {
diff --git a/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php b/setup/src/Magento/Setup/Model/UserConfigurationDataMapper.php
@@ -9,7 +9,6 @@
 use Magento\Backend\Model\Url;
 use Magento\Core\Helper\Data;
 use Magento\Directory\Model\Currency;
-use Magento\Framework\Store\StoreManagerInterface;
 use Magento\Setup\Module\Setup;
 use Magento\Store\Model\Store;
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`use Magento\Directory\Model\Currency;`
`12`	`12`	`use Magento\Setup\Module\Setup;`
`13`	`13`	`use Magento\Store\Model\Store;`
`14`		`-use Magento\Store\Model\StoreManager;`
`15`	`14`
`16`	`15`	`class UserConfigurationDataMapperTest extends \PHPUnit_Framework_TestCase`
`17`	`16`	`{`