2.0.0.0-dev67

* GitHub requests:
  * [#235](#235) -- Translation escaping
  * [#463](#463) -- allow _resolveArguments to do sequential lookups
* Fixed bugs:
  * Fixed an issue where nonexistent store views flat tables cleanuper dropped the catalog_category_flat_cl table
  * Fixed an issue where the Product Flat Data indexer used the helpers logic instead of the Flat State logic
  * Fixed an issue where an exception was thrown when applying a coupon code
  * Fixed an issue where a Shopping Cart Price Rule was applied to the wrong products
  * Fixed an issue with the broken Related Orders link on the Recurring Profile page
  * Fixed an issue with CMS pages preview not working
  * Fixed an issue with a sales report for a store view returning wrong result
  * Fixed an issue where shipping did not work for orders containing only bundle products
  * Fixed an issue where a custom not found page action did not work
  * Fixed an issue where user configuration for a shopping cart rule to stop further rules processing was ignored
* Modularity improvements:
  * Resolved dependencies of the Sales module on the RecurringProfile module
  * Resolved dependencies of the Email Templates functionality on application modules
  * Lib-only dependent components of the Core module moved to library
  * CSS URL resolving logic moved from the publisher to a separate CSS pre-processor
  * Refactored the View publisher
* Customer Service usage:
  * Refactored the Sales module to use Customer service layer
  * Refactored the Checkout module to use Customer service layer
* Updated various PHPDoc with the parameter and return types

CHANGELOG.md

@@ -1,3 +1,30 @@
+2.0.0.0-dev67
+=============
+* GitHub requests:
+  * [#235](https://github.com/magento/magento2/issues/235) -- Translation escaping
+  * [#463](https://github.com/magento/magento2/pull/463) -- allow _resolveArguments to do sequential lookups
+* Fixed bugs:
+  * Fixed an issue where nonexistent store views flat tables cleanuper dropped the catalog_category_flat_cl table
+  * Fixed an issue where the Product Flat Data indexer used the helpers logic instead of the Flat State logic
+  * Fixed an issue where an exception was thrown when applying a coupon code
+  * Fixed an issue where a Shopping Cart Price Rule was applied to the wrong products
+  * Fixed an issue with the broken Related Orders link on the Recurring Profile page
+  * Fixed an issue with CMS pages preview not working
+  * Fixed an issue with a sales report for a store view returning wrong result
+  * Fixed an issue where shipping did not work for orders containing only bundle products
+  * Fixed an issue where a custom not found page action did not work
+  * Fixed an issue where user configuration for a shopping cart rule to stop further rules processing was ignored
+* Modularity improvements:
+  * Resolved dependencies of the Sales module on the RecurringProfile module
+  * Resolved dependencies of the Email Templates functionality on application modules
+  * Lib-only dependent components of the Core module moved to library
+  * CSS URL resolving logic moved from the publisher to a separate CSS pre-processor
+  * Refactored the View publisher
+* Customer Service usage:
+  * Refactored the Sales module to use Customer service layer
+  * Refactored the Checkout module to use Customer service layer
+* Updated various PHPDoc with the parameter and return types
+
 2.0.0.0-dev66
 =============
 * GitHub requests:
@@ -17,8 +44,8 @@
   * Moved the Billing Agreements functionality to the PayPal module
   * Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
 * Customer Service usage:
- * Updated Customer Group Grid to use Customer Service for data retrieving and filtering
- * Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
+  * Updated Customer Group Grid to use Customer Service for data retrieving and filtering
+  * Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
 * Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
   * A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
   * Argument processing is unified, and moved to library
@@ -50,9 +77,12 @@
  * [#319] (https://github.com/magento/magento2/issues/319) No message was displayed when product added to shopping cart.
  * [#367] (https://github.com/magento/magento2/issues/367) Improve the error message from the contact form
  * [#469] (https://github.com/magento/magento2/issues/469) Can't change prices on different websites for custom options
-* Updated the Customer service exception handling, and added tests
-* Added usage of the Customer service to the Customer module, replacing some direct usage of the Customer model
-* Updated various PHPDoc with the parameter and return types
+ * [#484] (https://github.com/magento/magento2/pull/484) Calling clear / removeAllItems / removeItemByKey on Magento\Eav\Model\Entity\Collection\AbstractCollection does not remove model from protected _itemsById array
+ * [#474] (https://github.com/magento/magento2/pull/474) Change for Options Collection class
+ * [#483] (https://github.com/magento/magento2/pull/483) Update Category.php
+* Update Customer Service Exception handling and add tests
+* Add usage of Customer Service to Customer Module, replacing some direct usage of Customer Model
+* Updated various PHPDoc with parameter and return types
 
 2.0.0.0-dev64
 =============

app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

@@ -32,7 +32,7 @@
  * @package    Magento_AdminNotification
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Frequency implements \Magento\Core\Model\Option\ArrayInterface
+class Frequency implements \Magento\Option\ArrayInterface
 {
     /**
      * @return array

app/code/Magento/AdminNotification/Model/Feed.php

@@ -57,17 +57,17 @@ class Feed extends \Magento\Core\Model\AbstractModel
     protected $_inboxFactory;
 
     /**
-     * @param \Magento\Core\Model\Context $context
-     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Model\Context $context
+     * @param \Magento\Registry $registry
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
      * @param \Magento\Core\Model\Resource\AbstractResource $resource
      * @param \Magento\Data\Collection\Db $resourceCollection
      * @param array $data
      */
     public function __construct(
-        \Magento\Core\Model\Context $context,
-        \Magento\Core\Model\Registry $registry,
+        \Magento\Model\Context $context,
+        \Magento\Registry $registry,
         \Magento\Backend\App\ConfigInterface $backendConfig,
         \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
         \Magento\Core\Model\Resource\AbstractResource $resource = null,

app/code/Magento/Authorizenet/Block/Directpost/Iframe.php

@@ -38,18 +38,18 @@ class Iframe extends \Magento\View\Element\Template
     /**
      * Core registry
      *
-     * @var \Magento\Core\Model\Registry
+     * @var \Magento\Registry
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\View\Element\Template\Context $context
-     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Registry $registry
      * @param array $data
      */
     public function __construct(
         \Magento\View\Element\Template\Context $context,
-        \Magento\Core\Model\Registry $registry,
+        \Magento\Registry $registry,
         array $data = array()
     ) {
         $this->_coreRegistry = $registry;

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php

@@ -31,19 +31,19 @@ class Payment
     /**
      * Core registry
      *
-     * @var \Magento\Core\Model\Registry
+     * @var \Magento\Registry
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Helper\Product $productHelper
-     * @param \Magento\Core\Model\Registry $coreRegistry
+     * @param \Magento\Registry $coreRegistry
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Helper\Product $productHelper,
-        \Magento\Core\Model\Registry $coreRegistry
+        \Magento\Registry $coreRegistry
     ) {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context, $productHelper);

app/code/Magento/Authorizenet/Controller/Directpost/Payment.php

@@ -35,17 +35,17 @@ class Payment extends \Magento\App\Action\Action
     /**
      * Core registry
      *
-     * @var \Magento\Core\Model\Registry
+     * @var \Magento\Registry
      */
     protected $_coreRegistry = null;
 
     /**
      * @param \Magento\App\Action\Context $context
-     * @param \Magento\Core\Model\Registry $coreRegistry
+     * @param \Magento\Registry $coreRegistry
      */
     public function __construct(
         \Magento\App\Action\Context $context,
-        \Magento\Core\Model\Registry $coreRegistry
+        \Magento\Registry $coreRegistry
     ) {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);

app/code/Magento/Authorizenet/Model/Authorizenet.php

@@ -245,7 +245,7 @@ class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * @param \Magento\Event\ManagerInterface $eventManager
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
-     * @param \Magento\Core\Model\Log\AdapterFactory $logAdapterFactory
+     * @param \Magento\Logger\AdapterFactory $logAdapterFactory
      * @param \Magento\Logger $logger
      * @param \Magento\Module\ModuleListInterface $moduleList
      * @param \Magento\Core\Model\LocaleInterface $locale
@@ -257,14 +257,14 @@ class Authorizenet extends \Magento\Payment\Model\Method\Cc
      * @param \Magento\Session\SessionManagerInterface $session
      * @param \Magento\Authorizenet\Helper\Data $authorizenetData
      * @param array $data
-     * 
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Event\ManagerInterface $eventManager,
         \Magento\Payment\Helper\Data $paymentData,
         \Magento\Core\Model\Store\Config $coreStoreConfig,
-        \Magento\Core\Model\Log\AdapterFactory $logAdapterFactory,
+        \Magento\Logger\AdapterFactory $logAdapterFactory,
         \Magento\Logger $logger,
         \Magento\Module\ModuleListInterface $moduleList,
         \Magento\Core\Model\LocaleInterface $locale,

app/code/Magento/Authorizenet/Model/Authorizenet/Source/PaymentAction.php

@@ -31,7 +31,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class PaymentAction implements \Magento\Core\Model\Option\ArrayInterface
+class PaymentAction implements \Magento\Option\ArrayInterface
 {
     /**
      * {@inheritdoc}

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -84,7 +84,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
      * @param \Magento\Event\ManagerInterface $eventManager
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
-     * @param \Magento\Core\Model\Log\AdapterFactory $logAdapterFactory
+     * @param \Magento\Logger\AdapterFactory $logAdapterFactory
      * @param \Magento\Logger $logger
      * @param \Magento\Module\ModuleListInterface $moduleList
      * @param \Magento\Core\Model\LocaleInterface $locale
@@ -108,7 +108,7 @@ public function __construct(
         \Magento\Event\ManagerInterface $eventManager,
         \Magento\Payment\Helper\Data $paymentData,
         \Magento\Core\Model\Store\Config $coreStoreConfig,
-        \Magento\Core\Model\Log\AdapterFactory $logAdapterFactory,
+        \Magento\Logger\AdapterFactory $logAdapterFactory,
         \Magento\Logger $logger,
         \Magento\Module\ModuleListInterface $moduleList,
         \Magento\Core\Model\LocaleInterface $locale,

app/code/Magento/Authorizenet/Model/Directpost/Observer.php

@@ -35,10 +35,10 @@ class Observer
     /**
      * Core registry
      *
-     * @var \Magento\Core\Model\Registry
+     * @var \Magento\Registry
      */
     protected $_coreRegistry;
-    
+
     /**
      * Core helper
      *
@@ -71,15 +71,15 @@ class Observer
     /**
      * @param \Magento\Authorizenet\Helper\Data $authorizenetData
      * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Registry $coreRegistry
+     * @param \Magento\Registry $coreRegistry
      * @param \Magento\Authorizenet\Model\Directpost $payment
      * @param \Magento\Authorizenet\Model\Directpost\Session $session
      * @param \Magento\Core\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Authorizenet\Helper\Data $authorizenetData,
         \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Registry $coreRegistry,
+        \Magento\Registry $coreRegistry,
         \Magento\Authorizenet\Model\Directpost $payment,
         \Magento\Authorizenet\Model\Directpost\Session $session,
         \Magento\Core\Model\StoreManagerInterface $storeManager

app/code/Magento/Authorizenet/i18n/de_DE.csv

@@ -57,7 +57,7 @@
 "Payment canceling error.","Fehler bei Zahlungsabbruch."
 "Payment capturing error.","Fehler bei Zahlungserfassung."
 "Payment error. Order was not found.","Zahlungsfehler. Bestellung konnte nicht gefunden werden."
-"Payment error. Paid amount doesn\'t match the order amount.","Zahlungsfehler. Gezahlter Betrag entspricht nicht dem Rechnungsbetrag."
+"Payment error. Paid amount doesn't match the order amount.","Zahlungsfehler. Gezahlter Betrag entspricht nicht dem Rechnungsbetrag."
 "Payment from Applicable Countries","Bezahlung aus den entsprechenden Ländern"
 "Payment from Applicable Countries","Zahlung aus geeigneten Ländern"
 "Payment from Specific Countries","Zahlung  aus spezifischen Ländern"

app/code/Magento/Authorizenet/i18n/en_US.csv

@@ -47,7 +47,7 @@
 "Payment canceling error.","Payment canceling error."
 "Payment capturing error.","Payment capturing error."
 "Payment error. Order was not found.","Payment error. Order was not found."
-"Payment error. Paid amount doesn\'t match the order amount.","Payment error. Paid amount doesn\'t match the order amount."
+"Payment error. Paid amount doesn't match the order amount.","Payment error. Paid amount doesn't match the order amount."
 "Payment from Applicable Countries","Payment from Applicable Countries"
 "Payment from Specific Countries","Payment from Specific Countries"
 "Payment partial authorization error.","Payment partial authorization error."

app/code/Magento/Authorizenet/i18n/es_ES.csv

@@ -58,7 +58,7 @@
 "Payment canceling error.","Error en el pago de cancelación."
 "Payment capturing error.","Error en el pago de retención."
 "Payment error. Order was not found.","Error de pago. No se encontró el pedido."
-"Payment error. Paid amount doesn\'t match the order amount.","Error de pago. El importe pagado no coincide con el importe del pedido."
+"Payment error. Paid amount doesn't match the order amount.","Error de pago. El importe pagado no coincide con el importe del pedido."
 "Payment from Applicable Countries","Pago desde países aceptados"
 "Payment from Applicable Countries","Pago desde países aplicables"
 "Payment from Specific Countries","Pago desde países específicos"

app/code/Magento/Authorizenet/i18n/fr_FR.csv

@@ -57,7 +57,7 @@
 "Payment canceling error.","Erreur dans l'annulation du paiement."
 "Payment capturing error.","Erreur lors de la saisie du paiement"
 "Payment error. Order was not found.","Erreur de paiement. La commande n'a pas été trouvée."
-"Payment error. Paid amount doesn\'t match the order amount.","Erreur de paiement. Le montant payé ne correspond pas au montant de la commande."
+"Payment error. Paid amount doesn't match the order amount.","Erreur de paiement. Le montant payé ne correspond pas au montant de la commande."
 "Payment from Applicable Countries","Paiement depuis les pays applicables"
 "Payment from Applicable Countries","Paiement depuis les pays disponibles."
 "Payment from Specific Countries","Paiement depuis les pays spécifiques"

app/code/Magento/Authorizenet/i18n/nl_NL.csv

@@ -59,7 +59,7 @@
 "Payment canceling error.","Probleem met het annuleren van de betaling."
 "Payment capturing error.","Fout in het ophalen van de betaling."
 "Payment error. Order was not found.","Betalingsfout. Bestelling is niet gevonden."
-"Payment error. Paid amount doesn\'t match the order amount.","Betalingsfout. Betaalde bedrag is niet hetzelfde als bedrag van bestelling."
+"Payment error. Paid amount doesn't match the order amount.","Betalingsfout. Betaalde bedrag is niet hetzelfde als bedrag van bestelling."
 "Payment from Applicable Countries","Betaling vanuit toegestane landen"
 "Payment from Applicable Countries","Betaling van Geëigende Landen"
 "Payment from Specific Countries","Betaling van Specifieke Landen"

app/code/Magento/Authorizenet/i18n/pt_BR.csv

@@ -47,7 +47,7 @@
 "Payment canceling error.","Erro de cancelamento de pagamento."
 "Payment capturing error.","Erro de captura de pagamento."
 "Payment error. Order was not found.","Erro de pagamento. Ordem não foi encontrada."
-"Payment error. Paid amount doesn\'t match the order amount.","Erro de pagamento. Valor pago não corresponde ao valor da ordem."
+"Payment error. Paid amount doesn't match the order amount.","Erro de pagamento. Valor pago não corresponde ao valor da ordem."
 "Payment from Applicable Countries","Pagamento de Países Aplicáveis"
 "Payment from Specific Countries","Pagamento de Países Específicos"
 "Payment partial authorization error.","Erro de autorização de pagamento parcial."

app/code/Magento/Authorizenet/i18n/zh_CN.csv

@@ -47,7 +47,7 @@
 "Payment canceling error.","取消支付过程出错。"
 "Payment capturing error.","支付捕获出错。"
 "Payment error. Order was not found.","支付出错，订单未找到。"
-"Payment error. Paid amount doesn\'t match the order amount.","支付错误。付款金额与订单金额不匹配。"
+"Payment error. Paid amount doesn't match the order amount.","支付错误。付款金额与订单金额不匹配。"
 "Payment from Applicable Countries","从可接受的国家支付"
 "Payment from Specific Countries","从指定的国家支付"
 "Payment partial authorization error.","支付的部分身份验证出错。"

app/code/Magento/Authz/Service/AuthorizationV1.php

@@ -34,7 +34,7 @@
 use Magento\User\Model\Role;
 use Magento\User\Model\RoleFactory;
 use Magento\User\Model\RulesFactory;
-use Magento\Core\Model\Acl\RootResource as RootAclResource;
+use Magento\Acl\RootResource as RootAclResource;
 
 /**
  * Authorization service.

app/code/Magento/Authz/etc/module.xml

@@ -26,7 +26,6 @@
 <config>
     <module name="Magento_Authz" version="1.0.0.0" active="true">
         <depends>
-            <module name="Magento_Core"/>
             <!--TODO: Dependency on Magento_User is temporary and should be eliminated when ACL is made global-->
             <module name="Magento_User"/>
             <module name="Magento_Backend"/>

app/code/Magento/Backend/App/Router/DefaultRouter.php

@@ -69,7 +69,8 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
      * @param string $routerId
      * @param \Magento\App\ConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
-     * 
+     * @param \Magento\Code\NameBuilder $nameBuilder
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -83,6 +84,7 @@ public function __construct(
         \Magento\Core\Model\Store\Config $storeConfig,
         \Magento\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
+        \Magento\Code\NameBuilder $nameBuilder,
         \Magento\App\ConfigInterface $coreConfig,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
@@ -96,7 +98,8 @@ public function __construct(
             $storeManager,
             $storeConfig,
             $urlSecurityInfo,
-            $routerId
+            $routerId,
+            $nameBuilder
         );
         $this->_coreConfig = $coreConfig;
         $this->_backendConfig = $backendConfig;
@@ -173,6 +176,6 @@ public function getControllerClassName($module, $controller)
         $parts[] = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
         $parts[] = $controller;
 
-        return \Magento\Core\Helper\String::buildClassName($parts);
+        return $this->nameBuilder->buildClassName($parts);
     }
 }

app/code/Magento/Backend/Block/System/Account/Edit/Form.php

@@ -46,15 +46,15 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Registry $registry
      * @param \Magento\Data\FormFactory $formFactory
      * @param \Magento\User\Model\UserFactory $userFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Model\Registry $registry,
+        \Magento\Registry $registry,
         \Magento\Data\FormFactory $formFactory,
         \Magento\User\Model\UserFactory $userFactory,
         \Magento\Backend\Model\Auth\Session $authSession,

app/code/Magento/Backend/Block/System/Cache/Form.php

@@ -41,14 +41,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Registry $registry
      * @param \Magento\Data\FormFactory $formFactory
      * @param \Magento\Core\Helper\Data $coreData
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Model\Registry $registry,
+        \Magento\Registry $registry,
         \Magento\Data\FormFactory $formFactory,
         \Magento\Core\Helper\Data $coreData,
         array $data = array()