Merge remote-tracking branch 'origin/MAGETWO-18122-Fix-TODOs' into develop

marcozheng · marcozheng · commit 2f7ebd6db849 · 2015-01-12T22:28:59.000-06:00
Conflicts:
	app/code/Magento/Integration/Model/Oauth/Token/Provider.php
	dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php
diff --git a/app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php b/app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php
@@ -9,16 +9,7 @@
 
 $installer->startSetup();
 
-if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
-    /**
-     * Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
-     * TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
-     */
-    $installer->getConnection()->renameTable(
-        $installer->getTable('admin_role'),
-        $installer->getTable('authorization_role')
-    );
-} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
+if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
     /**
      * Create table 'authorization_role'
      */
@@ -84,16 +75,7 @@
     $installer->getConnection()->createTable($table);
 }
 
-if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
-    /**
-     * Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
-     * TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
-     */
-    $installer->getConnection()->renameTable(
-        $installer->getTable('admin_rule'),
-        $installer->getTable('authorization_rule')
-    );
-} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
+if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
     /**
      * Create table 'authorization_rule'
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Model\Product\Media;
 
-use \Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
-use \Magento\Store\Model\StoreManagerInterface;
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Product;
 
 class AttributeManagement implements ProductMediaAttributeManagementInterface
 {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -10,7 +10,7 @@
  *
  * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <?php if ($this->getCollection()->getSize()): ?>
     <div class="toolbar toolbar-products" data-mage-init='<?php echo $this->getWidgetOptionsJson(); ?>'>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -10,7 +10,7 @@
  *
  * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <p class="toolbar-amount">
     <?php if ($this->getLastPageNum() > 1): ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
@@ -10,7 +10,7 @@
  *
  * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="field limiter">
     <label class="label" for="limiter">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
@@ -10,7 +10,7 @@
  *
  * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="toolbar-sorter sorter">
     <label class="sorter-label" for="sorter"><?php echo __('Sort By') ?></label>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
@@ -10,7 +10,7 @@
  *
  * @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <?php if ($this->isEnabledViewSwitcher()): ?>
 <div class="modes">
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
@@ -7,7 +7,7 @@
 
 use Magento\Catalog\Model\Category;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-use \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 
 class Move
 {
diff --git a/app/code/Magento/Checkout/Service/V1/PaymentMethod/ReadService.php b/app/code/Magento/Checkout/Service/V1/PaymentMethod/ReadService.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Checkout\Service\V1\PaymentMethod;
 
-use \Magento\Sales\Model\QuoteRepository;
-use \Magento\Store\Model\StoreManagerInterface;
+use Magento\Sales\Model\QuoteRepository;
 use Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Converter as QuoteMethodConverter;
 use Magento\Checkout\Service\V1\Data\PaymentMethod\Converter as PaymentMethodConverter;
-use \Magento\Payment\Model\MethodList;
+use Magento\Payment\Model\MethodList;
 
 /**
  * Payment method read service object.
diff --git a/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php b/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CheckoutAgreements\Service\V1\Agreement;
 
-use \Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
-use \Magento\CheckoutAgreements\Model\Resource\Agreement\Collection as AgreementCollection;
-use \Magento\CheckoutAgreements\Model\Agreement;
-use \Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
+use Magento\CheckoutAgreements\Model\Resource\Agreement\Collection as AgreementCollection;
+use Magento\CheckoutAgreements\Model\Agreement;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use \Magento\Store\Model\ScopeInterface;
-use \Magento\CheckoutAgreements\Service\V1\Data\AgreementBuilder;
-use \Magento\CheckoutAgreements\Service\V1\Data\Agreement as AgreementDataObject;
+use Magento\Store\Model\ScopeInterface;
+use Magento\CheckoutAgreements\Service\V1\Data\AgreementBuilder;
+use Magento\CheckoutAgreements\Service\V1\Data\Agreement as AgreementDataObject;
 
 /**
  * Checkout agreement service.
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -6,14 +6,14 @@
  */
 namespace Magento\ConfigurableProduct\Model;
 
