Merge pull request #477 from magento-api/MAGETWO-40183

MAGETWO-40183 Accept 9 Public Pull Requests

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/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Start.php

@@ -6,6 +6,6 @@
  */
 namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
 
-class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
+abstract class Start extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
 }

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

@@ -12,7 +12,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Payment extends \Magento\Framework\App\Action\Action
+abstract class Payment extends \Magento\Framework\App\Action\Action
 {
     /**
      * Core registry

app/code/Magento/Backend/App/Action.php

@@ -12,6 +12,6 @@
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-class Action extends \Magento\Backend\App\AbstractAction
+abstract class Action extends \Magento\Backend\App\AbstractAction
 {
 }

app/code/Magento/Backend/Controller/Adminhtml/Auth.php

@@ -10,7 +10,7 @@
 /**
  * Auth backend controller
  */
-class Auth extends AbstractAction
+abstract class Auth extends AbstractAction
 {
     /**
      * Check if user has permissions to access this controller

app/code/Magento/Backend/Controller/Adminhtml/Cache.php

@@ -8,7 +8,7 @@
 use Magento\Backend\App\Action;
 use Magento\Framework\Exception\LocalizedException;
 
-class Cache extends Action
+abstract class Cache extends Action
 {
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface

app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php

@@ -11,7 +11,7 @@
  */
 namespace Magento\Backend\Controller\Adminhtml;
 
-class Dashboard extends \Magento\Backend\App\Action
+abstract class Dashboard extends \Magento\Backend\App\Action
 {
     /**
      * @return bool

app/code/Magento/Backend/Controller/Adminhtml/Index.php

@@ -10,7 +10,7 @@
 /**
  * Index backend controller
  */
-class Index extends AbstractAction
+abstract class Index extends AbstractAction
 {
     /**
      * Check if user has permissions to access this controller

app/code/Magento/Backend/Controller/Adminhtml/System.php

@@ -12,7 +12,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class System extends AbstractAction
+abstract class System extends AbstractAction
 {
     /**
      * @return bool

app/code/Magento/Backend/Controller/Adminhtml/System/Account.php

@@ -12,7 +12,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Account extends Action
+abstract class Account extends Action
 {
     /**
      * @return bool

app/code/Magento/Backend/Controller/Adminhtml/System/Design.php

@@ -7,7 +7,7 @@
 
 use Magento\Backend\App\Action;
 
-class Design extends Action
+abstract class Design extends Action
 {
     /**
      * Core registry

app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

@@ -17,7 +17,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Store extends Action
+abstract class Store extends Action
 {
     /**
      * Core registry

app/code/Magento/Backend/Test/Unit/App/Action/Stub/ActionStub.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Unit\App\Action\Stub;
+
+class ActionStub extends \Magento\Backend\App\Action
+{
+    protected function execute()
+    {
+        // Empty method stub for test
+    }
+}

app/code/Magento/Backup/Controller/Adminhtml/Index.php

@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Index extends \Magento\Backend\App\Action
+abstract class Index extends \Magento\Backend\App\Action
 {
     /**
      * Core registry

app/code/Magento/Braintree/Controller/MyCreditCards.php

@@ -11,7 +11,7 @@
 use Magento\Framework\App\Action\Context;
 use \Braintree_Result_Error;
 
-class MyCreditCards extends \Magento\Framework\App\Action\Action
+abstract class MyCreditCards extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Customer\Model\Session

app/code/Magento/Braintree/Controller/PayPal.php

@@ -10,7 +10,7 @@
 /**
  * Braintree PayPal Checkout Controller
  */
-class PayPal extends \Magento\Framework\App\Action\Action
+abstract class PayPal extends \Magento\Framework\App\Action\Action
 {
     /**
      * @var \Magento\Braintree\Model\CheckoutFactory

app/code/Magento/Braintree/Test/Unit/Controller/MyCreditCardsTest.php

@@ -114,7 +114,7 @@ public function testDispatchNoVault()
             ->getMock();
 
         $notification = $objectManager->getObject(
-            'Magento\Braintree\Controller\MyCreditCards',
+            'Magento\Braintree\Test\Unit\Controller\Stub\MyCreditCardsStub',
             [
                 'customerSession' => $this->customerSession,
                 'resultRedirectFactory' => $this->resultRedirectFactory,
@@ -157,7 +157,7 @@ public function testDispatchNotLoggedIn()
 
 
         $notification = $objectManager->getObject(
-            'Magento\Braintree\Controller\MyCreditCards',
+            'Magento\Braintree\Test\Unit\Controller\Stub\MyCreditCardsStub',
             [
                 'customerSession' => $this->customerSession,
                 'resultRedirectFactory' => $this->resultRedirectFactory,

app/code/Magento/Braintree/Test/Unit/Controller/PayPalTest.php

@@ -100,7 +100,7 @@ public function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->controller = $this->objectManagerHelper->getObject(
-            '\Magento\Braintree\Controller\PayPal',
+            'Magento\Braintree\Test\Unit\Controller\Stub\PayPalStub',
             [
                 'context' => $contextMock,
                 'customerSession' => $this->customerSessionMock,

app/code/Magento/Braintree/Test/Unit/Controller/Stub/MyCreditCardsStub.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\Unit\Controller\Stub;
+
+class MyCreditCardsStub extends \Magento\Braintree\Controller\MyCreditCards
+{
+    protected function execute()
+    {
+        // Empty method stub for test
+    }
+}

app/code/Magento/Braintree/Test/Unit/Controller/Stub/PayPalStub.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Test\Unit\Controller\Stub;
+
+class PayPalStub extends \Magento\Braintree\Controller\PayPal
+{
+    protected function execute()
+    {
+        // Empty method stub for test
+    }
+}

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -8,7 +8,7 @@
 /**
  * Catalog category controller
  */
-class Category extends \Magento\Backend\App\Action
+abstract class Category extends \Magento\Backend\App\Action
 {
     /**
      * Initialize requested category and put it into registry.

app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php

@@ -12,7 +12,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Widget extends \Magento\Backend\App\Action
+abstract class Widget extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory

app/code/Magento/Catalog/Controller/Adminhtml/Product.php

@@ -11,7 +11,7 @@
  * Catalog product controller
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-class Product extends \Magento\Backend\App\Action
+abstract class Product extends \Magento\Backend\App\Action
 {
     /**
      * @var Product\Builder

app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\Controller\Result;
 
-class AbstractProductGrid extends Product
+abstract class AbstractProductGrid extends Product
 {
     /**
      * @var \Magento\Framework\View\Result\LayoutFactory

app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php

@@ -13,7 +13,7 @@
 /**
  * Adminhtml catalog product action attribute update controller
  */
-class Attribute extends Action
+abstract class Attribute extends Action
 {
     /**
      *  @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Controller\Result;
 use Magento\Framework\View\Result\PageFactory;
 
-class Attribute extends \Magento\Backend\App\Action
+abstract class Attribute extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\Framework\Cache\FrontendInterface

app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php

@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Set extends \Magento\Backend\App\Action
+abstract class Set extends \Magento\Backend\App\Action
 {
     /**
      * Core registry

app/code/Magento/Catalog/Controller/Product.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Controller\Product\View\ViewInterface;
 use Magento\Catalog\Model\Product as ModelProduct;
 
-class Product extends \Magento\Framework\App\Action\Action implements ViewInterface
+abstract class Product extends \Magento\Framework\App\Action\Action implements ViewInterface
 {
     /**
      * Initialize requested product object

app/code/Magento/Catalog/Controller/Product/Compare.php

@@ -15,7 +15,7 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Compare extends \Magento\Framework\App\Action\Action
+abstract class Compare extends \Magento\Framework\App\Action\Action
 {
     /**
      * Customer id

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php

@@ -16,7 +16,7 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
 
-class Catalog extends Action
+abstract class Catalog extends Action
 {
     /**
      * Dirty rules notice message

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget.php

@@ -7,7 +7,7 @@
 
 use Magento\Backend\App\Action;
 
-class Widget extends Action
+abstract class Widget extends Action
 {
     /**
      * @return bool

app/code/Magento/CatalogWidget/Controller/Adminhtml/Product/Widget.php

@@ -10,7 +10,7 @@
 /**
  * Class Widget
  */
-class Widget extends Action
+abstract class Widget extends Action
 {
     /**
      * @return bool

app/code/Magento/Checkout/Controller/Cart.php

@@ -12,7 +12,7 @@
 /**
  * Shopping cart controller
  */
-class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
+abstract class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface

app/code/Magento/Checkout/Controller/Onepage.php

@@ -13,7 +13,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Onepage extends Action
+abstract class Onepage extends Action
 {
     /**
      * @var array

app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php

@@ -85,9 +85,9 @@ protected function setUp()
         $context->expects($this->once())
             ->method('getEventManager')
             ->willReturn($this->eventManager);
-
+        
         $this->controller = $objectManager->getObject(
-            'Magento\Checkout\Controller\Onepage',
+            'Magento\Checkout\Test\Unit\Controller\Stub\OnepageStub',
             [
                 'context' => $context
             ]

app/code/Magento/Checkout/Test/Unit/Controller/Stub/OnepageStub.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Unit\Controller\Stub;
+
+class OnepageStub extends \Magento\Checkout\Controller\Onepage
+{
+    protected function execute()
+    {
+        // Empty method stub for test
+    }
+}

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml;
 
-class Agreement extends \Magento\Backend\App\Action
+abstract class Agreement extends \Magento\Backend\App\Action
 {
     /**
      * Core registry

app/code/Magento/Cms/Controller/Adminhtml/Block.php

@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Block extends \Magento\Backend\App\Action
+abstract class Block extends \Magento\Backend\App\Action
 {
     /**
      * Core registry

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php

@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Images extends \Magento\Backend\App\Action
+abstract class Images extends \Magento\Backend\App\Action
 {
     /**
      * Core registry

app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php

@@ -118,7 +118,7 @@
             "Element 'resource': [facet 'minLength'] The value has a length of '4'; this underruns the allowed " .
             "minimum length of '8'.",
             "Element 'resource': [facet 'pattern'] The value 'One:' is not accepted by the " .
-            "pattern '[A-Z]+[a-zA-Z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+            "pattern '([A-Z]+[a-zA-Z0-9]{1,}){1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
             "Element 'resource': 'One:' is not " . "a valid value of the atomic type 'typeAclResourceId'."
         ],
     ],