From 097de7916f0d64217119fd76df045d8b1d097af8 Mon Sep 17 00:00:00 2001 From: Florian Horn Date: Thu, 3 Aug 2017 11:42:23 +0200 Subject: [PATCH] Release candidate 4 for v2.1.0 --- Changelog.md | 3 +++ composer.json | 2 +- composer.lock | 52 +++++++++++++++++++++++++-------------------------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0251712..b085283 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file, in reverse ### Added +- #82 Fixed invalid position of tag resource in system.xml - #78 Move backend configuration to customer > customer configuration section - #77 Provides backwards compatibility by set strategy for existing rules to regex matcher instead of static - #76 Static matcher now canonicalizes url and rule to omit differences of trailing slashes @@ -21,6 +22,8 @@ All notable changes to this project will be documented in this file, in reverse ### Fixed +- #81 Error in admin pages due to invalid XML +- #79 Invalid system.xml file - #75 Static matching strategy could ignore ending slash - #74 Upgrade to 2.1 RC2 from 2 breaks backward compatibility of rules - #73 Force login top level system config tab is overkill diff --git a/composer.json b/composer.json index 289d3b0..03366e0 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "The Force Login module for Magento2 redirects a storefront visitor to the Magento2 Frontend login page, if the visitor is not logged in. It is possible to configure the whitelisted urls to add custom definitions.", "type": "magento2-module", "minimum-stability": "stable", - "version": "2.1.0-RC3", + "version": "2.1.0-RC4", "license": "Apache-2.0", "authors": [ { diff --git a/composer.lock b/composer.lock index 0f76a89..94cb5ea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c4bbf8fab479e9e09aa8208d3cd1d366", - "content-hash": "0d0e9dcf11db0576ae28c5019cced36c", + "hash": "8bbf93b88396d0b8706edb9d02b2b374", + "content-hash": "e546bd330b141880174563b3ba02415b", "packages": [ { "name": "magento/framework", @@ -1986,7 +1986,7 @@ }, { "name": "symfony/process", - "version": "v2.8.24", + "version": "v2.8.26", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -2035,7 +2035,7 @@ }, { "name": "zendframework/zend-escaper", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", @@ -2080,7 +2080,7 @@ }, { "name": "zendframework/zend-http", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-http.git", @@ -2131,7 +2131,7 @@ }, { "name": "zendframework/zend-loader", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-loader.git", @@ -2176,7 +2176,7 @@ }, { "name": "zendframework/zend-stdlib", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", @@ -2231,7 +2231,7 @@ }, { "name": "zendframework/zend-uri", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-uri.git", @@ -2279,7 +2279,7 @@ }, { "name": "zendframework/zend-validator", - "version": "2.4.12", + "version": "2.4.13", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", @@ -2589,22 +2589,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/46f7e8bb075036c92695b15a1ddb6971c751e585", + "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -2630,24 +2630,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2017-07-15 11:38:20" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -2677,7 +2677,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2017-07-14 14:27:02" }, { "name": "phpspec/prophecy", @@ -3725,16 +3725,16 @@ }, { "name": "symfony/yaml", - "version": "v3.3.4", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "1f93a8d19b8241617f5074a123e282575b821df8" + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8", - "reference": "1f93a8d19b8241617f5074a123e282575b821df8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", "shasum": "" }, "require": { @@ -3776,7 +3776,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-06-15 12:58:50" + "time": "2017-07-23 12:43:26" }, { "name": "webmozart/assert",