Merge remote-tracking branch 'ogresCE/MAGETWO-47940-bunch-of-publick-prs' into PR_Branch

Author: mazhalai

app/code/Magento/Backend/Model/Locale/Manager.php

@@ -26,22 +26,30 @@ class Manager
      * @var \Magento\Framework\TranslateInterface
      */
     protected $_translator;
+    
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     /**
      * Constructor
      *
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\TranslateInterface $translator
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\TranslateInterface $translator
+        \Magento\Framework\TranslateInterface $translator,
+        \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
         $this->_session = $session;
         $this->_authSession = $authSession;
         $this->_translator = $translator;
+        $this->_backendConfig = $backendConfig;
     }
 
     /**
@@ -53,28 +61,40 @@ public function __construct(
     public function switchBackendInterfaceLocale($localeCode)
     {
         $this->_session->setSessionLocale(null);
-
+        
         $this->_authSession->getUser()->setInterfaceLocale($localeCode);
-
+        
         $this->_translator->setLocale($localeCode)->loadData(null, true);
-
+        
         return $this;
     }
 
+    /**
+     * Get general interface locale 
+     *
+     * @return string
+     */
+    public function getGeneralLocale()
+    {
+        return $this->_backendConfig->getValue('general/locale/code');
+    }
+
     /**
      * Get user interface locale stored in session data
      *
      * @return string
      */
     public function getUserInterfaceLocale()
     {
-        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
-
         $userData = $this->_authSession->getUser();
+        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
+        
         if ($userData && $userData->getInterfaceLocale()) {
             $interfaceLocale = $userData->getInterfaceLocale();
+        } elseif ($this->getGeneralLocale()) {
+            $interfaceLocale = $this->getGeneralLocale();
         }
-
+        
         return $interfaceLocale;
     }
 }

app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

@@ -15,7 +15,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\TranslateInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
      */
     protected $_translator;
 
@@ -25,9 +25,14 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_session;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
     protected $_authSession;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     protected function setUp()
     {
@@ -40,7 +45,9 @@ protected function setUp()
             '',
             false
         );
-
+        
+        $this->_backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface', [], '', false);
+        
         $userMock = new \Magento\Framework\DataObject();
 
         $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
@@ -54,7 +61,8 @@ protected function setUp()
         $this->_model = new \Magento\Backend\Model\Locale\Manager(
             $this->_session,
             $this->_authSession,
-            $this->_translator
+            $this->_translator,
+            $this->_backendConfig
         );
     }
 
@@ -102,4 +110,17 @@ public function testGetUserInterfaceLocale()
 
         $this->assertEquals($locale, 'de_DE');
     }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceGeneralLocale()
+    {
+        $this->_backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('general/locale/code')
+            ->willReturn('test_locale');
+        $locale = $this->_model->getUserInterfaceLocale();
+        $this->assertEquals($locale, 'test_locale');
+    }
 }

app/code/Magento/Cms/etc/webapi.xml

@@ -11,7 +11,7 @@
     <route url="/V1/cmsPage/:pageId" method="GET">
         <service class="Magento\Cms\Api\PageRepositoryInterface" method="getById"/>
         <resources>
-            <resource ref="Magento_Cms::page"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
     <route url="/V1/cmsPage/search" method="GET">
@@ -42,7 +42,7 @@
     <route url="/V1/cmsBlock/:blockId" method="GET">
         <service class="Magento\Cms\Api\BlockRepositoryInterface" method="getById"/>
         <resources>
-            <resource ref="Magento_Cms::block"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
     <route url="/V1/cmsBlock/search" method="GET">

lib/internal/Magento/Framework/App/Action/AbstractAction.php

@@ -33,10 +33,10 @@ abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
     protected $resultFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
+     * @param Context $context
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context
+        Context $context
     ) {
         $this->_request = $context->getRequest();
         $this->_response = $context->getResponse();

lib/internal/Magento/Framework/Session/SaveHandler/Native.php

@@ -10,4 +10,15 @@
  */
 class Native extends \SessionHandler
 {
+    /**
+     * Workaround for php7 session_regenerate_id error
+     * @see https://bugs.php.net/bug.php?id=71187
+     *
+     * @param string $sessionId
+     * @return string
+     */
+    public function read($sessionId)
+    {
+        return (string)parent::read($sessionId);
+    }
 }

lib/internal/Magento/Framework/Url.php

@@ -763,7 +763,8 @@ public function addQueryParams(array $data)
      */
     public function setQueryParam($key, $data)
     {
-        return $this->_queryParamsResolver->setQueryParam($key, $data);
+        $this->_queryParamsResolver->setQueryParam($key, $data);
+        return $this;
     }
 
     /**