-use \Magento\Framework\Exception\NoSuchEntityException;
-use \Magento\Webapi\Exception;
-use \Magento\Framework\Exception\StateException;
-use \Magento\Framework\Exception\InputException;
-use \Magento\Framework\Exception\CouldNotSaveException;
-use \Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
-use \Magento\Catalog\Model\Product\Type as ProductType;
-use \Magento\Store\Model\Store;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Webapi\Exception;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -5,7 +5,7 @@
  */
  /** @var $this \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config */
 
-use \Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 ?>
 <div class="entry-edit form-inline" id="<?php echo $this->getId() ?>">
     <div class="fieldset-wrapper collapsable-wrapper" id="<?php echo $this->getId() ?>-wrapper" data-panel="product-variations">
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -10,7 +10,7 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use \Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -30,7 +30,6 @@ protected function _redirectOnSaveError()
      * Save integration action.
      *
      * @return void
-     * @todo: Fix cyclomatic complexity.
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
@@ -56,7 +55,6 @@ public function execute()
             /** @var array $data */
             $data = $this->getRequest()->getPost();
             if (!empty($data)) {
-                // TODO: Move out work with API permissions to Web API module
                 if (!isset($data['resource'])) {
                     $integrationData['resource'] = [];
                 }
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php
@@ -32,22 +32,30 @@ class Provider implements TokenProviderInterface
      */
     protected $_date;
 
+    /**
+     * @var \Magento\Framework\Logger
+     */
+    protected $logger;
+
     /**
      * @param \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory
      * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory
      * @param \Magento\Integration\Helper\Oauth\Data $dataHelper
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param \Magento\Framework\Logger $logger
      */
     public function __construct(
         \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory,
         \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory,
         \Magento\Integration\Helper\Oauth\Data $dataHelper,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date
+        \Magento\Framework\Stdlib\DateTime\DateTime $date,
+        \Magento\Framework\Logger $logger
     ) {
         $this->_consumerFactory = $consumerFactory;
         $this->_tokenFactory = $tokenFactory;
         $this->_dataHelper = $dataHelper;
         $this->_date = $date;
+        $this->logger = $logger;
     }
 
     /**
@@ -112,14 +120,17 @@ public function validateRequestToken($requestToken, $consumer, $oauthVerifier)
      */
     public function getAccessToken($consumer)
     {
-        /** TODO: log the request token in dev mode since its not persisted. */
-        $token = $this->getIntegrationTokenByConsumerId($consumer->getId());
+        $consumerId = $consumer->getId();
+        $token = $this->getIntegrationTokenByConsumerId($consumerId);
         if (Token::TYPE_REQUEST != $token->getType()) {
             throw new \Magento\Framework\Oauth\Exception(
                 'Cannot get access token because consumer token is not a request token'
             );
         }
         $accessToken = $token->convertToAccess();
+        $this->logger->log(
+            'Request token ' . $token->getToken() . ' was exchanged to obtain access token for consumer ' . $consumerId
+        );
         return ['oauth_token' => $accessToken->getToken(), 'oauth_token_secret' => $accessToken->getSecret()];
     }
 
diff --git a/app/code/Magento/Integration/Service/V1/Integration.php b/app/code/Magento/Integration/Service/V1/Integration.php
@@ -45,7 +45,6 @@ public function create(array $integrationData)
     {
         $this->_checkIntegrationByName($integrationData['name']);
         $integration = $this->_integrationFactory->create($integrationData);
-        // TODO: Think about double save issue
         $integration->save();
         $consumerName = 'Integration' . $integration->getId();
         $consumer = $this->_oauthService->createConsumer(['name' => $consumerName]);
diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php
@@ -16,7 +16,6 @@
 /**
  * Integration oAuth service.
  *
- * TODO: Fix coupling between objects
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Oauth implements OauthInterface
diff --git a/app/code/Magento/Sales/Model/Quote/Item/Processor.php b/app/code/Magento/Sales/Model/Quote/Item/Processor.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Sales\Model\Quote\Item;
 
-use \Magento\Catalog\Model\Product;
-use \Magento\Sales\Model\Quote\ItemFactory;
-use \Magento\Sales\Model\Quote\Item;
+use Magento\Catalog\Model\Product;
+use Magento\Sales\Model\Quote\ItemFactory;
+use Magento\Sales\Model\Quote\Item;
 use Magento\Store\Model\StoreManagerInterface;
-use \Magento\Framework\App\State;
-use \Magento\Framework\Object;
+use Magento\Framework\App\State;
+use Magento\Framework\Object;
 
 /**
  * Class Processor
diff --git a/app/code/Magento/Sales/Model/QuoteRepository.php b/app/code/Magento/Sales/Model/QuoteRepository.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Model;
 
-use \Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 
 class QuoteRepository
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Model\Product\Media;
 
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product;
 
 class AttributeManagementTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Model\Resource\Eav;
 
-use \Magento\Catalog\Model\Resource\Eav\Attribute;
-
 class AttributeTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/LinkManagementTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ConfigurableProduct\Model;
 
-use \Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 class LinkManagementTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php
@@ -40,6 +40,11 @@ class OauthTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Stdlib\DateTime\DateTime */
     private $_dateMock;
 
+    /**
+     * @var \Magento\Framework\Logger
+     */
+    private $_loggerMock;
+
     private $_oauthToken;
 
     private $_oauthSecret;
@@ -113,6 +118,9 @@ public function setUp()
         $this->_dateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
             ->disableOriginalConstructor()
             ->getMock();
+        $this->_loggerMock = $this->getMockBuilder('Magento\Framework\Logger')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $nonceGenerator = new \Magento\Integration\Model\Oauth\Nonce\Generator(
             $this->_oauthHelperMock,
@@ -123,7 +131,8 @@ public function setUp()
             $this->_consumerFactory,
             $this->_tokenFactory,
             $this->_dataHelperMock,
-            $this->_dateMock
+            $this->_dateMock,
+            $this->_loggerMock
         );
         $this->_oauth = new \Magento\Framework\Oauth\Oauth(
             $this->_oauthHelperMock,
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Item/ProcessorTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/Item/ProcessorTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sales\Model\Quote\Item;
 
-use \Magento\Catalog\Model\Product;
-use \Magento\Sales\Model\Quote\ItemFactory;
-use \Magento\Sales\Model\Quote\Item;
+use Magento\Catalog\Model\Product;
+use Magento\Sales\Model\Quote\ItemFactory;
+use Magento\Sales\Model\Quote\Item;
 use Magento\Store\Model\StoreManagerInterface;
-use \Magento\Store\Model\Store;
-use \Magento\Framework\App\State;
-use \Magento\Framework\Object;
+use Magento\Store\Model\Store;
+use Magento\Framework\App\State;
+use Magento\Framework\Object;
 
 /**
  * Tests for Magento\Sales\Model\Service\Quote\Processor

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar`
`12`	`12`	`*/`
`13`		`-use \Magento\Catalog\Model\Product\ProductList\Toolbar;`
	`13`	`+use Magento\Catalog\Model\Product\ProductList\Toolbar;`
`14`	`14`	`?>`
`15`	`15`	`<?php if ($this->getCollection()->getSize()): ?>`
`16`	`16`	`<div class="toolbar toolbar-products" data-mage-init='<?php echo $this->getWidgetOptionsJson(); ?>'>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`use Magento\Catalog\Model\Category;`
`9`	`9`	`use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;`
`10`		`-use \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;`
	`10`	`+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;`
`11`	`11`
`12`	`12`	`class Move`
`13`	`13`	`{`