Error category in Backend

.htaccess

@@ -1,5 +1,6 @@
 ############################################
-## uncomment the line below to enable developer mode
+## overrides deployment configuration mode value
+## use command bin/magento deploy:mode:set to switch modes
 
 #   SetEnv MAGE_MODE developer
 

.php_cs

@@ -17,10 +17,8 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/integration/var')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')
-    ->exclude('lib/internal/JSMin')
     ->exclude('lib/internal/Less')
     ->exclude('lib/internal/LinLibertineFont')
-    ->exclude('lib/internal/phpseclib')
     ->exclude('pub/media')
     ->exclude('pub/static')
     ->exclude('setup/vendor')

Gruntfile.js

@@ -15,6 +15,9 @@ module.exports = function (grunt) {
     [
         taskDir + '/mage-minify',
         taskDir + '/deploy',
+        taskDir + '/black-list-generator',
+        taskDir + '/clean-black-list',
+        taskDir + '/static',
         'time-grunt'
     ].forEach(function (task) {
         require(task)(grunt);

README.md

@@ -3,17 +3,17 @@
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
-The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v1.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
+The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
 
 <h2>New to Magento? Need some help?</h2>
 If you're not sure about the following, you probably need a little help before you start installing the Magento software:
 
-*	Is the Magento software <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
-*	What's a <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
-*	Where's my <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
-*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">PHP</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">Apache</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">MySQL</a>?
+*	Is the Magento software <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
+*	What's a <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
+*	Where's my <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
+*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">PHP</a>?
+*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">Apache</a>?
+*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">MySQL</a>?
 
 <h2>Step 1: Verify your prerequisites</h2>
 
@@ -30,16 +30,16 @@ Use the following table to verify you have the correct prerequisites to install
 		<td>Apache 2.2 or 2.4</td>
 		<td>Ubuntu: <code>apache2 -v</code><br>
 		CentOS: <code>httpd -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
+		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
 	<tr>
 		<td>PHP 5.5.x or 5.6.x</td>
 		<td><code>php -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
+		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
 	</tr>
 	<tr><td>MySQL 5.6.x</td>
 	<td><code>mysql -u [root user name] -p</code></td>
-	<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/mysql.html">MySQL</a></td>
+	<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/mysql.html">MySQL</a></td>
 	</tr>
 </tbody>
 </table>
@@ -48,16 +48,16 @@ Use the following table to verify you have the correct prerequisites to install
 
 After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.
 
-1.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
-2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
+1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
+2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
 
 <h2>Step 3: Install and verify the installation</h2>
 
-1.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
+1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
 2.	Install Magento:
-	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
-	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
-2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a>
+	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
+	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
+2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/verify.html">Verify the installation</a>
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -68,7 +68,7 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html>
-[2]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -34,10 +34,10 @@ public function __construct(
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -12,10 +12,10 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         return '<span class="grid-row-title">' .
             $row->getTitle() .

app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

@@ -33,10 +33,10 @@ public function __construct(
     /**
      * Renders grid column
      *
-     * @param   \Magento\Framework\Object $row
+     * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\Object $row)
+    public function render(\Magento\Framework\DataObject $row)
     {
         $class = '';
         $value = '';

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

@@ -7,7 +7,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
-class Notification extends \Magento\Backend\App\AbstractAction
+abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
     /**
      * @return bool

app/code/Magento/AdminNotification/Model/Resource/Inbox.php

@@ -30,8 +30,8 @@ protected function _construct()
      */
     public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
     {
-        $adapter = $this->_getReadAdapter();
-        $select = $adapter->select()->from(
+        $connection = $this->getConnection();
+        $select = $connection->select()->from(
             $this->getMainTable()
         )->order(
             $this->getIdFieldName() . ' DESC'
@@ -42,7 +42,7 @@ public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
         )->limit(
             1
         );
-        $data = $adapter->fetchRow($select);
+        $data = $connection->fetchRow($select);
 
         if ($data) {
             $object->setData($data);
@@ -62,8 +62,8 @@ public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
      */
     public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
     {
-        $adapter = $this->_getReadAdapter();
-        $select = $adapter->select()->from(
+        $connection = $this->getConnection();
+        $select = $connection->select()->from(
             $this->getMainTable(),
             [
                 'severity' => 'severity',
@@ -78,7 +78,7 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
             'is_read=?',
             0
         );
-        $return = $adapter->fetchPairs($select);
+        $return = $connection->fetchPairs($select);
         return $return;
     }
 
@@ -92,9 +92,9 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
      */
     public function parse(\Magento\AdminNotification\Model\Inbox $object, array $data)
     {
-        $adapter = $this->_getWriteAdapter();
+        $connection = $this->getConnection();
         foreach ($data as $item) {
-            $select = $adapter->select()->from($this->getMainTable())->where('title = ?', $item['title']);
+            $select = $connection->select()->from($this->getMainTable())->where('title = ?', $item['title']);
 
             if (empty($item['url'])) {
                 $select->where('url IS NULL');
@@ -106,11 +106,11 @@ public function parse(\Magento\AdminNotification\Model\Inbox $object, array $dat
                 $row = false;
                 unset($item['internal']);
             } else {
-                $row = $adapter->fetchRow($select);
+                $row = $connection->fetchRow($select);
             }
 
             if (!$row) {
-                $adapter->insert($this->getMainTable(), $item);
+                $connection->insert($this->getMainTable(), $item);
             }
         }
     }

app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

@@ -36,7 +36,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\Notification\MessageList $messageList,
-        $connection = null,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
         $this->_messageList = $messageList;

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
+use Magento\Framework\App\Resource;
 
 /**
  * Class AdvancedPricing
@@ -176,7 +177,7 @@ public function __construct(
         $this->_importExportData = $importExportData;
         $this->_resourceHelper = $resourceHelper;
         $this->_dataSourceModel = $importData;
-        $this->_connection = $resource->getConnection('write');
+        $this->_connection = $resource->getConnection();
         $this->_resourceFactory = $resourceFactory;
         $this->_productModel = $productModel;
         $this->_catalogData = $catalogData;

app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php

@@ -40,7 +40,7 @@ public function afterDeleteAdvancedPricing(AdvancedPricing $subject)
     /**
      * Get price indexer
      *
-     * @return \Magento\Indexer\Model\IndexerInterface
+     * @return \Magento\Framework\Indexer\IndexerInterface
      */
     protected function getPriceIndexer()
     {

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php

@@ -11,7 +11,7 @@
 class ImportTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Indexer\Model\IndexerInterface |\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Indexer\IndexerInterface |\PHPUnit_Framework_MockObject_MockObject
      */
     protected $indexer;
 
@@ -27,7 +27,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->indexer = $this->getMockForAbstractClass('\Magento\Indexer\Model\IndexerInterface', [], '', false);
+        $this->indexer = $this->getMockForAbstractClass('\Magento\Framework\Indexer\IndexerInterface', [], '', false);
         $this->import = $this->getMock(
             '\Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import',
             ['getPriceIndexer', 'invalidateIndexer'],

app/code/Magento/Authorization/Model/Acl/Loader/Role.php

@@ -7,6 +7,7 @@
 
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\Acl\Role\User as RoleUser;
+use Magento\Framework\App\Resource;
 
 class Role implements \Magento\Framework\Acl\LoaderInterface
 {
@@ -49,11 +50,11 @@ public function __construct(
     public function populateAcl(\Magento\Framework\Acl $acl)
     {
         $roleTableName = $this->_resource->getTableName('authorization_role');
-        $adapter = $this->_resource->getConnection('core_read');
+        $connection = $this->_resource->getConnection();
 
-        $select = $adapter->select()->from($roleTableName)->order('tree_level');
+        $select = $connection->select()->from($roleTableName)->order('tree_level');
 
-        foreach ($adapter->fetchAll($select) as $role) {
+        foreach ($connection->fetchAll($select) as $role) {
             $parent = $role['parent_id'] > 0 ? $role['parent_id'] : null;
             switch ($role['role_type']) {
                 case RoleGroup::ROLE_TYPE:

app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Authorization\Model\Acl\Loader;
 
+use Magento\Framework\App\Resource;
+
 class Rule implements \Magento\Framework\Acl\LoaderInterface
 {
     /**
@@ -37,11 +39,11 @@ public function populateAcl(\Magento\Framework\Acl $acl)
     {
         $ruleTable = $this->_resource->getTableName("authorization_rule");
 
-        $adapter = $this->_resource->getConnection('core_read');
+        $connection = $this->_resource->getConnection();
 
-        $select = $adapter->select()->from(['r' => $ruleTable]);
+        $select = $connection->select()->from(['r' => $ruleTable]);
 
-        $rulesArr = $adapter->fetchAll($select);
+        $rulesArr = $connection->fetchAll($select);
 
         foreach ($rulesArr as $rule) {
             $role = $rule['role_id'];

app/code/Magento/Authorization/Model/Resource/Role.php

@@ -35,16 +35,16 @@ class Role extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Framework\Model\Resource\Db\Context $context
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param string|null $resourcePrefix
+     * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Framework\App\CacheInterface $cache,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        $resourcePrefix = null
+        $connectionName = null
     ) {
         $this->dateTime = $dateTime;
-        parent::__construct($context, $resourcePrefix);
+        parent::__construct($context, $connectionName);
         $this->_cache = $cache->getFrontend();
     }
 
@@ -82,7 +82,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
 
         if (!$role->getTreeLevel()) {
             if ($role->getPid() > 0) {
-                $select = $this->_getReadAdapter()->select()->from(
+                $select = $this->getConnection()->select()->from(
                     $this->getMainTable(),
                     ['tree_level']
                 )->where(
@@ -91,7 +91,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $role)
 
                 $binds = ['pid' => (int)$role->getPid()];
 
-                $treeLevel = $this->_getReadAdapter()->fetchOne($select, $binds);
+                $treeLevel = $this->getConnection()->fetchOne($select, $binds);
             } else {
                 $treeLevel = 0;
             }
@@ -126,11 +126,11 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $role)
      */
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
     {
-        $adapter = $this->_getWriteAdapter();
+        $connection = $this->getConnection();
 
-        $adapter->delete($this->getMainTable(), ['parent_id = ?' => (int)$role->getId()]);
+        $connection->delete($this->getMainTable(), ['parent_id = ?' => (int)$role->getId()]);
 
-        $adapter->delete($this->_ruleTable, ['role_id = ?' => (int)$role->getId()]);
+        $connection->delete($this->_ruleTable, ['role_id = ?' => (int)$role->getId()]);
 
         return $this;
     }
@@ -143,16 +143,16 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
      */
     public function getRoleUsers(\Magento\Authorization\Model\Role $role)
     {
-        $read = $this->_getReadAdapter();
+        $connection = $this->getConnection();
 
         $binds = ['role_id' => $role->getId(), 'role_type' => RoleUser::ROLE_TYPE];
 
-        $select = $read->select()
+        $select = $connection->select()
             ->from($this->getMainTable(), ['user_id'])
             ->where('parent_id = :role_id')
             ->where('role_type = :role_type')
             ->where('user_id > 0');
 
-        return $read->fetchCol($select, $binds);
+        return $connection->fetchCol($select, $binds);
     }
 }