Merge pull request #547 from magento-extensibility/Extensibility-bugfix-PR-04-14-2016

[Extensibility] Bug fix

Author: monkeysee

app/code/Magento/PageCache/Observer/FlushCacheByTags.php

@@ -54,7 +54,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if ($object instanceof \Magento\Framework\DataObject\IdentityInterface) {
                 $tags = $object->getIdentities();
                 if (!empty($tags)) {
-                    $this->getCache()->clean(\Zend_Cache::CLEANING_MODE_ALL, array_unique($tags));
+                    $this->getCache()->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, array_unique($tags));
                 }
             }
         }

app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php

@@ -74,7 +74,7 @@ public function testExecute($cacheState)
 
             $this->fullPageCacheMock->expects($this->once())
                 ->method('clean')
-                ->with(\Zend_Cache::CLEANING_MODE_ALL, $this->equalTo($expectedTags));
+                ->with(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $this->equalTo($expectedTags));
         }
 
         $this->_model->execute($observerObject);

app/code/Magento/Security/etc/adminhtml/system.xml

@@ -22,11 +22,17 @@
                     <label>Max Number of Password Reset Requests</label>
                     <comment>Limit the number of password reset request per hour. Use 0 to disable.</comment>
                     <validate>required-entry validate-zero-or-greater</validate>
+                    <depends>
+                        <field id="password_reset_protection_type" separator="," negative="1">0</field>
+                    </depends>
                 </field>
                 <field id="min_time_between_password_reset_requests" translate="label comment" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Min Time Between Password Reset Requests</label>
                     <comment>Delay in minutes between password reset requests. Use 0 to disable.</comment>
                     <validate>required-entry validate-zero-or-greater</validate>
+                    <depends>
+                        <field id="password_reset_protection_type" separator="," negative="1">0</field>
+                    </depends>
                 </field>
             </group>
         </section>
@@ -40,11 +46,17 @@
                     <label>Max Number of Password Reset Requests</label>
                     <comment>Limit the number of password reset request per hour. Use 0 to disable.</comment>
                     <validate>required-entry validate-zero-or-greater</validate>
+                    <depends>
+                        <field id="password_reset_protection_type" separator="," negative="1">0</field>
+                    </depends>
                 </field>
                 <field id="min_time_between_password_reset_requests" translate="label comment" type="text" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Min Time Between Password Reset Requests</label>
                     <comment>Delay in minutes between password reset requests. Use 0 to disable.</comment>
                     <validate>required-entry validate-zero-or-greater</validate>
+                    <depends>
+                        <field id="password_reset_protection_type" separator="," negative="1">0</field>
+                    </depends>
                 </field>
             </group>
         </section>

app/code/Magento/User/etc/adminhtml/system.xml

@@ -19,13 +19,16 @@
                 <field id="lockout_failures" translate="label comment" sortOrder="100" showInDefault="1">
                     <label>Maximum Login Failures to Lockout Account</label>
                     <comment>We will disable this feature if the value is empty.</comment>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="lockout_threshold" translate="label" sortOrder="110" showInDefault="1">
                     <label>Lockout Time (minutes)</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="password_lifetime" translate="label comment" sortOrder="120" showInDefault="1">
                     <label>Password Lifetime (days)</label>
                     <comment>We will disable this feature if the value is empty. </comment>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="password_is_forced" translate="label" sortOrder="130" type="select" showInDefault="1">
                     <label>Password Change</label>

dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php

@@ -38,8 +38,8 @@ protected function setUp()
 
     protected function tearDown()
     {
+        $this->auth = null;
         $this->objectManager->get(\Magento\Framework\Config\ScopeInterface::class)->setCurrentScope(null);
-        $this->auth->logout();
     }
 
     /**
@@ -58,6 +58,6 @@ public function testIsLoggedIn($loggedIn)
 
     public function loginDataProvider()
     {
-        return [[true], [false]];
+        return [[false], [true]];
     }
 }

lib/internal/Cm/Cache/Backend/File.php

@@ -34,6 +34,8 @@
  *
  * @copyright  Copyright (c) 2013 Colin Mollenhour (http://colin.mollenhour.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ *
+ * Modified by Magento, Modifications Copyright © 2016 Magento.
  */
 class Cm_Cache_Backend_File extends Zend_Cache_Backend_File
 {
@@ -59,11 +61,6 @@ class Cm_Cache_Backend_File extends Zend_Cache_Backend_File
      */
     public function __construct(array $options = array())
     {
-        // Magento-friendly cache dir
-        if (empty($options['cache_dir']) && class_exists('Mage', false)) {
-            $options['cache_dir'] = Mage::getBaseDir('cache');
-        }
-
         // Backwards compatibility ZF 1.11 and ZF 1.12
         if (isset($options['hashed_directory_umask'])) {
             $options['directory_mode'] = $options['hashed_directory_umask'];
@@ -716,4 +713,4 @@ public function ___expire($id)
         $this->touch($id, 1 - $metadata['expire']);
     }
 
-}
+}